Update yiisoft/middleware-dispatcher version to 5.0 (#185)

* Update `yiisoft/middleware-dispatcher` version to 5.0

* Add changelog

Author: rustamwin

CHANGELOG.md

@@ -1,8 +1,8 @@
 # Yii Router Change Log
 
-## 2.0.1 under development
+## 2.1.0 under development
 
-- no changes in this release.
+- Chg #185: Update `yiisoft/middleware-dispatcher` version to `^5.0` (@rustamwin)
 
 ## 2.0.0 November 12, 2022
 

composer.json

@@ -25,7 +25,7 @@
         "psr/http-server-handler": "^1.0",
         "psr/http-server-middleware": "^1.0",
         "yiisoft/http": "^1.2",
-        "yiisoft/middleware-dispatcher": "^3.0|^4.0",
+        "yiisoft/middleware-dispatcher": "^5.0",
         "yiisoft/router-implementation": "1.0.0"
     },
     "require-dev": {

tests/GroupTest.php

@@ -15,7 +15,6 @@
 use RuntimeException;
 use Yiisoft\Middleware\Dispatcher\MiddlewareDispatcher;
 use Yiisoft\Middleware\Dispatcher\MiddlewareFactory;
-use Yiisoft\Middleware\Dispatcher\WrapperFactory;
 use Yiisoft\Router\Group;
 use Yiisoft\Router\Route;
 use Yiisoft\Router\RouteCollection;
@@ -421,7 +420,7 @@ public function testImmutability(): void
     {
         $container = new SimpleContainer();
         $middlewareDispatcher = new MiddlewareDispatcher(
-            new MiddlewareFactory($container, new WrapperFactory($container)),
+            new MiddlewareFactory($container),
         );
 
         $group = Group::create();
@@ -449,9 +448,8 @@ public function handle(ServerRequestInterface $request): ResponseInterface
     private function getDispatcher(): MiddlewareDispatcher
     {
         $container = new Container([]);
-        $wrapperFactory = new WrapperFactory($container);
         return new MiddlewareDispatcher(
-            new MiddlewareFactory($container, $wrapperFactory),
+            new MiddlewareFactory($container),
             $this->createMock(EventDispatcherInterface::class)
         );
     }

tests/MatchingResultTest.php

@@ -16,7 +16,6 @@
 use Yiisoft\Http\Method;
 use Yiisoft\Middleware\Dispatcher\MiddlewareDispatcher;
 use Yiisoft\Middleware\Dispatcher\MiddlewareFactory;
-use Yiisoft\Middleware\Dispatcher\WrapperFactory;
 use Yiisoft\Router\MatchingResult;
 use Yiisoft\Router\Route;
 use Yiisoft\Test\Support\Container\SimpleContainer;
@@ -53,7 +52,7 @@ public function testProcessSuccess(): void
     {
         $container = $this->createMock(ContainerInterface::class);
         $dispatcher = new MiddlewareDispatcher(
-            new MiddlewareFactory($container, new WrapperFactory($container)),
+            new MiddlewareFactory($container),
             $this->createMock(EventDispatcherInterface::class)
         );
         $route = Route::post('/', $dispatcher)->middleware($this->getMiddleware());
@@ -87,7 +86,7 @@ public function testImmutability(): void
     {
         $container = new SimpleContainer();
         $middlewareDispatcher = new MiddlewareDispatcher(
-            new MiddlewareFactory($container, new WrapperFactory($container)),
+            new MiddlewareFactory($container),
         );
 
         $result = MatchingResult::fromFailure([Method::GET]);

tests/Middleware/RouterTest.php

@@ -14,7 +14,6 @@
 use Psr\Http\Server\RequestHandlerInterface;
 use Yiisoft\Http\Method;
 use Yiisoft\Middleware\Dispatcher\MiddlewareFactory;
-use Yiisoft\Middleware\Dispatcher\WrapperFactory;
 use Yiisoft\Router\CurrentRoute;
 use Yiisoft\Router\Group;
 use Yiisoft\Router\MatchingResult;
@@ -199,7 +198,7 @@ private function createRouterMiddleware(
         return new Router(
             $this->getMatcher($routeCollection),
             new Psr17Factory(),
-            new MiddlewareFactory($container, new WrapperFactory($container)),
+            new MiddlewareFactory($container),
             $currentRoute ?? new CurrentRoute()
         );
     }

tests/RouteCollectionTest.php

@@ -15,7 +15,6 @@
 use RuntimeException;
 use Yiisoft\Middleware\Dispatcher\MiddlewareDispatcher;
 use Yiisoft\Middleware\Dispatcher\MiddlewareFactory;
-use Yiisoft\Middleware\Dispatcher\WrapperFactory;
 use Yiisoft\Router\Group;
 use Yiisoft\Router\Route;
 use Yiisoft\Router\RouteCollection;
@@ -385,7 +384,7 @@ private function getDispatcher(ContainerInterface $container = null): Middleware
     {
         $container ??= $this->createMock(ContainerInterface::class);
         return new MiddlewareDispatcher(
-            new MiddlewareFactory($container, new WrapperFactory($container)),
+            new MiddlewareFactory($container),
             $this->createMock(EventDispatcherInterface::class)
         );
     }

tests/RouteTest.php

@@ -16,7 +16,6 @@
 use Yiisoft\Http\Method;
 use Yiisoft\Middleware\Dispatcher\MiddlewareDispatcher;
 use Yiisoft\Middleware\Dispatcher\MiddlewareFactory;
-use Yiisoft\Middleware\Dispatcher\WrapperFactory;
 use Yiisoft\Router\Route;
 use Yiisoft\Router\Tests\Support\AssertTrait;
 use Yiisoft\Router\Tests\Support\Container;
@@ -402,7 +401,7 @@ public function testImmutability(): void
     {
         $container = new SimpleContainer();
         $middlewareDispatcher = new MiddlewareDispatcher(
-            new MiddlewareFactory($container, new WrapperFactory($container)),
+            new MiddlewareFactory($container),
         );
 
         $route = Route::get('/');
@@ -435,13 +434,13 @@ private function getDispatcher(ContainerInterface $container = null): Middleware
     {
         if ($container === null) {
             return new MiddlewareDispatcher(
-                new MiddlewareFactory($this->getContainer(), new WrapperFactory($this->getContainer())),
+                new MiddlewareFactory($this->getContainer()),
                 $this->createMock(EventDispatcherInterface::class)
             );
         }
 
         return new MiddlewareDispatcher(
-            new MiddlewareFactory($container, new WrapperFactory($container)),
+            new MiddlewareFactory($container),
             $this->createMock(EventDispatcherInterface::class)
         );
     }