From 78ebd49cf34322f060e7d5b0ff6e189b88b55037 Mon Sep 17 00:00:00 2001
From: Cees-Jan Kiewiet <ceesjank@gmail.com>
Date: Tue, 27 Jun 2017 00:12:37 +0200
Subject: [PATCH] Implemented #9

---
 src/DefaultPriorityTrait.php              | 14 --------------
 src/MiddlewareInterface.php               | 13 +++----------
 src/MiddlewareRunner.php                  |  2 +-
 tests/DummyMiddleware.php                 |  5 +----
 tests/DummyMiddlewareTest.php             |  9 ---------
 tests/MiddlewareRunnerTest.php            | 11 ++++-------
 tests/TestMiddlewares/OneMiddleware.php   |  3 ---
 tests/TestMiddlewares/ThreeMiddleware.php |  3 ---
 tests/TestMiddlewares/TwoMiddleware.php   |  3 ---
 9 files changed, 9 insertions(+), 54 deletions(-)
 delete mode 100644 src/DefaultPriorityTrait.php

diff --git a/src/DefaultPriorityTrait.php b/src/DefaultPriorityTrait.php
deleted file mode 100644
index 06f5850..0000000
--- a/src/DefaultPriorityTrait.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php declare(strict_types=1);
-
-namespace ApiClients\Foundation\Middleware;
-
-trait DefaultPriorityTrait
-{
-    /**
-     * @return int
-     */
-    public function priority(): int
-    {
-        return Priority::DEFAULT;
-    }
-}
diff --git a/src/MiddlewareInterface.php b/src/MiddlewareInterface.php
index 6fb7218..c0ed1d5 100644
--- a/src/MiddlewareInterface.php
+++ b/src/MiddlewareInterface.php
@@ -9,19 +9,12 @@
 
 /**
  * Middleware, when a new request is made an instance specifically for that request is made for each request.
+ *
+ * Priority ranging from 0 to 1000. Where 1000 will be executed first on `pre`/`post`/`error`
+ * and 0 last on `pre`/`post`/`error`.
  */
 interface MiddlewareInterface
 {
-    /**
-     * Priority ranging from 0 to 1000. Where 1000 will be executed first on `pre`/`post`/`error`
-     * and 0 last on `pre`/`post`/`error`.
-     *
-     * @deprecated Use annotations for more fine grained control
-     *
-     * @return int
-     */
-    public function priority(): int;
-
     /**
      * Return the processed $request via a fulfilled promise.
      * When implementing cache or other feature that returns a response, do it with a rejected promise.
diff --git a/src/MiddlewareRunner.php b/src/MiddlewareRunner.php
index ef2a5c1..424fea2 100644
--- a/src/MiddlewareRunner.php
+++ b/src/MiddlewareRunner.php
@@ -142,6 +142,6 @@ private function getPriority(string $method, MiddlewareInterface $middleware): i
             return $annotation->priority();
         }
 
-        return $middleware->priority();
+        return Priority::DEFAULT;
     }
 }
diff --git a/tests/DummyMiddleware.php b/tests/DummyMiddleware.php
index 3837812..f1e979b 100644
--- a/tests/DummyMiddleware.php
+++ b/tests/DummyMiddleware.php
@@ -1,9 +1,7 @@
-<?php
-declare(strict_types=1);
+<?php declare(strict_types=1);
 
 namespace ApiClients\Tests\Foundation\Middleware;
 
-use ApiClients\Foundation\Middleware\DefaultPriorityTrait;
 use ApiClients\Foundation\Middleware\ErrorTrait;
 use ApiClients\Foundation\Middleware\MiddlewareInterface;
 use ApiClients\Foundation\Middleware\PostTrait;
@@ -11,7 +9,6 @@
 
 class DummyMiddleware implements MiddlewareInterface
 {
-    use DefaultPriorityTrait;
     use PreTrait;
     use PostTrait;
     use ErrorTrait;
diff --git a/tests/DummyMiddlewareTest.php b/tests/DummyMiddlewareTest.php
index e140b1d..0d706e3 100644
--- a/tests/DummyMiddlewareTest.php
+++ b/tests/DummyMiddlewareTest.php
@@ -11,15 +11,6 @@
 
 class DummyMiddlewareTest extends TestCase
 {
-    public function testPriority()
-    {
-        $middleware = new DummyMiddleware();
-        $this->assertSame(
-            500,
-            $middleware->priority()
-        );
-    }
-
     public function testPre()
     {
         $middleware = new DummyMiddleware();
diff --git a/tests/MiddlewareRunnerTest.php b/tests/MiddlewareRunnerTest.php
index 9a792fb..a37b85d 100644
--- a/tests/MiddlewareRunnerTest.php
+++ b/tests/MiddlewareRunnerTest.php
@@ -30,11 +30,8 @@ public function testAll()
         $options = [];
 
         $middlewareOne = Phake::mock(MiddlewareInterface::class);
-        Phake::when($middlewareOne)->priority()->thenReturn(1000);
         $middlewareTwo = Phake::mock(MiddlewareInterface::class);
-        Phake::when($middlewareTwo)->priority()->thenReturn(500);
         $middlewareThree = Phake::mock(MiddlewareInterface::class);
-        Phake::when($middlewareThree)->priority()->thenReturn(0);
         $args = [
             $options,
             $middlewareThree,
@@ -68,15 +65,15 @@ public function testAll()
         }
 
         Phake::inOrder(
+            Phake::verify($middlewareThree)->pre($request, $options, $id),
             Phake::verify($middlewareOne)->pre($request, $options, $id),
             Phake::verify($middlewareTwo)->pre($request, $options, $id),
-            Phake::verify($middlewareThree)->pre($request, $options, $id),
+            Phake::verify($middlewareThree)->post($response, $options, $id),
             Phake::verify($middlewareOne)->post($response, $options, $id),
             Phake::verify($middlewareTwo)->post($response, $options, $id),
-            Phake::verify($middlewareThree)->post($response, $options, $id),
+            Phake::verify($middlewareThree)->error($exception, $options, $id),
             Phake::verify($middlewareOne)->error($exception, $options, $id),
-            Phake::verify($middlewareTwo)->error($exception, $options, $id),
-            Phake::verify($middlewareThree)->error($exception, $options, $id)
+            Phake::verify($middlewareTwo)->error($exception, $options, $id)
         );
     }
 
diff --git a/tests/TestMiddlewares/OneMiddleware.php b/tests/TestMiddlewares/OneMiddleware.php
index f779121..a9fe803 100644
--- a/tests/TestMiddlewares/OneMiddleware.php
+++ b/tests/TestMiddlewares/OneMiddleware.php
@@ -3,7 +3,6 @@
 namespace ApiClients\Tests\Foundation\Middleware\TestMiddlewares;
 
 use ApiClients\Foundation\Middleware\Annotation\Priority as PriorityAnnotation;
-use ApiClients\Foundation\Middleware\DefaultPriorityTrait;
 use ApiClients\Foundation\Middleware\MiddlewareInterface;
 use ApiClients\Foundation\Middleware\Priority;
 use Psr\Http\Message\RequestInterface;
@@ -15,8 +14,6 @@
 
 class OneMiddleware implements MiddlewareInterface
 {
-    use DefaultPriorityTrait;
-
     private $calls = [];
 
     /**
diff --git a/tests/TestMiddlewares/ThreeMiddleware.php b/tests/TestMiddlewares/ThreeMiddleware.php
index 932a6aa..314bfcd 100644
--- a/tests/TestMiddlewares/ThreeMiddleware.php
+++ b/tests/TestMiddlewares/ThreeMiddleware.php
@@ -5,7 +5,6 @@
 use ApiClients\Foundation\Middleware\Annotation\Early;
 use ApiClients\Foundation\Middleware\Annotation\First;
 use ApiClients\Foundation\Middleware\Annotation\Late;
-use ApiClients\Foundation\Middleware\DefaultPriorityTrait;
 use ApiClients\Foundation\Middleware\MiddlewareInterface;
 use Psr\Http\Message\RequestInterface;
 use Psr\Http\Message\ResponseInterface;
@@ -16,8 +15,6 @@
 
 class ThreeMiddleware implements MiddlewareInterface
 {
-    use DefaultPriorityTrait;
-
     private $calls = [];
 
     /**
diff --git a/tests/TestMiddlewares/TwoMiddleware.php b/tests/TestMiddlewares/TwoMiddleware.php
index abcfca8..c289dc6 100644
--- a/tests/TestMiddlewares/TwoMiddleware.php
+++ b/tests/TestMiddlewares/TwoMiddleware.php
@@ -2,7 +2,6 @@
 
 namespace ApiClients\Tests\Foundation\Middleware\TestMiddlewares;
 
-use ApiClients\Foundation\Middleware\DefaultPriorityTrait;
 use ApiClients\Foundation\Middleware\MiddlewareInterface;
 use Psr\Http\Message\RequestInterface;
 use Psr\Http\Message\ResponseInterface;
@@ -13,8 +12,6 @@
 
 class TwoMiddleware implements MiddlewareInterface
 {
-    use DefaultPriorityTrait;
-
     private $calls = [];
 
     /**