Merge pull request #1 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-http-status-exceptions": "^1.0",
     "clue/buzz-react": "^1.1"
   },

composer.lock

@@ -2,10 +2,10 @@
 
 namespace ApiClients\Middleware\HttpExceptions;
 
+use ApiClients\Foundation\Middleware\Annotation\SecondLast;
 use ApiClients\Foundation\Middleware\MiddlewareInterface;
 use ApiClients\Foundation\Middleware\PostTrait;
 use ApiClients\Foundation\Middleware\PreTrait;
-use ApiClients\Foundation\Middleware\Priority;
 use ApiClients\Tools\Psr7\HttpStatusExceptions\ExceptionFactory;
 use Clue\React\Buzz\Message\ResponseException;
 use React\Promise\CancellablePromiseInterface;
@@ -17,24 +17,21 @@ final class HttpExceptionsMiddleware implements MiddlewareInterface
     use PreTrait;
     use PostTrait;
 
-    /**
-     * @return int
-     */
-    public function priority(): int
-    {
-        return Priority::SECOND_LAST;
-    }
-
     /**
      * When $throwable is a ResponseException this method will turn it into a
      * HTTP status code specific exception.
      *
      * @param Throwable $throwable
      * @param array $options
      * @return CancellablePromiseInterface
+     *
+     * @SecondLast()
      */
-    public function error(Throwable $throwable, array $options = []): CancellablePromiseInterface
-    {
+    public function error(
+        Throwable $throwable,
+        string $transactionId,
+        array $options = []
+    ): CancellablePromiseInterface {
         if (!($throwable instanceof ResponseException)) {
             return reject($throwable);
         }

src/HttpExceptionsMiddleware.php

@@ -2,7 +2,6 @@
 
 namespace ApiClients\Tests\Middleware\HttpExceptions;
 
-use ApiClients\Foundation\Middleware\Priority;
 use ApiClients\Middleware\HttpExceptions\HttpExceptionsMiddleware;
 use ApiClients\Tools\Psr7\HttpStatusExceptions\ExceptionFactory;
 use ApiClients\Tools\TestUtilities\TestCase;
@@ -12,21 +11,9 @@
 use RingCentral\Psr7\Response;
 use Throwable;
 use function Clue\React\Block\await;
-use function React\Promise\reject;
 
 final class HttpExceptionsMiddlewareTest extends TestCase
 {
-    /**
-     * Ensure we run second last so the last can be logging or so that stores information.
-     */
-    public function testPriority()
-    {
-        self::assertSame(
-            Priority::SECOND_LAST,
-            (new HttpExceptionsMiddleware())->priority()
-        );
-    }
-
     public function provideThrowables()
     {
         yield [
@@ -55,7 +42,7 @@ public function testException(Throwable $input, Throwable $output)
 
         try {
             await(
-                (new HttpExceptionsMiddleware())->error($input, []),
+                (new HttpExceptionsMiddleware())->error($input, 'abc', []),
                 Factory::create()
             );
         } catch (Throwable $result) {