@@ -1,6 +1,6 @@ discard block  | 
                                                    ||
| 1 | 1 | <?php  | 
                                                        
| 2 | 2 | |
| 3 | -declare(strict_types = 1);  | 
                                                        |
| 3 | +declare(strict_types=1);  | 
                                                        |
| 4 | 4 | |
| 5 | 5 | namespace HnrAzevedo\Router;  | 
                                                        
| 6 | 6 | |
@@ -22,9 +22,9 @@ discard block  | 
                                                    ||
| 22 | 22 | |
| 23 | 23 | public static function globalMiddlewares(?array $middlewares = null): array  | 
                                                        
| 24 | 24 |      { | 
                                                        
| 25 | -        if(null !== $middlewares){ | 
                                                        |
| 26 | -            foreach($middlewares as $middleware){ | 
                                                        |
| 27 | -                if(!class_exists($middleware)){ | 
                                                        |
| 25 | +        if (null !== $middlewares) { | 
                                                        |
| 26 | +            foreach ($middlewares as $middleware) { | 
                                                        |
| 27 | +                if (!class_exists($middleware)) { | 
                                                        |
| 28 | 28 |                      throw new \RuntimeException("Middleware class {$middleware} not exists"); | 
                                                        
| 29 | 29 | }  | 
                                                        
| 30 | 30 | }  | 
                                                        
@@ -41,8 +41,8 @@ discard block  | 
                                                    ||
| 41 | 41 | public static function middleware(array $middlewares): RouterInterface  | 
                                                        
| 42 | 42 |      { | 
                                                        
| 43 | 43 | $route = self::getInstance()->inSave();  | 
                                                        
| 44 | - $route['middlewares'] = (is_array($route['middlewares'])) ? array_merge($route['middlewares'],$middlewares) : $middlewares;  | 
                                                        |
| 45 | - self::getInstance()->updateRoute($route,array_key_last(self::getInstance()->getRoutes()));  | 
                                                        |
| 44 | + $route['middlewares'] = (is_array($route['middlewares'])) ? array_merge($route['middlewares'], $middlewares) : $middlewares;  | 
                                                        |
| 45 | + self::getInstance()->updateRoute($route, array_key_last(self::getInstance()->getRoutes()));  | 
                                                        |
| 46 | 46 | return self::getInstance();  | 
                                                        
| 47 | 47 | }  | 
                                                        
| 48 | 48 | |
@@ -50,8 +50,8 @@ discard block  | 
                                                    ||
| 50 | 50 |      { | 
                                                        
| 51 | 51 | $excepts = (is_array($excepts)) ? $excepts : [];  | 
                                                        
| 52 | 52 | $group = self::getInstance()->inSave()['group'];  | 
                                                        
| 53 | -        foreach(self::getInstance()->getRoutes() as $r => $route){ | 
                                                        |
| 54 | -            if($route['group'] !== $group || in_array($route['name'], $excepts)){ | 
                                                        |
| 53 | +        foreach (self::getInstance()->getRoutes() as $r => $route) { | 
                                                        |
| 54 | +            if ($route['group'] !== $group || in_array($route['name'], $excepts)) { | 
                                                        |
| 55 | 55 | continue;  | 
                                                        
| 56 | 56 | }  | 
                                                        
| 57 | 57 | |
@@ -63,7 +63,7 @@ discard block  | 
                                                    ||
| 63 | 63 | |
| 64 | 64 | private static function existMiddleware(string $name): void  | 
                                                        
| 65 | 65 |      { | 
                                                        
| 66 | -        if(!class_exists($name) && !array_key_exists($name,self::$globalMiddlewares)){ | 
                                                        |
| 66 | +        if (!class_exists($name) && !array_key_exists($name, self::$globalMiddlewares)) { | 
                                                        |
| 67 | 67 |              throw new \RuntimeException("Middleware {$name} does not exist"); | 
                                                        
| 68 | 68 | }  | 
                                                        
| 69 | 69 | }  | 
                                                        
@@ -72,9 +72,9 @@ discard block  | 
                                                    ||
| 72 | 72 |      { | 
                                                        
| 73 | 73 | $factory = new Factory();  | 
                                                        
| 74 | 74 | |
| 75 | - $this->serverRequest = (!isset($this->serverRequest)) ? $factory->createServerRequest($_SERVER['REQUEST_METHOD'], unserialize($this->current()['uri']),['route' => $this->current()]) : $this->serverRequest;  | 
                                                        |
| 75 | + $this->serverRequest = (!isset($this->serverRequest)) ? $factory->createServerRequest($_SERVER['REQUEST_METHOD'], unserialize($this->current()['uri']), ['route' => $this->current()]) : $this->serverRequest;  | 
                                                        |
| 76 | 76 | |
| 77 | -        foreach ($this->current()['middlewares'] as $middleware){ | 
                                                        |
| 77 | +        foreach ($this->current()['middlewares'] as $middleware) { | 
                                                        |
| 78 | 78 | $this->currentMiddlewares[] = (class_exists($middleware)) ? new $middleware() : new $this->globalMiddlewares[$middleware]();  | 
                                                        
| 79 | 79 | }  | 
                                                        
| 80 | 80 | |
@@ -89,20 +89,20 @@ discard block  | 
                                                    ||
| 89 | 89 | |
| 90 | 90 | public function process(ServerRequestInterface $request, RequestHandlerInterface $handler): ResponseInterface  | 
                                                        
| 91 | 91 |      { | 
                                                        
| 92 | -        if(!$this->getInstance()->loaded()){ | 
                                                        |
| 92 | +        if (!$this->getInstance()->loaded()) { | 
                                                        |
| 93 | 93 | $this->getInstance()->load();  | 
                                                        
| 94 | 94 | }  | 
                                                        
| 95 | 95 | |
| 96 | 96 | $route = $this->getInstance()->current();  | 
                                                        
| 97 | -        if(!empty($route)){ | 
                                                        |
| 98 | -            $route['action'] = function(){ | 
                                                        |
| 97 | +        if (!empty($route)) { | 
                                                        |
| 98 | +            $route['action'] = function() { | 
                                                        |
| 99 | 99 | $this->getInstance()->executeBefore();  | 
                                                        
| 100 | 100 | $this->getInstance()->executeRouteAction($this->getInstance()->current()['action']);  | 
                                                        
| 101 | 101 | $this->getInstance()->executeAfter();  | 
                                                        
| 102 | 102 | };  | 
                                                        
| 103 | 103 | }  | 
                                                        
| 104 | 104 | |
| 105 | -        return $this->next($handler)->handle($request->withAttribute('route',$route)); | 
                                                        |
| 105 | +        return $this->next($handler)->handle($request->withAttribute('route', $route)); | 
                                                        |
| 106 | 106 | }  | 
                                                        
| 107 | 107 | |
| 108 | 108 | private function next(RequestHandlerInterface $defaultHandler): RequestHandlerInterface  |