Make MiddlewareFactory internal (#56)

rustamwin · web-flow · commit 480c0902269b · 2022-09-05T15:31:41.000+05:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,6 +3,7 @@
 ## 3.0.0 under development
 
 - New #55: Add wrapper factory (@rustamwin)
+- Chg #56: Make `MiddlewareFactory` internal (@rustamwin)
 
 ## 2.1.0 August 05, 2022
 
diff --git a/config/web.php b/config/web.php
@@ -2,12 +2,9 @@
 
 declare(strict_types=1);
 
-use Yiisoft\Middleware\Dispatcher\MiddlewareFactory;
-use Yiisoft\Middleware\Dispatcher\MiddlewareFactoryInterface;
 use Yiisoft\Middleware\Dispatcher\WrapperFactory;
 use Yiisoft\Middleware\Dispatcher\WrapperFactoryInterface;
 
 return [
-    MiddlewareFactoryInterface::class => MiddlewareFactory::class,
     WrapperFactoryInterface::class => WrapperFactory::class,
 ];
diff --git a/src/MiddlewareDispatcher.php b/src/MiddlewareDispatcher.php
@@ -19,15 +19,15 @@ final class MiddlewareDispatcher
      * @var MiddlewareStack|null The middleware stack.
      */
     private ?MiddlewareStack $stack = null;
-    private MiddlewareFactoryInterface $middlewareFactory;
+    private MiddlewareFactory $middlewareFactory;
     private ?EventDispatcherInterface $eventDispatcher;
 
     /**
      * @var array[]|callable[]|string[]
      */
     private array $middlewareDefinitions = [];
 
-    public function __construct(MiddlewareFactoryInterface $middlewareFactory, ?EventDispatcherInterface $eventDispatcher = null)
+    public function __construct(MiddlewareFactory $middlewareFactory, ?EventDispatcherInterface $eventDispatcher = null)
     {
         $this->middlewareFactory = $middlewareFactory;
         $this->eventDispatcher = $eventDispatcher;
diff --git a/src/MiddlewareFactory.php b/src/MiddlewareFactory.php
@@ -19,11 +19,11 @@
 use function is_string;
 
 /**
- * Creates a PSR-15 middleware based on the definition provided.
+ * @internal Creates a PSR-15 middleware based on the definition provided.
  *
  * @psalm-import-type ArrayDefinitionConfig from ArrayDefinition
  */
-final class MiddlewareFactory implements MiddlewareFactoryInterface
+final class MiddlewareFactory
 {
     private ContainerInterface $container;
     private WrapperFactoryInterface $wrapperFactory;
diff --git a/src/MiddlewareFactoryInterface.php b/src/MiddlewareFactoryInterface.php
diff --git a/tests/MiddlewareFactoryTest.php b/tests/MiddlewareFactoryTest.php
@@ -15,7 +15,6 @@
 use stdClass;
 use Yiisoft\Middleware\Dispatcher\InvalidMiddlewareDefinitionException;
 use Yiisoft\Middleware\Dispatcher\MiddlewareFactory;
-use Yiisoft\Middleware\Dispatcher\MiddlewareFactoryInterface;
 use Yiisoft\Middleware\Dispatcher\Tests\Support\UseParamsController;
 use Yiisoft\Middleware\Dispatcher\Tests\Support\UseParamsMiddleware;
 use Yiisoft\Middleware\Dispatcher\Tests\Support\InvalidController;
@@ -254,7 +253,7 @@ public function testInvalidMiddlewareWithWrongArrayWithIntItems(): void
             ->create([7, 42]);
     }
 
-    private function getMiddlewareFactory(ContainerInterface $container = null): MiddlewareFactoryInterface
+    private function getMiddlewareFactory(ContainerInterface $container = null): MiddlewareFactory
     {
         if ($container !== null) {
             return new MiddlewareFactory($container, new WrapperFactory($container));

Original file line number	Diff line number	Diff line change
`@@ -19,11 +19,11 @@`
`19`	`19`	`use function is_string;`
`20`	`20`
`21`	`21`	`/**`
`22`		`- * Creates a PSR-15 middleware based on the definition provided.`
	`22`	`+ * @internal Creates a PSR-15 middleware based on the definition provided.`
`23`	`23`	`*`
`24`	`24`	`* @psalm-import-type ArrayDefinitionConfig from ArrayDefinition`
`25`	`25`	`*/`
`26`		`-final class MiddlewareFactory implements MiddlewareFactoryInterface`
	`26`	`+final class MiddlewareFactory`
`27`	`27`	`{`
`28`	`28`	`private ContainerInterface $container;`
`29`	`29`	`private WrapperFactoryInterface $wrapperFactory;`