Merge pull request #28 from packagist/t/http-plug-1-and-2

HttpPlug: support version 1 and 2

Author: naderman

composer.json

@@ -13,14 +13,14 @@
     "require": {
         "php": "^5.6 || ^7.0",
         "psr/http-message": "^1.0",
-        "php-http/httplug": "^1.0",
+        "php-http/httplug": "^1.1 || ^2.0",
         "php-http/discovery": "^1.0",
         "php-http/client-implementation": "^1.0",
-        "php-http/client-common": "^1.3"
+        "php-http/client-common": "^1.9 || ^2.0"
     },
     "require-dev": {
         "phpunit/phpunit": "^5.5 || ^6.0",
-        "php-http/guzzle6-adapter": "^1.0",
+        "php-http/guzzle6-adapter": "^1.0 || ^2.0",
         "php-http/mock-client": "^1.0",
         "guzzlehttp/psr7": "^1.2",
         "cache/array-adapter": "^0.4",

src/Exception/HttpTransportException.php

@@ -28,4 +28,4 @@ public function getRequestUri()
     {
         return $this->requestUri;
     }
-}
+}

src/HttpClient/Plugin/ExceptionThrower.php

@@ -13,13 +13,14 @@
 use PrivatePackagist\ApiClient\Exception\ErrorException;
 use PrivatePackagist\ApiClient\Exception\HttpTransportException;
 use PrivatePackagist\ApiClient\Exception\ResourceNotFoundException;
-use PrivatePackagist\ApiClient\Exception\RuntimeException;
 use PrivatePackagist\ApiClient\HttpClient\Message\ResponseMediator;
 use Psr\Http\Message\RequestInterface;
 use Psr\Http\Message\ResponseInterface;
 
 class ExceptionThrower implements Plugin
 {
+    use Plugin\VersionBridgePlugin;
+
     /** @var ResponseMediator */
     private $responseMediator;
 
@@ -28,7 +29,7 @@ public function __construct(ResponseMediator $responseMediator = null)
         $this->responseMediator = $responseMediator ? $responseMediator : new ResponseMediator();
     }
 
-    public function handleRequest(RequestInterface $request, callable $next, callable $first)
+    protected function doHandleRequest(RequestInterface $request, callable $next, callable $first)
     {
         return $next($request)->then(function (ResponseInterface $response) use ($request) {
             if ($response->getStatusCode() < 400 || $response->getStatusCode() > 600) {

src/HttpClient/Plugin/PathPrepend.php

@@ -14,6 +14,8 @@
 
 class PathPrepend implements Plugin
 {
+    use Plugin\VersionBridgePlugin;
+
     /** @var string */
     private $path;
 
@@ -28,7 +30,7 @@ public function __construct($path)
     /**
      * {@inheritdoc}
      */
-    public function handleRequest(RequestInterface $request, callable $next, callable $first)
+    protected function doHandleRequest(RequestInterface $request, callable $next, callable $first)
     {
         $uri = $request->getUri();
 

src/HttpClient/Plugin/RequestSignature.php

@@ -14,6 +14,8 @@
 
 class RequestSignature implements Plugin
 {
+    use Plugin\VersionBridgePlugin;
+
     /** @var string */
     private $token;
     /** @var string */
@@ -32,7 +34,7 @@ public function __construct($token, $secret)
     /**
      * {@inheritdoc}
      */
-    public function handleRequest(RequestInterface $request, callable $next, callable $first)
+    protected function doHandleRequest(RequestInterface $request, callable $next, callable $first)
     {
         $params = [
             'key' => $this->token,

tests/HttpClient/Plugin/PathPrependTest.php

@@ -10,43 +10,47 @@
 namespace PrivatePackagist\ApiClient\HttpClient\Plugin;
 
 use GuzzleHttp\Psr7\Request;
+use Http\Promise\FulfilledPromise;
 use PHPUnit\Framework\TestCase;
 
 class PathPrependTest extends TestCase
 {
-    public function testPrefixRequestPath()
+    /** @var PathPrepend */
+    private $plugin;
+    private $next;
+    private $first;
+
+    protected function setUp()
     {
-        $request = new Request('GET', '/packages/');
-        $expected = new Request('GET', '/api/packages/');
-        $plugin = new PathPrepend('/api');
-        $callback = $this->getMockBuilder(\stdClass::class)
-            ->setMethods(['next'])
-            ->getMock()
-        ;
-        $callback->expects($this->once())
-            ->method('next')
-            ->with($expected)
-        ;
-
-        $plugin->handleRequest($request, [$callback, 'next'], function () {
-        });
+        parent::setUp();
+
+        $this->plugin = new PathPrepend('/api');
+        $this->next = function (Request $request) {
+            return new FulfilledPromise($request);
+        };
+        $this->first = function () {
+            throw new \RuntimeException('Did not expect plugin to call first');
+        };
+    }
+
+    /**
+     * @dataProvider pathProvider
+     */
+    public function testPrefixApiRequestPath($path, $expectedPath)
+    {
+        $request = new Request('GET', $path);
+        $expected = new Request('GET', $expectedPath);
+
+        $promise = $this->plugin->handleRequest($request, $this->next, $this->first);
+
+        $this->assertEquals($expected, $promise->wait(true));
     }
 
-    public function testDontPrefixApiRequestPath()
+    public function pathProvider()
     {
-        $request = new Request('GET', '/api/packages/');
-        $expected = new Request('GET', '/api/packages/');
-        $plugin = new PathPrepend('/api');
-        $callback = $this->getMockBuilder(\stdClass::class)
-            ->setMethods(['next'])
-            ->getMock()
-        ;
-        $callback->expects($this->once())
-            ->method('next')
-            ->with($expected)
-        ;
-
-        $plugin->handleRequest($request, [$callback, 'next'], function () {
-        });
+        return [
+            ['/api/packages/', '/api/packages/'],
+            ['/packages/', '/api/packages/'],
+        ];
     }
 }

tests/HttpClient/Plugin/RequestSignatureTest.php

@@ -10,12 +10,15 @@
 namespace PrivatePackagist\ApiClient\HttpClient\Plugin;
 
 use GuzzleHttp\Psr7\Request;
+use Http\Promise\FulfilledPromise;
 use PHPUnit\Framework\TestCase;
 
 class RequestSignatureTest extends TestCase
 {
     /** @var RequestSignature */
     private $plugin;
+    private $next;
+    private $first;
     private $token;
     private $secret;
     private $timestamp;
@@ -29,6 +32,12 @@ protected function setUp()
         $this->nonce = '78b9869e96cf58b5902154e0228f8576f042e5ac';
         $this->plugin = new RequestSignatureMock($this->token, $this->secret);
         $this->plugin->init($this->timestamp, $this->nonce);
+        $this->next = function (Request $request) {
+            return new FulfilledPromise($request);
+        };
+        $this->first = function () {
+            throw new \RuntimeException('Did not expect plugin to call first');
+        };
     }
 
     public function testPrefixRequestPath()
@@ -43,20 +52,17 @@ public function testPrefixRequestPath()
             json_encode(['foo' => 'bar'])
         );
 
-        $this->plugin->handleRequest($request, function (Request $actual) use ($expected) {
-            $this->assertEquals($expected->getHeaders(), $actual->getHeaders());
-        }, function () {
-        });
+        $promise = $this->plugin->handleRequest($request, $this->next, $this->first);
+
+        $this->assertEquals($expected->getHeaders(), $promise->wait(true)->getHeaders());
     }
 
     public function testPrefixRequestPathSmoke()
     {
         $request = new Request('POST', '/packages/?foo=bar', [], json_encode(['foo' => 'bar']));
 
-        $plugin = new RequestSignature($this->token, $this->secret);
-        $plugin->handleRequest($request, function (Request $actual) {
-            $this->assertNotNull($actual->getHeader('Authorization')[0]);
-        }, function () {
-        });
+        $promise = $this->plugin->handleRequest($request, $this->next, $this->first);
+
+        $this->assertNotNull($promise->wait(true)->getHeader('Authorization')[0]);
     }
 }