From 033808da8b106ebed26a507e3bc374dcba063644 Mon Sep 17 00:00:00 2001
From: yiiliveext <yiiliveext@gmail.com>
Date: Thu, 30 Jan 2020 10:40:19 +0200
Subject: [PATCH 1/2] Fix codestyle [skip ci]

---
 src/Middleware/Callback.php     | 1 -
 src/RouteCollectorInterface.php | 1 -
 tests/GroupTest.php             | 1 -
 tests/MatchingResultTest.php    | 4 ++--
 tests/Middleware/RouterTest.php | 6 +++---
 tests/RouteTest.php             | 4 ++--
 6 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/src/Middleware/Callback.php b/src/Middleware/Callback.php
index c9b9be79..aeb866ff 100644
--- a/src/Middleware/Callback.php
+++ b/src/Middleware/Callback.php
@@ -1,6 +1,5 @@
 <?php
 
-
 namespace Yiisoft\Router\Middleware;
 
 use Psr\Http\Message\ResponseInterface;
diff --git a/src/RouteCollectorInterface.php b/src/RouteCollectorInterface.php
index 379aef64..f85268d4 100644
--- a/src/RouteCollectorInterface.php
+++ b/src/RouteCollectorInterface.php
@@ -1,6 +1,5 @@
 <?php
 
-
 namespace Yiisoft\Router;
 
 interface RouteCollectorInterface
diff --git a/tests/GroupTest.php b/tests/GroupTest.php
index 517011e2..4ea388c3 100644
--- a/tests/GroupTest.php
+++ b/tests/GroupTest.php
@@ -1,6 +1,5 @@
 <?php
 
-
 namespace Yiisoft\Router\Tests;
 
 use PHPUnit\Framework\TestCase;
diff --git a/tests/MatchingResultTest.php b/tests/MatchingResultTest.php
index ca4de0a6..1c4627b3 100644
--- a/tests/MatchingResultTest.php
+++ b/tests/MatchingResultTest.php
@@ -63,7 +63,7 @@ public function testProcessFailure(): void
 
     private function getMiddleware(): MiddlewareInterface
     {
-        return new class() implements MiddlewareInterface {
+        return new class implements MiddlewareInterface {
             public function process(
                 ServerRequestInterface $request,
                 RequestHandlerInterface $handler
@@ -75,7 +75,7 @@ public function process(
 
     private function getRequestHandler(): RequestHandlerInterface
     {
-        return new class() implements RequestHandlerInterface {
+        return new class implements RequestHandlerInterface {
             public function handle(ServerRequestInterface $request): ResponseInterface
             {
                 return new Response(404);
diff --git a/tests/Middleware/RouterTest.php b/tests/Middleware/RouterTest.php
index 5a9bed92..0b38d958 100644
--- a/tests/Middleware/RouterTest.php
+++ b/tests/Middleware/RouterTest.php
@@ -54,7 +54,7 @@ private function getMatcher(): UrlMatcherInterface
     {
         $middleware = $this->createRouteMiddleware();
 
-        return new class($middleware) implements UrlMatcherInterface {
+        return new class ($middleware) implements UrlMatcherInterface {
             private $middleware;
 
             public function __construct(MiddlewareInterface $middleware)
@@ -85,7 +85,7 @@ public function match(ServerRequestInterface $request): MatchingResult
 
     private function createRequestHandler(): RequestHandlerInterface
     {
-        return new class() implements RequestHandlerInterface {
+        return new class implements RequestHandlerInterface {
             public function handle(ServerRequestInterface $request): ResponseInterface
             {
                 return new Response(404);
@@ -95,7 +95,7 @@ public function handle(ServerRequestInterface $request): ResponseInterface
 
     private function createRouteMiddleware(): MiddlewareInterface
     {
-        return new class() implements MiddlewareInterface {
+        return new class implements MiddlewareInterface {
             public function process(
                 ServerRequestInterface $request,
                 RequestHandlerInterface $handler
diff --git a/tests/RouteTest.php b/tests/RouteTest.php
index 553b5fdf..b6443d2f 100644
--- a/tests/RouteTest.php
+++ b/tests/RouteTest.php
@@ -141,7 +141,7 @@ public function testToMiddleware(): void
         $request = new ServerRequest('GET', '/');
 
         $route = Route::get('/')->to(
-            new class() implements MiddlewareInterface {
+            new class implements MiddlewareInterface {
                 public function process(
                     ServerRequestInterface $request,
                     RequestHandlerInterface $handler
@@ -213,7 +213,7 @@ public function testBefore(): void
 
     private function getRequestHandler(): RequestHandlerInterface
     {
-        return new class() implements RequestHandlerInterface {
+        return new class implements RequestHandlerInterface {
             public function handle(ServerRequestInterface $request): ResponseInterface
             {
                 return new Response(404);

From 6244b7a40b7a0c8972a560f5c68bd9793c338a64 Mon Sep 17 00:00:00 2001
From: yiiliveext <yiiliveext@gmail.com>
Date: Thu, 30 Jan 2020 10:44:47 +0200
Subject: [PATCH 2/2] Fix logical error

---
 src/Route.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Route.php b/src/Route.php
index 4b783bc1..03e6ba1d 100644
--- a/src/Route.php
+++ b/src/Route.php
@@ -261,7 +261,7 @@ public function handle(ServerRequestInterface $request): ResponseInterface
         $middleware = current($this->middlewares);
         next($this->middlewares);
         if ($middleware === false) {
-            if (!$this->nextHandler !== null) {
+            if ($this->nextHandler !== null) {
                 return $this->nextHandler->handle($request);
             }