Cleanup (#26)

vjik · web-flow · commit 5762bfe5a2d4 · 2021-06-08T14:08:13.000+03:00
diff --git a/.editorconfig b/.editorconfig
@@ -12,3 +12,6 @@ trim_trailing_whitespace = true
 
 [*.md]
 trim_trailing_whitespace = false
+
+[*.yml]
+indent_size = 2
diff --git a/psalm.xml b/psalm.xml
@@ -7,8 +7,5 @@
 >
     <projectFiles>
         <directory name="src" />
-        <ignoreFiles>
-            <directory name="vendor" />
-        </ignoreFiles>
     </projectFiles>
 </psalm>
diff --git a/src/MiddlewareDispatcher.php b/src/MiddlewareDispatcher.php
@@ -37,8 +37,10 @@ public function __construct(MiddlewareFactoryInterface $middlewareFactory, Middl
      * @param ServerRequestInterface $request Request to pass to middleware.
      * @param RequestHandlerInterface $fallbackHandler Handler to use in case no middleware produced response.
      */
-    public function dispatch(ServerRequestInterface $request, RequestHandlerInterface $fallbackHandler): ResponseInterface
-    {
+    public function dispatch(
+        ServerRequestInterface $request,
+        RequestHandlerInterface $fallbackHandler
+    ): ResponseInterface {
         if ($this->pipeline->isEmpty()) {
             $this->pipeline = $this->pipeline->build($this->buildMiddlewares(), $fallbackHandler);
         }
diff --git a/src/MiddlewareFactory.php b/src/MiddlewareFactory.php
@@ -72,18 +72,21 @@ private function wrapCallable($callback): MiddlewareInterface
 
                 public function __construct(ContainerInterface $container, array $callback)
                 {
-                    [$this->class , $this->method] = $callback;
+                    [$this->class, $this->method] = $callback;
                     $this->container = $container;
                     $this->callback = $callback;
                 }
 
-                public function process(ServerRequestInterface $request, RequestHandlerInterface $handler): ResponseInterface
-                {
+                public function process(
+                    ServerRequestInterface $request,
+                    RequestHandlerInterface $handler
+                ): ResponseInterface {
                     /** @var mixed $controller */
                     $controller = $this->container->get($this->class);
 
                     /** @var mixed $response */
-                    $response = (new Injector($this->container))->invoke([$controller, $this->method], [$request, $handler]);
+                    $response = (new Injector($this->container))
+                        ->invoke([$controller, $this->method], [$request, $handler]);
                     if ($response instanceof ResponseInterface) {
                         return $response;
                     }
@@ -105,8 +108,10 @@ public function __construct(callable $callback, ContainerInterface $container)
                 $this->container = $container;
             }
 
-            public function process(ServerRequestInterface $request, RequestHandlerInterface $handler): ResponseInterface
-            {
+            public function process(
+                ServerRequestInterface $request,
+                RequestHandlerInterface $handler
+            ): ResponseInterface {
                 /** @var mixed $response */
                 $response = (new Injector($this->container))->invoke($this->callback, [$request, $handler]);
                 if ($response instanceof ResponseInterface) {
diff --git a/src/MiddlewarePipelineInterface.php b/src/MiddlewarePipelineInterface.php
@@ -20,8 +20,6 @@ interface MiddlewarePipelineInterface extends RequestHandlerInterface
      *
      * @param MiddlewareInterface[] $middlewares Middlewares being composed to pipeline. Can be empty.
      * @param RequestHandlerInterface $fallbackHandler Fallback request handler.
-     *
-     * @return self
      */
     public function build(array $middlewares, RequestHandlerInterface $fallbackHandler): self;
 
diff --git a/src/MiddlewareStack.php b/src/MiddlewareStack.php
@@ -83,8 +83,11 @@ private function wrap(MiddlewareInterface $middleware, RequestHandlerInterface $
             private RequestHandlerInterface $handler;
             private EventDispatcherInterface $eventDispatcher;
 
-            public function __construct(MiddlewareInterface $middleware, RequestHandlerInterface $handler, EventDispatcherInterface $eventDispatcher)
-            {
+            public function __construct(
+                MiddlewareInterface $middleware,
+                RequestHandlerInterface $handler,
+                EventDispatcherInterface $eventDispatcher
+            ) {
                 $this->middleware = $middleware;
                 $this->handler = $handler;
                 $this->eventDispatcher = $eventDispatcher;

Original file line number	Diff line number	Diff line change
`@@ -7,8 +7,5 @@`
`7`	`7`	`>`
`8`	`8`	`<projectFiles>`
`9`	`9`	`<directory name="src" />`
`10`		`- <ignoreFiles>`
`11`		`- <directory name="vendor" />`
`12`		`- </ignoreFiles>`
`13`	`10`	`</projectFiles>`
`14`	`11`	`</psalm>`
Original file line number	Diff line number	Diff line change
`@@ -20,8 +20,6 @@ interface MiddlewarePipelineInterface extends RequestHandlerInterface`
`20`	`20`	`*`
`21`	`21`	`* @param MiddlewareInterface[] $middlewares Middlewares being composed to pipeline. Can be empty.`
`22`	`22`	`* @param RequestHandlerInterface $fallbackHandler Fallback request handler.`
`23`		`- *`
`24`		`- * @return self`
`25`	`23`	`*/`
`26`	`24`	`public function build(array $middlewares, RequestHandlerInterface $fallbackHandler): self;`
`27`	`25`