resolved merge conflicts

Author: lapistano

Readme.md

@@ -11,18 +11,35 @@ cd php-vcr-examples/
 composer install
 ```
 
-## Guzzle
+## Guzzle (using curl_runkit library hook)
 
 To run the guzzle example, do this:
 
 ```
 cd guzzle
-../vendor/bin/phpunit .
+../vendor/bin/phpunit
 ```
 
 If you like to record all http requests again, delete the fixture file.
 
 ```
 rm test/fixtures/github_adri_php-vcr.yml
-../vendor/bin/phpunit .
+../vendor/bin/phpunit
+```
+
+## Soap
+
+Soap examples can be run by:
+
+```
+cd soap
+../vendor/bin/phpunit 
+```
+
+To record all http requests agian, delete the fixtures:
+
+```
+cd soap
+rm test/fixtures/soap_weather_api_temperature
+../vendor/bin/phpunit 
 ```

composer.json

@@ -17,6 +17,9 @@
     },
 
     "autoload":     {
-        "classmap": ["guzzle/src/Adri", "soap/src/Adri"]
+        "classmap": [
+            "guzzle/src/VCR",
+            "soap/src/VCR"
+        ]
     }
 }

composer.lock

@@ -1,29 +1,23 @@
 <phpunit
-         cacheTokens="true"
-         colors="true"
-         bootstrap="test/bootstrap.php"
-         convertErrorsToExceptions="true"
-         convertNoticesToExceptions="true"
-         convertWarningsToExceptions="true"
-         forceCoversAnnotation="false"
-         mapTestClassNameToCoveredClassName="false"
-         printerClass="PHPUnit_TextUI_ResultPrinter"
-         processIsolation="false"
-         stopOnError="false"
-         stopOnFailure="false"
-         stopOnIncomplete="false"
-         stopOnSkipped="false"
-         testSuiteLoaderClass="PHPUnit_Runner_StandardTestSuiteLoader"
-         strict="false"
-         debug="true"
-         verbose="true">
+        bootstrap="test/bootstrap.php"
+        convertErrorsToExceptions="true"
+        convertNoticesToExceptions="true"
+        convertWarningsToExceptions="true"
+        stopOnError="false"
+        stopOnFailure="false"
+        stopOnIncomplete="false"
+        stopOnSkipped="false"
+        strict="true"
+>
 
     <testsuites>
-        <directory>./test</directory>>
+        <testsuite>
+            <directory>./test</directory>>
+        </testsuite>
     </testsuites>
 
     <listeners>
-       <listener class="PHPUnit_Util_Log_VCR" file="../vendor/adri/phpunit-testlistener-vcr/PHPUnit/Util/Log/VCR.php" />
+       <listener class="PHPUnit_Util_Log_VCR" file="../vendor/php-vcr/phpunit-testlistener-vcr/PHPUnit/Util/Log/VCR.php" />
    </listeners>
 
 </phpunit>

guzzle/phpunit.xml

@@ -1,6 +1,6 @@
 <?php
 
-namespace Adri;
+namespace VCR\Example;
 
 use Guzzle\Http\Client;
 use Guzzle\Http\Exception\ClientErrorResponseException;

guzzle/src/Adri/GithubProjectGuzzle.php renamed to guzzle/src/VCR/Example/GithubProjectGuzzle.php

@@ -1,9 +1,10 @@
 <?php
 
-namespace Adri;
+namespace VCR\Example;
 
 use Guzzle\Http\Client;
 use Guzzle\Http\Exception\ClientErrorResponseException;
+
 /**
 * Tests Guzzle class.
 */
@@ -15,12 +16,12 @@ class GithubProjectGuzzleTest extends \PHPUnit_Framework_TestCase
      */
     public function testGithubInfoForExistingProject()
     {
-        $githubProject = new GithubProjectGuzzle('adri/php-vcr');
+        $githubProject = new GithubProjectGuzzle('php-vcr/php-vcr');
         $info = $githubProject->getInfo();
 
         $this->assertTrue(is_array($info), 'Response is not an array.');
         $this->assertArrayHasKey('full_name', $info, "Key 'full_name' not found.");
-        $this->assertEquals('adri/php-vcr', $info['full_name'], "Value for key 'full_name' wrong.");
+        $this->assertEquals('php-vcr/php-vcr', $info['full_name'], "Value for key 'full_name' wrong.");
         $this->assertArrayHasKey('private', $info, "Key 'private' not found.");
         $this->assertFalse($info['private'], "Key 'private' is not false.");
     }
@@ -30,7 +31,7 @@ public function testGithubInfoForExistingProject()
      */
     public function testGithubInfoForNonExistingProject()
     {
-        $githubProject = new GithubProjectGuzzle('adri/random_stuff');
+        $githubProject = new GithubProjectGuzzle('php-vcr/random_stuff');
         $info = $githubProject->getInfo();
 
         $this->assertNull($info, 'Response is not null.');

guzzle/test/Adri/GithubProjectGuzzleTest.php renamed to guzzle/test/VCR/Example/GithubProjectGuzzleTest.php

@@ -1,3 +1,14 @@
 <?php
 
+if (!file_exists(__DIR__ . "/../../vendor/autoload.php")) {
+    die(
+        "\n[ERROR] You need to run composer before running the test suite.\n".
+        "To do so run the following commands:\n".
+        "    curl -s http://getcomposer.org/installer | php\n".
+        "    php composer.phar install\n\n"
+    );
+}
+
+require_once __DIR__ . '/../../vendor/autoload.php';
+
 \VCR\VCR::configure()->setCassettePath('test/fixtures');

guzzle/test/bootstrap.php

@@ -1,22 +1,14 @@
 <phpunit
-         cacheTokens="true"
-         colors="true"
-         bootstrap="test/bootstrap.php"
-         convertErrorsToExceptions="true"
-         convertNoticesToExceptions="true"
-         convertWarningsToExceptions="true"
-         forceCoversAnnotation="false"
-         mapTestClassNameToCoveredClassName="false"
-         printerClass="PHPUnit_TextUI_ResultPrinter"
-         processIsolation="false"
-         stopOnError="false"
-         stopOnFailure="false"
-         stopOnIncomplete="false"
-         stopOnSkipped="false"
-         testSuiteLoaderClass="PHPUnit_Runner_StandardTestSuiteLoader"
-         strict="false"
-         debug="true"
-         verbose="true">
+        bootstrap="test/bootstrap.php"
+        convertErrorsToExceptions="true"
+        convertNoticesToExceptions="true"
+        convertWarningsToExceptions="true"
+        stopOnError="false"
+        stopOnFailure="false"
+        stopOnIncomplete="false"
+        stopOnSkipped="false"
+        strict="true"
+>
 
     <testsuites>
         <testsuite>
@@ -25,7 +17,7 @@
     </testsuites>
 
     <listeners>
-       <listener class="PHPUnit_Util_Log_VCR" file="../vendor/adri/phpunit-testlistener-vcr/PHPUnit/Util/Log/VCR.php" />
+       <listener class="PHPUnit_Util_Log_VCR" file="../vendor/php-vcr/phpunit-testlistener-vcr/PHPUnit/Util/Log/VCR.php" />
    </listeners>
 
 </phpunit>

soap/phpunit.xml

@@ -1,6 +1,6 @@
 <?php
 
-namespace Adri;
+namespace VCR;
 
 /**
 * Checks cdyne.com for local weather information.

soap/src/Adri/WeatherApi.php renamed to soap/src/VCR/WeatherApi.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Adri;
+namespace VCR;
 
 /**
 * Checks cdyne.com for local weather information.