Apply fixes from StyleCI

samdark · StyleCIBot · commit 3012e9121c45 · 2020-11-20T22:30:13.000Z
diff --git a/config/web.php b/config/web.php
@@ -1,9 +1,11 @@
 <?php
 
+declare(strict_types=1);
+
+use Yiisoft\Middleware\Dispatcher\MiddlewareFactory;
+use Yiisoft\Middleware\Dispatcher\MiddlewareFactoryInterface;
 use Yiisoft\Middleware\Dispatcher\MiddlewareStack;
 use Yiisoft\Middleware\Dispatcher\MiddlewareStackInterface;
-use Yiisoft\Middleware\Dispatcher\MiddlewareFactoryInterface;
-use Yiisoft\Middleware\Dispatcher\MiddlewareFactory;
 
 return [
     MiddlewareStackInterface::class => MiddlewareStack::class,
diff --git a/src/MiddlewareDispatcher.php b/src/MiddlewareDispatcher.php
@@ -12,14 +12,15 @@ final class MiddlewareDispatcher
 {
     /**
      * Contains a stack of middleware handler.
+     *
      * @var MiddlewareStackInterface stack of middleware
      */
     private MiddlewareStackInterface $stack;
 
     private MiddlewareFactoryInterface $middlewareFactory;
 
     /**
-     * @var callable[]|string[]|array[]
+     * @var array[]|callable[]|string[]
      */
     private array $middlewareDefinitions = [];
 
@@ -38,7 +39,7 @@ public function dispatch(ServerRequestInterface $request, RequestHandlerInterfac
         return $this->stack->handle($request);
     }
 
-    public function withMiddlewares(array $middlewareDefinitions): MiddlewareDispatcher
+    public function withMiddlewares(array $middlewareDefinitions): self
     {
         $clone = clone $this;
         $clone->middlewareDefinitions = $middlewareDefinitions;
diff --git a/src/MiddlewareFactory.php b/src/MiddlewareFactory.php
@@ -27,7 +27,8 @@ public function create($middlewareDefinition): MiddlewareInterface
     }
 
     /**
-     * @param callable|string|array $middlewareDefinition
+     * @param array|callable|string $middlewareDefinition
+     *
      * @return MiddlewareInterface
      */
     private function createMiddleware($middlewareDefinition): MiddlewareInterface
@@ -84,7 +85,7 @@ public function process(ServerRequestInterface $request, RequestHandlerInterface
     }
 
     /**
-     * @param callable|string|array $middlewareDefinition
+     * @param array|callable|string $middlewareDefinition
      */
     private function validateMiddleware($middlewareDefinition): void
     {
diff --git a/src/MiddlewareStack.php b/src/MiddlewareStack.php
@@ -14,6 +14,7 @@ final class MiddlewareStack implements MiddlewareStackInterface
     /**
      * Contains a stack of middleware wrapped in handlers.
      * Each handler points to the handler of middleware that will be processed next.
+     *
      * @var RequestHandlerInterface|null stack of middleware
      */
     private ?RequestHandlerInterface $stack = null;
diff --git a/src/MiddlewareStackInterface.php b/src/MiddlewareStackInterface.php
@@ -8,7 +8,7 @@
 
 interface MiddlewareStackInterface extends RequestHandlerInterface
 {
-    public function build(array $middlewares, RequestHandlerInterface $fallbackHandler): MiddlewareStackInterface;
+    public function build(array $middlewares, RequestHandlerInterface $fallbackHandler): self;
 
     public function reset(): void;
 
diff --git a/tests/Support/TestMiddleware.php b/tests/Support/TestMiddleware.php
@@ -5,10 +5,10 @@
 namespace Yiisoft\Middleware\Dispatcher\Tests\Support;
 
 use Nyholm\Psr7\Response;
+use Psr\Http\Message\ResponseInterface;
+use Psr\Http\Message\ServerRequestInterface;
 use Psr\Http\Server\MiddlewareInterface;
 use Psr\Http\Server\RequestHandlerInterface;
-use Psr\Http\Message\ServerRequestInterface;
-use Psr\Http\Message\ResponseInterface;
 
 final class TestMiddleware implements MiddlewareInterface
 {

Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,8 @@ public function create($middlewareDefinition): MiddlewareInterface`
`27`	`27`	`}`
`28`	`28`
`29`	`29`	`/**`
`30`		`- * @param callable\|string\|array $middlewareDefinition`
	`30`	`+ * @param array\|callable\|string $middlewareDefinition`
	`31`	`+ *`
`31`	`32`	`* @return MiddlewareInterface`
`32`	`33`	`*/`
`33`	`34`	`private function createMiddleware($middlewareDefinition): MiddlewareInterface`
`@@ -84,7 +85,7 @@ public function process(ServerRequestInterface $request, RequestHandlerInterface`
`84`	`85`	`}`
`85`	`86`
`86`	`87`	`/**`
`87`		`- * @param callable\|string\|array $middlewareDefinition`
	`88`	`+ * @param array\|callable\|string $middlewareDefinition`
`88`	`89`	`*/`
`89`	`90`	`private function validateMiddleware($middlewareDefinition): void`
`90`	`91`	`{`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`
`9`	`9`	`interface MiddlewareStackInterface extends RequestHandlerInterface`
`10`	`10`	`{`
`11`		`- public function build(array $middlewares, RequestHandlerInterface $fallbackHandler): MiddlewareStackInterface;`
	`11`	`+ public function build(array $middlewares, RequestHandlerInterface $fallbackHandler): self;`
`12`	`12`
`13`	`13`	`public function reset(): void;`
`14`	`14`