Merge pull request #2 from php-api-clients/middleware-4.0

Middleware 4.0

Author: WyriHaximus

composer.json

@@ -10,7 +10,7 @@
   ],
   "require": {
     "php": "^7.0",
-    "api-clients/middleware": "^2.0",
+    "api-clients/middleware": "^4.0",
     "api-clients/psr7-oauth1": "^2.0",
     "guzzlehttp/psr7": "^1.3",
     "wyrihaximus/ticking-promise": "^1.6"

composer.lock

@@ -17,7 +17,6 @@
 
 class Oauth1Middleware implements MiddlewareInterface
 {
-    use DefaultPriorityTrait;
     use PostTrait;
     use ErrorTrait;
 
@@ -39,8 +38,11 @@ public function __construct(LoopInterface $loop)
      * @param array $options
      * @return CancellablePromiseInterface
      */
-    public function pre(RequestInterface $request, array $options = []): CancellablePromiseInterface
-    {
+    public function pre(
+        RequestInterface $request,
+        string $transactionId,
+        array $options = []
+    ): CancellablePromiseInterface {
         if (!$this->validateOptions($options)) {
             return resolve($request);
         }

src/Oauth1Middleware.php

@@ -63,7 +63,7 @@ public function testIncompleteRequestOptions(array $options)
         $request = $this->prophesize(RequestInterface::class)->reveal();
 
         $middleware = new Oauth1Middleware($loop);
-        $result = await($middleware->pre($request, $options), $loop);
+        $result = await($middleware->pre($request, 'abc', $options), $loop);
 
         $this->assertSame($request, $result);
     }
@@ -85,7 +85,7 @@ public function testRequest()
         );
 
         $middleware = new Oauth1Middleware($loop);
-        $result = await($middleware->pre($request, $options), $loop);
+        $result = await($middleware->pre($request, 'abc', $options), $loop);
 
         $this->assertNotSame($request, $result);