Middleware 4.0

Author: WyriHaximus

composer.json

@@ -10,7 +10,7 @@
   "require": {
     "php": "^7.0",
     "api-clients/json": "^1.0",
-    "api-clients/middleware": "^2.0",
+    "api-clients/middleware": "^4.0",
     "clue/buzz-react": "^1.1",
     "psr/http-message": "^1.0",
     "ringcentral/psr7": "^1.2",

composer.lock

@@ -14,15 +14,17 @@ class AcceptJsonMiddleware implements MiddlewareInterface
 {
     use PostTrait;
     use ErrorTrait;
-    use DefaultPriorityTrait;
 
     /**
      * @param RequestInterface $request
      * @param array $options
      * @return CancellablePromiseInterface
      */
-    public function pre(RequestInterface $request, array $options = []): CancellablePromiseInterface
-    {
+    public function pre(
+        RequestInterface $request,
+        string $transactionId,
+        array $options = []
+    ): CancellablePromiseInterface {
         return resolve($request->withAddedHeader('Accept', 'application/json'));
     }
 }

src/AcceptJsonMiddleware.php

@@ -2,6 +2,7 @@
 
 namespace ApiClients\Middleware\Json;
 
+use ApiClients\Foundation\Middleware\Annotation\First;
 use ApiClients\Foundation\Middleware\ErrorTrait;
 use ApiClients\Foundation\Middleware\MiddlewareInterface;
 use ApiClients\Foundation\Middleware\PreTrait;
@@ -31,21 +32,18 @@ public function __construct(JsonDecodeService $jsonDecodeService)
         $this->jsonDecodeService = $jsonDecodeService;
     }
 
-    /**
-     * @return int
-     */
-    public function priority(): int
-    {
-        return Priority::FIRST;
-    }
-
     /**
      * @param ResponseInterface $response
      * @param array $options
      * @return CancellablePromiseInterface
+     *
+     * @First()
      */
-    public function post(ResponseInterface $response, array $options = []): CancellablePromiseInterface
-    {
+    public function post(
+        ResponseInterface $response,
+        string $transactionId,
+        array $options = []
+    ): CancellablePromiseInterface {
         if ($response->getBody() instanceof ReadableStreamInterface) {
             return resolve($response);
         }

src/JsonDecodeMiddleware.php

@@ -2,6 +2,7 @@
 
 namespace ApiClients\Middleware\Json;
 
+use ApiClients\Foundation\Middleware\Annotation\First;
 use ApiClients\Foundation\Middleware\ErrorTrait;
 use ApiClients\Foundation\Middleware\MiddlewareInterface;
 use ApiClients\Foundation\Middleware\PostTrait;
@@ -30,21 +31,18 @@ public function __construct(JsonEncodeService $jsonEncodeService)
         $this->jsonEncodeService = $jsonEncodeService;
     }
 
-    /**
-     * @return int
-     */
-    public function priority(): int
-    {
-        return Priority::FIRST;
-    }
-
     /**
      * @param RequestInterface $request
      * @param array $options
      * @return CancellablePromiseInterface
+     *
+     * @First()
      */
-    public function pre(RequestInterface $request, array $options = []): CancellablePromiseInterface
-    {
+    public function pre(
+        RequestInterface $request,
+        string $transactionId,
+        array $options = []
+    ): CancellablePromiseInterface {
         if (!($request->getBody() instanceof JsonStream)) {
             return resolve($request);
         }

src/JsonEncodeMiddleware.php

@@ -15,7 +15,7 @@ public function testPre()
         $middleware = new AcceptJsonMiddleware();
         $request = new Request('GET', 'https://example.com', [], '');
 
-        $modifiedRequest = await($middleware->pre($request), Factory::create());
+        $modifiedRequest = await($middleware->pre($request, 'abc'), Factory::create());
         self::assertSame(
             [
                 'Host' => ['example.com'],

tests/AcceptJsonMiddlewareTest.php

@@ -22,7 +22,7 @@ public function testPost()
         $response = new Response(200, [], '[]');
 
         $body = await(
-            $middleware->post($response),
+            $middleware->post($response, 'abc'),
             $loop
         )->getBody();
 
@@ -44,17 +44,9 @@ public function testPostNoJson()
         self::assertSame(
             $response,
             await(
-                $middleware->post($response),
+                $middleware->post($response, 'abc'),
                 $loop
             )
         );
     }
-
-    public function testPriority()
-    {
-        $loop = Factory::create();
-        $service = new JsonDecodeService($loop);
-        $middleware = new JsonDecodeMiddleware($service);
-        self::assertSame(1000, $middleware->priority());
-    }
 }