Rebase master in order to use VCR\Response instead of Guzzle

aaa2000 · aaa2000 · commit cf7124de4c4b · 2015-01-23T00:02:10.000+01:00
diff --git a/composer.lock b/composer.lock
diff --git a/src/VCR/Event/AfterHttpRequestEvent.php b/src/VCR/Event/AfterHttpRequestEvent.php
@@ -3,7 +3,7 @@
 namespace VCR\Event;
 
 use VCR\Request;
-use Guzzle\Http\Message\Response;
+use VCR\Response;
 use Symfony\Component\EventDispatcher\Event;
 
 class AfterHttpRequestEvent extends Event
diff --git a/src/VCR/Event/AfterPlaybackEvent.php b/src/VCR/Event/AfterPlaybackEvent.php
@@ -4,7 +4,7 @@
 
 use VCR\Cassette;
 use VCR\Request;
-use Guzzle\Http\Message\Response;
+use VCR\Response;
 use Symfony\Component\EventDispatcher\Event;
 
 class AfterPlaybackEvent extends Event
diff --git a/src/VCR/Event/BeforeRecordEvent.php b/src/VCR/Event/BeforeRecordEvent.php
@@ -4,7 +4,7 @@
 
 use VCR\Cassette;
 use VCR\Request;
-use Guzzle\Http\Message\Response;
+use VCR\Response;
 use Symfony\Component\EventDispatcher\Event;
 
 class BeforeRecordEvent extends Event
diff --git a/tests/VCR/Event/AfterHttpRequestEventTest.php b/tests/VCR/Event/AfterHttpRequestEventTest.php
@@ -3,7 +3,7 @@
 namespace VCR\Event;
 
 use VCR\Request;
-use Guzzle\Http\Message\Response;
+use VCR\Response;
 
 class AfterHttpRequestEventTest extends \PHPUnit_Framework_TestCase
 {
@@ -24,6 +24,6 @@ public function testGetRequest()
 
     public function testGetResponse()
     {
-        $this->assertInstanceOf('Guzzle\Http\Message\Response', $this->event->getResponse());
+        $this->assertInstanceOf('VCR\Response', $this->event->getResponse());
     }
 }
diff --git a/tests/VCR/Event/AfterPlaybackEventTest.php b/tests/VCR/Event/AfterPlaybackEventTest.php
@@ -6,7 +6,7 @@
 use VCR\Cassette;
 use VCR\Configuration;
 use VCR\Storage;
-use Guzzle\Http\Message\Response;
+use VCR\Response;
 
 class AfterPlaybackEventTest extends \PHPUnit_Framework_TestCase
 {
@@ -31,7 +31,7 @@ public function testGetRequest()
 
     public function testGetResponse()
     {
-        $this->assertInstanceOf('Guzzle\Http\Message\Response', $this->event->getResponse());
+        $this->assertInstanceOf('VCR\Response', $this->event->getResponse());
     }
 
     public function testGetCassette()
diff --git a/tests/VCR/Event/BeforeRecordEventTest.php b/tests/VCR/Event/BeforeRecordEventTest.php
@@ -6,7 +6,7 @@
 use VCR\Cassette;
 use VCR\Configuration;
 use VCR\Storage;
-use Guzzle\Http\Message\Response;
+use VCR\Response;
 
 class BeforeRecordEventTest extends \PHPUnit_Framework_TestCase
 {
@@ -31,7 +31,7 @@ public function testGetRequest()
 
     public function testGetResponse()
     {
-        $this->assertInstanceOf('Guzzle\Http\Message\Response', $this->event->getResponse());
+        $this->assertInstanceOf('VCR\Response', $this->event->getResponse());
     }
 
     public function testGetCassette()
diff --git a/tests/VCR/VCRTest.php b/tests/VCR/VCRTest.php

Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`	`namespace VCR\Event;`
`4`	`4`
`5`	`5`	`use VCR\Request;`
`6`		`-use Guzzle\Http\Message\Response;`
	`6`	`+use VCR\Response;`
`7`	`7`
`8`	`8`	`class AfterHttpRequestEventTest extends \PHPUnit_Framework_TestCase`
`9`	`9`	`{`
`@@ -24,6 +24,6 @@ public function testGetRequest()`
`24`	`24`
`25`	`25`	`public function testGetResponse()`
`26`	`26`	`{`
`27`		`- $this->assertInstanceOf('Guzzle\Http\Message\Response', $this->event->getResponse());`
	`27`	`+ $this->assertInstanceOf('VCR\Response', $this->event->getResponse());`
`28`	`28`	`}`
`29`	`29`	`}`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@`
`6`	`6`	`use VCR\Cassette;`
`7`	`7`	`use VCR\Configuration;`
`8`	`8`	`use VCR\Storage;`
`9`		`-use Guzzle\Http\Message\Response;`
	`9`	`+use VCR\Response;`
`10`	`10`
`11`	`11`	`class AfterPlaybackEventTest extends \PHPUnit_Framework_TestCase`
`12`	`12`	`{`
`@@ -31,7 +31,7 @@ public function testGetRequest()`
`31`	`31`
`32`	`32`	`public function testGetResponse()`
`33`	`33`	`{`
`34`		`- $this->assertInstanceOf('Guzzle\Http\Message\Response', $this->event->getResponse());`
	`34`	`+ $this->assertInstanceOf('VCR\Response', $this->event->getResponse());`
`35`	`35`	`}`
`36`	`36`
`37`	`37`	`public function testGetCassette()`