Cleanup (#46)

vjik · web-flow · commit 10c0be7405f7 · 2022-01-10T16:07:54.000+03:00
diff --git a/composer.json b/composer.json
@@ -27,9 +27,9 @@
     "require-dev": {
         "nyholm/psr7": "^1.4",
         "phpunit/phpunit": "^9.5",
-        "roave/infection-static-analysis-plugin": "^1.8",
+        "roave/infection-static-analysis-plugin": "^1.13",
         "spatie/phpunit-watcher": "^1.23",
-        "vimeo/psalm": "^4.9",
+        "vimeo/psalm": "^4.18",
         "yiisoft/test-support": "^1.3"
     },
     "autoload": {
diff --git a/src/Event/AfterMiddleware.php b/src/Event/AfterMiddleware.php
@@ -8,7 +8,7 @@
 use Psr\Http\Server\MiddlewareInterface;
 
 /**
- * AfterMiddleware event is raised after a middleware was executed.
+ * `AfterMiddleware` event is raised after a middleware was executed.
  */
 final class AfterMiddleware
 {
diff --git a/src/Event/BeforeMiddleware.php b/src/Event/BeforeMiddleware.php
@@ -8,7 +8,7 @@
 use Psr\Http\Server\MiddlewareInterface;
 
 /**
- * AfterMiddleware event is raised before executing a middleware.
+ * `BeforeMiddleware` event is raised before executing a middleware.
  */
 final class BeforeMiddleware
 {
diff --git a/src/MiddlewareDispatcher.php b/src/MiddlewareDispatcher.php
@@ -4,6 +4,7 @@
 
 namespace Yiisoft\Middleware\Dispatcher;
 
+use Closure;
 use Psr\EventDispatcher\EventDispatcherInterface;
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\ServerRequestInterface;
@@ -15,7 +16,7 @@ final class MiddlewareDispatcher
     /**
      * Contains a middleware pipeline handler.
      *
-     * @var MiddlewareStack The middleware stack.
+     * @var MiddlewareStack|null The middleware stack.
      */
     private ?MiddlewareStack $stack = null;
     private MiddlewareFactoryInterface $middlewareFactory;
@@ -90,7 +91,7 @@ public function hasMiddlewares(): bool
     }
 
     /**
-     * @return \Closure[]
+     * @return Closure[]
      */
     private function buildMiddlewares(): array
     {
diff --git a/src/MiddlewareFactory.php b/src/MiddlewareFactory.php
@@ -96,8 +96,6 @@ public function process(
             };
         }
 
-        /** @var callable $callback */
-
         return new class ($callback, $this->container) implements MiddlewareInterface {
             private ContainerInterface $container;
             private $callback;
diff --git a/src/MiddlewareStack.php b/src/MiddlewareStack.php
@@ -50,15 +50,17 @@ public function handle(ServerRequestInterface $request): ResponseInterface
             $this->build();
         }
 
-        /** @psalm-suppress PossiblyNullReference */
         return $this->stack->handle($request);
     }
 
+    /**
+     * @psalm-assert RequestHandlerInterface $this->stack
+     */
     private function build(): void
     {
         $handler = $this->fallbackHandler;
 
-        /** @var  Closure $middleware */
+        /** @var Closure $middleware */
         foreach ($this->middlewares as $middleware) {
             $handler = $this->wrap($middleware, $handler);
         }

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`	`use Psr\Http\Server\MiddlewareInterface;`
`9`	`9`
`10`	`10`	`/**`
`11`		`- * AfterMiddleware event is raised after a middleware was executed.`
	`11`	+ * `AfterMiddleware` event is raised after a middleware was executed.
`12`	`12`	`*/`
`13`	`13`	`final class AfterMiddleware`
`14`	`14`	`{`
Original file line number	Diff line number	Diff line change
`@@ -96,8 +96,6 @@ public function process(`
`96`	`96`	`};`
`97`	`97`	`}`
`98`	`98`
`99`		`- /** @var callable $callback */`
`100`		`-`
`101`	`99`	`return new class ($callback, $this->container) implements MiddlewareInterface {`
`102`	`100`	`private ContainerInterface $container;`
`103`	`101`	`private $callback;`
Original file line number	Diff line number	Diff line change
`@@ -50,15 +50,17 @@ public function handle(ServerRequestInterface $request): ResponseInterface`
`50`	`50`	`$this->build();`
`51`	`51`	`}`
`52`	`52`
`53`		`- /** @psalm-suppress PossiblyNullReference */`
`54`	`53`	`return $this->stack->handle($request);`
`55`	`54`	`}`
`56`	`55`
	`56`	`+ /**`
	`57`	`+ * @psalm-assert RequestHandlerInterface $this->stack`
	`58`	`+ */`
`57`	`59`	`private function build(): void`
`58`	`60`	`{`
`59`	`61`	`$handler = $this->fallbackHandler;`
`60`	`62`
`61`		`- /** @var Closure $middleware */`
	`63`	`+ /** @var Closure $middleware */`
`62`	`64`	`foreach ($this->middlewares as $middleware) {`
`63`	`65`	`$handler = $this->wrap($middleware, $handler);`
`64`	`66`	`}`