Fix #30: Make events optional (#41)

rustamwin · web-flow · commit 5099f4f8fdef · 2021-10-22T11:07:15.000+03:00
diff --git a/composer.json b/composer.json
@@ -31,7 +31,7 @@
         "phpunit/phpunit": "^9.5",
         "roave/infection-static-analysis-plugin": "^1.8",
         "spatie/phpunit-watcher": "^1.23",
-        "vimeo/psalm": "^4.8",
+        "vimeo/psalm": "^4.9",
         "yiisoft/test-support": "^1.3"
     },
     "autoload": {
diff --git a/psalm.xml b/psalm.xml
@@ -6,6 +6,9 @@
     xsi:schemaLocation="https://getpsalm.org/schema/config vendor/vimeo/psalm/config.xsd"
 >
     <projectFiles>
-        <directory name="src" />
+        <directory name="src"/>
+        <ignoreFiles>
+            <directory name="vendor"/>
+        </ignoreFiles>
     </projectFiles>
 </psalm>
diff --git a/src/InvalidMiddlewareDefinitionException.php b/src/InvalidMiddlewareDefinitionException.php
@@ -62,6 +62,7 @@ static function (&$item, $key) {
                     }
                 }
             );
+            /** @var string[] $items */
             return '[' . implode(', ', $items) . ']';
         }
 
diff --git a/src/MiddlewareDispatcher.php b/src/MiddlewareDispatcher.php
@@ -19,14 +19,14 @@ final class MiddlewareDispatcher
      */
     private ?MiddlewareStack $stack = null;
     private MiddlewareFactoryInterface $middlewareFactory;
-    private EventDispatcherInterface $eventDispatcher;
+    private ?EventDispatcherInterface $eventDispatcher;
 
     /**
      * @var array[]|callable[]|string[]
      */
     private array $middlewareDefinitions = [];
 
-    public function __construct(MiddlewareFactoryInterface $middlewareFactory, EventDispatcherInterface $eventDispatcher)
+    public function __construct(MiddlewareFactoryInterface $middlewareFactory, ?EventDispatcherInterface $eventDispatcher = null)
     {
         $this->middlewareFactory = $middlewareFactory;
         $this->eventDispatcher = $eventDispatcher;
diff --git a/src/MiddlewareStack.php b/src/MiddlewareStack.php
@@ -23,7 +23,7 @@ final class MiddlewareStack implements RequestHandlerInterface
      * @var RequestHandlerInterface|null stack of middleware
      */
     private ?RequestHandlerInterface $stack = null;
-    private EventDispatcherInterface $eventDispatcher;
+    private ?EventDispatcherInterface $eventDispatcher;
     private RequestHandlerInterface $fallbackHandler;
     private array $middlewares;
 
@@ -33,7 +33,7 @@ final class MiddlewareStack implements RequestHandlerInterface
      * @param EventDispatcherInterface $eventDispatcher Event dispatcher to use for triggering before/after middleware
      * events.
      */
-    public function __construct(array $middlewares, RequestHandlerInterface $fallbackHandler, EventDispatcherInterface $eventDispatcher)
+    public function __construct(array $middlewares, RequestHandlerInterface $fallbackHandler, ?EventDispatcherInterface $eventDispatcher = null)
     {
         if ($middlewares === []) {
             throw new RuntimeException('Stack is empty.');
@@ -75,12 +75,12 @@ private function wrap(Closure $middlewareFactory, RequestHandlerInterface $handl
             private Closure $middlewareFactory;
             private ?MiddlewareInterface $middleware = null;
             private RequestHandlerInterface $handler;
-            private EventDispatcherInterface $eventDispatcher;
+            private ?EventDispatcherInterface $eventDispatcher;
 
             public function __construct(
                 Closure $middlewareFactory,
                 RequestHandlerInterface $handler,
-                EventDispatcherInterface $eventDispatcher
+                ?EventDispatcherInterface $eventDispatcher
             ) {
                 $this->middlewareFactory = $middlewareFactory;
                 $this->handler = $handler;
@@ -94,12 +94,16 @@ public function handle(ServerRequestInterface $request): ResponseInterface
                     $this->middleware = ($this->middlewareFactory)();
                 }
 
-                $this->eventDispatcher->dispatch(new BeforeMiddleware($this->middleware, $request));
+                if ($this->eventDispatcher !== null) {
+                    $this->eventDispatcher->dispatch(new BeforeMiddleware($this->middleware, $request));
+                }
 
                 try {
                     return $response = $this->middleware->process($request, $this->handler);
                 } finally {
-                    $this->eventDispatcher->dispatch(new AfterMiddleware($this->middleware, $response ?? null));
+                    if ($this->eventDispatcher !== null) {
+                        $this->eventDispatcher->dispatch(new AfterMiddleware($this->middleware, $response ?? null));
+                    }
                 }
             }
         };
diff --git a/tests/MiddlewareDispatcherTest.php b/tests/MiddlewareDispatcherTest.php
@@ -193,10 +193,6 @@ public function handle(ServerRequestInterface $request): ResponseInterface
 
     private function createDispatcher(ContainerInterface $container = null, ?EventDispatcherInterface $eventDispatcher = null): MiddlewareDispatcher
     {
-        if ($eventDispatcher === null) {
-            $eventDispatcher = $this->createMock(EventDispatcherInterface::class);
-        }
-
         if ($container === null) {
             return new MiddlewareDispatcher(
                 new MiddlewareFactory($this->createContainer()),

Original file line number	Diff line number	Diff line change
`@@ -62,6 +62,7 @@ static function (&$item, $key) {`
`62`	`62`	`}`
`63`	`63`	`}`
`64`	`64`	`);`
	`65`	`+ /** @var string[] $items */`
`65`	`66`	`return '[' . implode(', ', $items) . ']';`
`66`	`67`	`}`
`67`	`68`