Update for 3.x

Update for 3.x

Author: barryvdh

composer.json

@@ -26,14 +26,18 @@
         "psr-0": { "Omnipay\\Tests\\" : "src/" }
     },
     "require": {
-        "guzzle/plugin-mock": "~3.1",
-        "mockery/mockery": "~0.8",
-        "phpunit/phpunit": "~3.7.0",
-        "squizlabs/php_codesniffer": "~1.5"
+        "php-http/mock-client": "^1",
+        "php-http/guzzle6-adapter": "^1.1",
+        "mockery/mockery": "^0.9",
+        "phpunit/phpunit": "^5.7.0"
+    },
+    "require-dev": {
+        "omnipay/common": "^3",
+        "symfony/http-foundation": "^3"
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "2.0.x-dev"
+            "dev-master": "3.0.x-dev"
         }
     }
 }

src/Omnipay/Tests/TestCase.php

@@ -3,13 +3,11 @@
 namespace Omnipay\Tests;
 
 use Mockery as m;
-use PHPUnit_Framework_TestCase;
+use Omnipay\Common\Http\Client;
+use PHPUnit\Framework\TestCase as PHPUnit_Framework_TestCase;
+use Psr\Http\Message\ResponseInterface;
 use ReflectionObject;
-use Guzzle\Common\Event;
-use Guzzle\Http\Client as HttpClient;
-use Guzzle\Http\Message\Response;
-use Guzzle\Http\Message\RequestInterface as GuzzleRequestInterface;
-use Guzzle\Plugin\Mock\MockPlugin;
+use Http\Mock\Client as MockClient;
 use Symfony\Component\HttpFoundation\Request as HttpRequest;
 
 /**
@@ -19,8 +17,10 @@
  */
 abstract class TestCase extends PHPUnit_Framework_TestCase
 {
-    private $mockHttpRequests = array();
+    /** @var  \Omnipay\Common\Message\RequestInterface */
     private $mockRequest;
+    /** @var  MockClient */
+    private $mockClient;
     private $httpClient;
     private $httpRequest;
 
@@ -41,19 +41,6 @@ function ($match) {
         );
     }
 
-    /**
-     * Mark a request as being mocked
-     *
-     * @param GuzzleRequestInterface $request
-     *
-     * @return self
-     */
-    public function addMockedHttpRequest(GuzzleRequestInterface $request)
-    {
-        $this->mockHttpRequests[] = $request;
-
-        return $this;
-    }
 
     /**
      * Get all of the mocked requests
@@ -62,19 +49,19 @@ public function addMockedHttpRequest(GuzzleRequestInterface $request)
      */
     public function getMockedRequests()
     {
-        return $this->mockHttpRequests;
+        return $this->mockClient->getRequests();
     }
 
     /**
      * Get a mock response for a client by mock file name
      *
      * @param string $path Relative path to the mock response file
      *
-     * @return Response
+     * @return ResponseInterface
      */
     public function getMockHttpResponse($path)
     {
-        if ($path instanceof Response) {
+        if ($path instanceof ResponseInterface) {
             return $path;
         }
 
@@ -83,10 +70,10 @@ public function getMockHttpResponse($path)
 
         // if mock file doesn't exist, check parent directory
         if (!file_exists($dir.'/Mock/'.$path) && file_exists($dir.'/../Mock/'.$path)) {
-            return MockPlugin::getMockFile($dir.'/../Mock/'.$path);
+            return \GuzzleHttp\Psr7\parse_response(file_get_contents($dir.'/../Mock/'.$path));
         }
 
-        return MockPlugin::getMockFile($dir.'/Mock/'.$path);
+        return \GuzzleHttp\Psr7\parse_response(file_get_contents($dir.'/Mock/'.$path));
     }
 
     /**
@@ -95,31 +82,19 @@ public function getMockHttpResponse($path)
      * This method assumes that mock response files are located under the
      * Mock/ subdirectory of the current class. A mock response is added to the next
      * request sent by the client.
-     * 
-     * An array of path can be provided and the next x number of client requests are 
+     *
+     * An array of path can be provided and the next x number of client requests are
      * mocked in the order of the array where x = the array length.
      *
      * @param array|string $paths Path to files within the Mock folder of the service
      *
-     * @return MockPlugin returns the created mock plugin
+     * @return void returns the created mock plugin
      */
     public function setMockHttpResponse($paths)
     {
-        $this->mockHttpRequests = array();
-        $that = $this;
-        $mock = new MockPlugin(null, true);
-        $this->getHttpClient()->getEventDispatcher()->removeSubscriber($mock);
-        $mock->getEventDispatcher()->addListener('mock.request', function(Event $event) use ($that) {
-            $that->addMockedHttpRequest($event['request']);
-        });
-
         foreach ((array) $paths as $path) {
-            $mock->addResponse($this->getMockHttpResponse($path));
+            $this->mockClient->addResponse($this->getMockHttpResponse($path));
         }
-
-        $this->getHttpClient()->getEventDispatcher()->addSubscriber($mock);
-
-        return $mock;
     }
 
     /**
@@ -160,10 +135,21 @@ public function getMockRequest()
         return $this->mockRequest;
     }
 
+    public function getMockClient()
+    {
+        if (null === $this->mockClient) {
+            $this->mockClient = new MockClient();
+        }
+
+        return $this->mockClient;
+    }
+
     public function getHttpClient()
     {
         if (null === $this->httpClient) {
-            $this->httpClient = new HttpClient;
+            $this->httpClient = new Client(
+                $this->getMockClient()
+            );
         }
 
         return $this->httpClient;