Fix curl reset

.travis.yml

@@ -30,6 +30,8 @@ matrix:
       php: 5.6
     - env: TEST_DIR=tests/integration/guzzle/5
       php: 5.6
+    - env: TEST_DIR=tests/integration/guzzle/6
+      php: 5.6
     - env: TEST_DIR=tests/integration/soap
       php: 5.6
 
@@ -56,4 +58,5 @@ cache:
     - tests/integration/guzzle/3/vendor
     - tests/integration/guzzle/4/vendor
     - tests/integration/guzzle/5/vendor
+    - tests/integration/guzzle/6/vendor
     - $HOME/.composer/cache

src/VCR/LibraryHooks/CurlHook.php

@@ -182,6 +182,7 @@ public static function curlReset($curlHandle)
         \curl_reset($curlHandle);
         self::$requests[(int) $curlHandle] = new Request('GET', null);
         self::$curlOptions[(int) $curlHandle] = array();
+        unset(self::$responses[(int) $curlHandle]);
     }
 
     /**

tests/integration/guzzle/6/ExampleHttpClient.php

@@ -0,0 +1,41 @@
+<?php
+
+namespace VCR\Example;
+
+use GuzzleHttp\Client;
+use GuzzleHttp\Exception\ClientException;
+
+class ExampleHttpClient
+{
+    public function get($url)
+    {
+        $client = new Client();
+
+        try {
+            $response = $client->get($url);
+            return json_decode($response->getBody(), true);
+        } catch (ClientException $e) {
+            if ($e->getCode() !== 404) {
+                throw $e;
+            }
+        }
+
+        return null;
+    }
+
+    public function post($url, $body)
+    {
+        $client = new Client();
+
+        try {
+            $response = $client->post($url, array('body' => $body));
+            return json_decode($response->getBody(), true);
+        } catch (ClientException $e) {
+            if ($e->getCode() !== 404) {
+                throw $e;
+            }
+        }
+
+        return null;
+    }
+}

tests/integration/guzzle/6/composer.json

@@ -0,0 +1,5 @@
+{
+    "require": {
+        "guzzlehttp/guzzle": "~6.0"
+    }
+}

tests/integration/guzzle/6/phpunit.xml

@@ -0,0 +1,15 @@
+<phpunit bootstrap="../test/bootstrap.php"
+         colors="true"
+         convertErrorsToExceptions="true"
+         convertNoticesToExceptions="true"
+         convertWarningsToExceptions="true"
+>
+
+    <testsuites>
+        <testsuite>
+            <directory>../test</directory>
+            <directory>test</directory>
+        </testsuite>
+    </testsuites>
+
+</phpunit>

tests/integration/guzzle/6/test/AsyncTest.php

@@ -0,0 +1,45 @@
+<?php
+
+namespace VCR\Example;
+
+use GuzzleHttp\Client;
+use org\bovigo\vfs\vfsStream;
+
+/**
+ * Tests example request.
+ */
+class AsyncTest extends \PHPUnit_Framework_TestCase
+{
+    const TEST_GET_URL = 'http://api.chew.pro/trbmb';
+    const TEST_GET_URL_2 = 'http://api.chew.pro/trbmb?foo=42';
+
+    public function setUp()
+    {
+        vfsStream::setup('testDir');
+        \VCR\VCR::configure()->setCassettePath(vfsStream::url('testDir'));
+    }
+
+    public function testAsyncLock()
+    {
+        \VCR\VCR::turnOn();
+        \VCR\VCR::insertCassette('test-cassette.yml');
+
+        $client = new Client();
+        $promise = $client->getAsync(self::TEST_GET_URL);
+        $response = $promise->wait();
+        $promise = $client->getAsync(self::TEST_GET_URL_2);
+        $promise->wait();
+        // Let's check that we can perform 2 async request on different URLs without locking.
+        // Solves https://github.com/php-vcr/php-vcr/issues/211
+
+        $this->assertValidGETResponse(\GuzzleHttp\json_decode($response->getBody()));
+
+        \VCR\VCR::turnOff();
+    }
+
+    protected function assertValidGETResponse($info)
+    {
+        $this->assertInternalType('array', $info, 'Response is not an array.');
+        $this->assertArrayHasKey('0', $info, 'API did not return any value.');
+    }
+}