Fix #43: Reverse middleware order in withMiddlewares()

rustamwin · web-flow · commit 97e71cd33111 · 2021-11-10T21:56:43.000+03:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,9 +1,9 @@
 # Yii Middleware Dispatcher Change Log
 
 
-## 1.0.1 under development
+## 2.0.0 under development
 
-- no changes in this release.
+- Chg #43: Reverse middleware order in `withMiddlewares()` (rustamwin)
 
 ## 1.0.0 November 08, 2021
 
diff --git a/README.md b/README.md
@@ -51,6 +51,7 @@ After dispatcher instance obtained, it should be fed with some middleware:
 
 ```php
 $dispatcher = $dispatcher->withMiddlewares([
+    TeapotAccessChecker::class,
     static function (): ResponseInterface {
         return new Response(418);
     },
@@ -81,7 +82,7 @@ $request = new ServerRequest('GET', '/teapot');
 $response = $dispatcher->dispatch($request, $this->getRequestHandler());
 ```
 
-Given a request dispatcher executes middleware in the set and produces response. Last specified middleware will be
+Given a request dispatcher executes middleware in the set and produces response. First specified middleware will be
 executed first. For each middleware
 `\Yiisoft\Middleware\Dispatcher\Event\BeforeMiddleware` and `\Yiisoft\Middleware\Dispatcher\Event\AfterMiddleware`
 events are triggered.
diff --git a/src/MiddlewareDispatcher.php b/src/MiddlewareDispatcher.php
@@ -72,7 +72,7 @@ public function dispatch(
     public function withMiddlewares(array $middlewareDefinitions): self
     {
         $new = clone $this;
-        $new->middlewareDefinitions = $middlewareDefinitions;
+        $new->middlewareDefinitions = array_reverse($middlewareDefinitions);
 
         // Fixes a memory leak.
         unset($new->stack);
diff --git a/tests/MiddlewareDispatcherTest.php b/tests/MiddlewareDispatcherTest.php
@@ -62,7 +62,7 @@ public function testMiddlewareFullStackCalled(): void
             return new Response(200, [], null, '1.1', implode($request->getAttributes()));
         };
 
-        $dispatcher = $this->createDispatcher()->withMiddlewares([$middleware2, $middleware1]);
+        $dispatcher = $this->createDispatcher()->withMiddlewares([$middleware1, $middleware2]);
 
         $response = $dispatcher->dispatch($request, $this->getRequestHandler());
         $this->assertSame(200, $response->getStatusCode());
@@ -80,7 +80,7 @@ public function testMiddlewareStackInterrupted(): void
             return new Response(200);
         };
 
-        $dispatcher = $this->createDispatcher()->withMiddlewares([$middleware2, $middleware1]);
+        $dispatcher = $this->createDispatcher()->withMiddlewares([$middleware1, $middleware2]);
 
         $response = $dispatcher->dispatch($request, $this->getRequestHandler());
         $this->assertSame(403, $response->getStatusCode());
@@ -99,7 +99,7 @@ public function testEventsAreDispatched(): void
             return new Response();
         };
 
-        $dispatcher = $this->createDispatcher(null, $eventDispatcher)->withMiddlewares([$middleware2, $middleware1]);
+        $dispatcher = $this->createDispatcher(null, $eventDispatcher)->withMiddlewares([$middleware1, $middleware2]);
         $dispatcher->dispatch($request, $this->getRequestHandler());
 
         $this->assertEquals(

Original file line number	Diff line number	Diff line change
`@@ -72,7 +72,7 @@ public function dispatch(`
`72`	`72`	`public function withMiddlewares(array $middlewareDefinitions): self`
`73`	`73`	`{`
`74`	`74`	`$new = clone $this;`
`75`		`- $new->middlewareDefinitions = $middlewareDefinitions;`
	`75`	`+ $new->middlewareDefinitions = array_reverse($middlewareDefinitions);`
`76`	`76`
`77`	`77`	`// Fixes a memory leak.`
`78`	`78`	`unset($new->stack);`