hnrazevedo / Router

examples/Routes/default.php

Spacing +23 added lines, -23 removed lines

@@ -7,26 +7,26 @@ 
 /**
  * Defines a route for the GET method
  */
-Router::get('/foo','\HnrAzevedo\Router\Examples\Controller@method');
+Router::get('/foo', '\HnrAzevedo\Router\Examples\Controller@method');
 
 /**
  * Defines a route to the GET method with an anonymous function
  */
-Router::get('/bar', function(){
+Router::get('/bar', function() {
     //
 });
 
 /**
  * Defines a route to the POST method with an anonymous function
  */
-Router::post('/bar', function(){
+Router::post('/bar', function() {
     //
 });
 
 /**
  * Defining route for any method
  */
-Router::any('/any', function(){
+Router::any('/any', function() {
     //
 });
 
@@ -36,14 +36,14 @@ 
  * @param string $route
  * @param \Closure|string $action
  */
-Router::match('GET|post', '/get_post', function(){
+Router::match('GET|post', '/get_post', function() {
     //
 });
 
 /**
  * Defines the route name
  */
-Router::get('/named', function(){
+Router::get('/named', function() {
     //
 })->name('baz');
 
@@ -55,32 +55,32 @@ 
 /**
  * Run before all requests, regardless of error occurrences
  */
-Router::beforeAll(function(){
+Router::beforeAll(function() {
     //
 }, null);
 
 /**
  * Run after all requests, regardless of error occurrences
  */
-Router::afterAll(function(){
+Router::afterAll(function() {
     //
 }, null);
 
 /**
  * Executes after executing the triggered route action
  */
-Router::get('/after', function(){
+Router::get('/after', function() {
     //
-})->after(function(){
+})->after(function() {
     //
 });
 
 /**
  * Executes before executing the triggered route action
  */
-Router::get('/before', function(){
+Router::get('/before', function() {
     //
-})->before(function(){
+})->before(function() {
     //
 });
 /**
@@ -101,21 +101,21 @@ 
 /**
  * Example of route definition with parameters
  */
-Router::get('/passingParameters/{param}', function($param){
+Router::get('/passingParameters/{param}', function($param) {
     echo $param;
 });
 
 /**
  * Example of setting an optional parameter
  */
-Router::get('/passingParameters/{:optionalParam}', function($optionalParam){
+Router::get('/passingParameters/{:optionalParam}', function($optionalParam) {
     echo $optionalParam;
 });
 
 /**
  * Example of regular expression test for parameters
  */
-Router::get('/testingParameters/{param}', function($param){
+Router::get('/testingParameters/{param}', function($param) {
     echo $param;
 })->where([
     'param'=>'[0-9]{1,11}'
@@ -131,16 +131,16 @@ 
  * @param string $prefix
  * @param \Closure $routeDefinitions
  */
-Router::group('/admin', function(){
-    Router::get('/users/{teste}', function($teste){
+Router::group('/admin', function() {
+    Router::get('/users/{teste}', function($teste) {
         echo $teste;
     })->where([
         'teste'=>'[a-zA-Z]*'
     ]);
 });
 
-Router::group('/admin2', function(){
-    Router::get('/users/{teste}', function($teste){
+Router::group('/admin2', function() {
+    Router::get('/users/{teste}', function($teste) {
         echo $teste;
     })->name('teste');
 })
@@ -151,7 +151,7 @@ 
  */
 ->groupWhere([
     'teste'=>'[a-zA-Z]*'
-],[]);
+], []);
 
 
 
@@ -168,7 +168,7 @@ 
 /**
  * Defining route middleware - implements Psr\Http\Server\MiddlewareInterface
  */
-Router::get('/passingParameters/{:optionalParam}', function($optionalParam = null){
+Router::get('/passingParameters/{:optionalParam}', function($optionalParam = null) {
     echo $optionalParam;
 })->middleware([
     HnrAzevedo\Router\Example\Middleware\Auth::class
@@ -177,7 +177,7 @@ 
 /**
  * Defining middleware by nickname
  */
-Router::get('/lasted', function(){
+Router::get('/lasted', function() {
     //
 })->middleware([
     'Lasted'
@@ -187,7 +187,7 @@ 
  * Defining multiple middlewares
  * NOTE: Importantly, the execution follows the same order of definition
  */
-Router::get('/middlewares', function(){
+Router::get('/middlewares', function() {
     //
 })->middleware([
     HnrAzevedo\Router\Example\Middleware\Auth::class,

src/WhereTrait.php

Spacing +17 added lines, -17 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace HnrAzevedo\Router;
 
@@ -23,8 +23,8 @@ 
         $excepts = (is_array($excepts)) ? $excepts : [];
         
         $group = self::getInstance()->inSave()['group'];
-        foreach(self::getInstance()->getRoutes() as $r => $route){
-            if($route['group'] !== $group || in_array($route['name'], $excepts)){
+        foreach (self::getInstance()->getRoutes() as $r => $route) {
+            if ($route['group'] !== $group || in_array($route['name'], $excepts)) {
                 continue;
             }
 
@@ -49,30 +49,30 @@ 
         unset($uriPath[0]);
 
         $corretRoute = true;
-        foreach ($routePath as $r => $routeFrag){
+        foreach ($routePath as $r => $routeFrag) {
             $where = is_array($route['where']) ? $route['where'] : [];
             $routeFrag = $this->replaceParam($where, $routeFrag, $uriPath[$r]);
 
-            if($routeFrag !== $uriPath[$r]){
+            if ($routeFrag !== $uriPath[$r]) {
                 $corretRoute = false;
             }
         }
 
-        if(!$corretRoute){
+        if (!$corretRoute) {
             throw new \Exception('continue');
         }
 
-        $_REQUEST = array_merge($_REQUEST,$this->parameters);
+        $_REQUEST = array_merge($_REQUEST, $this->parameters);
     }
 
     private function replaceParam(array $where, string $ref, string $value): string
     {
-        if(((substr($ref,0,1) === '{') && (substr($ref,strlen($ref)-1) === '}'))) {
-            $this->parameters[str_replace(['{:','{','}'],'',$ref)] = $value;
+        if (((substr($ref, 0, 1) === '{') && (substr($ref, strlen($ref)-1) === '}'))) {
+            $this->parameters[str_replace(['{:', '{', '}'], '', $ref)] = $value;
 
-            $this->checkValueRequire($ref,$value);
+            $this->checkValueRequire($ref, $value);
 
-            if(array_key_exists(str_replace(['{:','{','}'],'',$ref),$where)){
+            if (array_key_exists(str_replace(['{:', '{', '}'], '', $ref), $where)) {
                 $this->matchParam($where, $ref, $value);
             }
 
@@ -83,25 +83,25 @@ 
 
     private function checkValueRequire(string $ref, string $value): void
     {
-        if(substr($ref,0,2) !== '{:' && strlen($value) === 0){
+        if (substr($ref, 0, 2) !== '{:' && strlen($value) === 0) {
             throw new \Exception('continue');
         }
     }
 
     private function checkCount(string $routePath, string $uriPath): void
     {
-        $countRequest = substr_count($uriPath,'/') - substr_count($routePath,'{:');
-        $countRoute = substr_count($routePath,'/') - substr_count($routePath,'{:');
+        $countRequest = substr_count($uriPath, '/')-substr_count($routePath, '{:');
+        $countRoute = substr_count($routePath, '/')-substr_count($routePath, '{:');
 
-        if($countRequest !== $countRoute){
+        if ($countRequest !== $countRoute) {
             throw new \Exception('continue');
         }
     }
 
     private function matchParam(array $where, string $ref, string $value): void
     {
-        if(substr($ref,0,2) === '{' || $value !== ''){
-            if(!preg_match("/^{$where[str_replace(['{:','{','}'],'',$ref)]}$/",$value)){
+        if (substr($ref, 0, 2) === '{' || $value !== '') {
+            if (!preg_match("/^{$where[str_replace(['{:', '{', '}'], '', $ref)]}$/", $value)) {
                 throw new \Exception('continue');
             }
         }

src/PrioritizeTrait.php

Spacing +11 added lines, -11 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace HnrAzevedo\Router;
 
@@ -12,7 +12,7 @@ 
 
     protected function sorted(?bool $sorted = null): bool
     {
-        if(null !== $sorted){
+        if (null !== $sorted) {
             $this->sorted = $sorted;
         }
         return $this->sorted;
@@ -20,35 +20,35 @@ 
     
     protected function sortRoutes(): bool
     {
-        if($this->sorted()){
+        if ($this->sorted()) {
             return true;
         }
 
         $staticRoutes = [];
         $paramRoutes = [];
 
-        foreach($this->getRoutes() as $r => $route){
+        foreach ($this->getRoutes() as $r => $route) {
 
             $path = urldecode(unserialize($route['uri'])->getPath());
 
-            if(strstr($path,'{')){
-                $paramRoutes[$this->getKeyArray(substr_count($path,'/') + substr_count($path,'{'),$paramRoutes)] = $route;
+            if (strstr($path, '{')) {
+                $paramRoutes[$this->getKeyArray(substr_count($path, '/')+substr_count($path, '{'), $paramRoutes)] = $route;
                 continue;    
             }
 
-            $staticRoutes[$this->getKeyArray(substr_count($path,'/'),$staticRoutes)] = $route;
+            $staticRoutes[$this->getKeyArray(substr_count($path, '/'), $staticRoutes)] = $route;
         }
 
         rsort($paramRoutes);
         rsort($staticRoutes);
 
-        $this->orderRoutes(array_merge($staticRoutes,$paramRoutes));
+        $this->orderRoutes(array_merge($staticRoutes, $paramRoutes));
         return $this->sorted(true);
     }
 
     private function getKeyArray(int $index, array $array): int
     {
-        while(array_key_exists($index,$array)){
+        while (array_key_exists($index, $array)) {
             $index++;
         }
         return $index;
@@ -57,8 +57,8 @@ 
     private function orderRoutes(array $routes):void
     {
         $kRoutes = $routes;
-        foreach($routes as $r => $route){
-            if(array_key_exists('name',$route)){
+        foreach ($routes as $r => $route) {
+            if (array_key_exists('name', $route)) {
                 unset($kRoutes[$r]);
                 $kRoutes["'{$route['name']}'"] = $route;
             }

src/Router.php

Spacing +12 added lines, -12 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace HnrAzevedo\Router;
 
@@ -33,7 +33,7 @@ 
     public static function group(string $prefix, \Closure $closure): Router
     {
         $id = sha1(date('d/m/Y h:m:i'));
-        while(array_key_exists($id, self::getInstance()->groupsName)){
+        while (array_key_exists($id, self::getInstance()->groupsName)) {
             $id = sha1(date('d/m/Y h:m:i').$id);
         }
 
@@ -54,7 +54,7 @@ 
     {
         self::getInstance()->loaded = true;
 
-        if(null !== $name){
+        if (null !== $name) {
             return self::getInstance()->loadByName($name);
         }
 
@@ -62,15 +62,15 @@ 
 
         $requestMethod = (isset($_REQUEST['REQUEST_METHOD'])) ? $_REQUEST['REQUEST_METHOD'] : $_SERVER['REQUEST_METHOD'];
 
-        foreach(self::getInstance()->getRoutes() as $r => $route){
+        foreach (self::getInstance()->getRoutes() as $r => $route) {
             self::getInstance()->currentRoute = $route;
             self::getInstance()->currentRoute['name'] = $r;
 
-            try{
+            try {
                 self::getInstance()->checkMethod($route, $requestMethod);
                 self::getInstance()->checkData($route, (new Uri($_SERVER['REQUEST_URI']))->getPath());
                 return self::getInstance();
-            }catch(\Exception $er){
+            }catch (\Exception $er) {
                 continue;
             }
         }
@@ -84,7 +84,7 @@ 
 
     public static function run(?string $name = null): RouterInterface
     {
-        if(!self::getInstance()->loaded){
+        if (!self::getInstance()->loaded) {
             self::getInstance()->load($name);
         }
 
@@ -94,10 +94,10 @@ 
 
         self::getInstance()->executeBefore();
         
-        try{
+        try {
             $action = unserialize(self::getInstance()->current()['action']);
-            self::getInstance()->executeRouteAction( (is_string($action)) ? $action : $action->getClosure()  );
-        }catch(\Exception $er){
+            self::getInstance()->executeRouteAction((is_string($action)) ? $action : $action->getClosure());
+        }catch (\Exception $er) {
             self::getInstance()->error = $er;
         }
         
@@ -110,7 +110,7 @@ 
 
     private function checkError(): void
     {
-        if(isset($this->error)){
+        if (isset($this->error)) {
             throw $this->error;
         }
     }
@@ -124,7 +124,7 @@ 
 
     public static function routes(?array $routes = null): array
     {
-        if(null !== $routes){
+        if (null !== $routes) {
             self::getInstance()->setRoutes($routes);
             self::getInstance()->sortRoutes();
         }

Braces +2 added lines, -2 removed lines

@@ -70,7 +70,7 @@ 
                 self::getInstance()->checkMethod($route, $requestMethod);
                 self::getInstance()->checkData($route, (new Uri($_SERVER['REQUEST_URI']))->getPath());
                 return self::getInstance();
-            }catch(\Exception $er){
+            } catch(\Exception $er){
                 continue;
             }
         }
@@ -97,7 +97,7 @@ 
         try{
             $action = unserialize(self::getInstance()->current()['action']);
             self::getInstance()->executeRouteAction( (is_string($action)) ? $action : $action->getClosure()  );
-        }catch(\Exception $er){
+        } catch(\Exception $er){
             self::getInstance()->error = $er;
         }
         

src/DefinitionsTrait.php

Indentation +4 added lines, -4 removed lines

@@ -69,9 +69,9 @@ 
         }
 
         $routes[$index] = [
-			'uri' => serialize(new Uri(self::getInstance()->getHost().self::getInstance()->getPrefix().$uri)),
-			'action' => (is_callable($closure)) ? serialize(new SerializableClosure($closure)) : serialize($closure),
-			'method' => strtoupper($method),
+            'uri' => serialize(new Uri(self::getInstance()->getHost().self::getInstance()->getPrefix().$uri)),
+            'action' => (is_callable($closure)) ? serialize(new SerializableClosure($closure)) : serialize($closure),
+            'method' => strtoupper($method),
             'middlewares' => [],
             'where' => [],
             'before' => [],
@@ -89,7 +89,7 @@ 
     private static function checkDuplicity(string $uri, string $method): void
     {
         foreach(self::getInstance()->getRoutes() as $route){
-    		if( md5($route['uri'].$route['method']) === md5($uri.$method) ){
+            if( md5($route['uri'].$route['method']) === md5($uri.$method) ){
                 throw new \RuntimeException("There is already a route with the URI {$uri} and with the {$method} METHOD configured.");
             }
         }

Spacing +13 added lines, -13 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace HnrAzevedo\Router;
 
@@ -13,32 +13,32 @@ 
     
     public static function get(string $uri, $closure): RouterInterface
     {
-        return self::set('get',$uri,$closure);
+        return self::set('get', $uri, $closure);
     }
 
     public static function post(string $uri, $closure): RouterInterface
     {
-        return self::set('post',$uri,$closure);
+        return self::set('post', $uri, $closure);
     }
 
     public static function ajax(string $uri, $closure): RouterInterface
     {
-        return self::set('ajax',$uri,$closure);
+        return self::set('ajax', $uri, $closure);
     }
 
     public static function delete(string $uri, $closure): RouterInterface
     {
-        return self::set('delete',$uri,$closure);
+        return self::set('delete', $uri, $closure);
     }
 
     public static function put(string $uri, $closure): RouterInterface
     {
-        return self::set('put',$uri,$closure);
+        return self::set('put', $uri, $closure);
     }
 
     public static function patch(string $uri, $closure): RouterInterface
     {
-        return self::set('patch',$uri,$closure);
+        return self::set('patch', $uri, $closure);
     }
 
     public static function match(string $method, string $uri, $closure): RouterInterface
@@ -49,22 +49,22 @@ 
 
     public static function any(string $uri, $closure): RouterInterface
     {
-        return self::set('*',$uri,$closure);
+        return self::set('*', $uri, $closure);
     }
 
     private static $count = 0;
 
     private static function set(string $method, string $uri, $closure): RouterInterface
     {   
-        $uri = (substr($uri,0,1) !=='/' and strlen($uri) > 0) ? "/{$uri}" : $uri;
+        $uri = (substr($uri, 0, 1) !== '/' and strlen($uri) > 0) ? "/{$uri}" : $uri;
         
-        self::checkDuplicity($uri,$method);
+        self::checkDuplicity($uri, $method);
         
         $routes = self::getInstance()->getRoutes();
 
         $index = sha1(date('d/m/Y H:i:s').count($routes));
 
-        while(array_key_exists($index,$routes)){
+        while (array_key_exists($index, $routes)) {
             $index = sha1(date('d/m/Y H:i:s').rand(count($routes)));
         }
 
@@ -88,8 +88,8 @@ 
 
     private static function checkDuplicity(string $uri, string $method): void
     {
-        foreach(self::getInstance()->getRoutes() as $route){
-    		if( md5($route['uri'].$route['method']) === md5($uri.$method) ){
+        foreach (self::getInstance()->getRoutes() as $route) {
+    		if (md5($route['uri'].$route['method']) === md5($uri.$method)) {
                 throw new \RuntimeException("There is already a route with the URI {$uri} and with the {$method} METHOD configured.");
             }
         }

src/MiddlewareTrait.php

Spacing +14 added lines, -14 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace HnrAzevedo\Router;
 
@@ -22,8 +22,8 @@ 
 
     public static function globalMiddlewares(array $middlewares): RouterInterface
     {
-        foreach($middlewares as $middleware){
-            if(!class_exists($middleware)){
+        foreach ($middlewares as $middleware) {
+            if (!class_exists($middleware)) {
                 throw new \RuntimeException("Middleware class {$middleware} not exists");
             }
         }
@@ -39,8 +39,8 @@ 
     public static function middleware(array $middlewares): RouterInterface
     {
         $route = self::getInstance()->inSave();
-        $route['middlewares'] = (is_array($route['middlewares'])) ? array_merge($route['middlewares'],$middlewares) : $middlewares;
-        self::getInstance()->updateRoute($route,array_key_last(self::getInstance()->getRoutes()));
+        $route['middlewares'] = (is_array($route['middlewares'])) ? array_merge($route['middlewares'], $middlewares) : $middlewares;
+        self::getInstance()->updateRoute($route, array_key_last(self::getInstance()->getRoutes()));
         return self::getInstance();
     }
 
@@ -48,8 +48,8 @@ 
     {
         $excepts = (is_array($excepts)) ? $excepts : [];
         $group = self::getInstance()->inSave()['group'];
-        foreach(self::getInstance()->getRoutes() as $r => $route){
-            if($route['group'] !== $group || in_array($route['name'], $excepts)){
+        foreach (self::getInstance()->getRoutes() as $r => $route) {
+            if ($route['group'] !== $group || in_array($route['name'], $excepts)) {
                 continue;
             }
 
@@ -61,7 +61,7 @@ 
 
     private static function existMiddleware(string $name): void
     {
-        if(!class_exists($name) && !array_key_exists($name,self::$globalMiddlewares)){
+        if (!class_exists($name) && !array_key_exists($name, self::$globalMiddlewares)) {
             throw new \RuntimeException("Middleware {$name} does not exist");
         }
     }
@@ -70,9 +70,9 @@ 
     {
         $factory = new Factory();
 
-        $this->serverRequest = (!isset($this->serverRequest)) ? $factory->createServerRequest($_SERVER['REQUEST_METHOD'], unserialize($this->current()['uri']),['route' => $this->current()]) : $this->serverRequest;
+        $this->serverRequest = (!isset($this->serverRequest)) ? $factory->createServerRequest($_SERVER['REQUEST_METHOD'], unserialize($this->current()['uri']), ['route' => $this->current()]) : $this->serverRequest;
         
-        foreach ($this->current()['middlewares'] as $middleware){
+        foreach ($this->current()['middlewares'] as $middleware) {
             $this->currentMiddlewares[] = (class_exists($middleware)) ? new $middleware() : new $this->globalMiddlewares[$middleware]();
         }
 
@@ -87,20 +87,20 @@ 
 
     public function process(ServerRequestInterface $request, RequestHandlerInterface $handler): ResponseInterface
     {
-        if(!$this->getInstance()->loaded()){
+        if (!$this->getInstance()->loaded()) {
             $this->getInstance()->load();
         }
 
         $route = $this->getInstance()->current();
-        if(!empty($route)){
-            $route['action'] = function(){
+        if (!empty($route)) {
+            $route['action'] = function() {
                 $this->getInstance()->executeBefore();
                 $this->getInstance()->executeRouteAction($this->getInstance()->current()['action']);
                 $this->getInstance()->executeAfter();
             };
         }
 
-        return $this->next($handler)->handle($request->withAttribute('route',$route));
+        return $this->next($handler)->handle($request->withAttribute('route', $route));
     }
 
     private function next(RequestHandlerInterface $defaultHandler): RequestHandlerInterface

src/RunInTrait.php

Spacing +26 added lines, -26 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace HnrAzevedo\Router;
 
@@ -20,7 +20,7 @@ 
         $this->beforeAll = (!isset($this->beforeAll)) ? function() {} : $this->beforeAll;
         $this->afterAll = (!isset($this->afterAll)) ? function() {} : $this->afterAll;
         
-        if($state === 'before'){
+        if ($state === 'before') {
             return ($except) ? $this->beforeExcepts : $this->beforeAll;
         }
 
@@ -29,8 +29,8 @@ 
 
     protected function setState(string $state, $settable, bool $except = false): bool
     {
-        if($state === 'before'){
-            if($except){
+        if ($state === 'before') {
+            if ($except) {
                 $this->beforeExcepts = $settable;
                 return true;
             }
@@ -39,7 +39,7 @@ 
             return true;
         }
 
-        if($except){
+        if ($except) {
             $this->afterExcepts = $settable;
             return true;
         }
@@ -60,14 +60,14 @@ 
 
     public static function beforeAll($closure, ?array $excepts = null): RouterInterface
     {
-        self::getInstance()->setState('before', (is_array($excepts)) ? $excepts : [] ,true);
+        self::getInstance()->setState('before', (is_array($excepts)) ? $excepts : [], true);
         self::getInstance()->setState('before', $closure, false);
         return self::getInstance();
     }
 
     public static function afterAll($closure, ?array $excepts = null): RouterInterface
     {
-        self::getInstance()->setState('after', (is_array($excepts)) ? $excepts : [] ,true);
+        self::getInstance()->setState('after', (is_array($excepts)) ? $excepts : [], true);
         self::getInstance()->setState('after', $closure, false);
         return self::getInstance();
     }
@@ -84,7 +84,7 @@ 
 
     protected function executeRouteAction($action): bool
     {
-        if(is_callable($action)){        
+        if (is_callable($action)) {        
             call_user_func_array($action, $_REQUEST);
             return true;
         }
@@ -99,9 +99,9 @@ 
         $excepts = (is_array($excepts)) ? $excepts : [];
         $group = self::getInstance()->inSave()['group'];
 
-        foreach(self::getInstance()->getRoutes() as $r => $route){
-            if($route['group'] === $group && !in_array($r, $excepts)){
-                self::getInstance()->getRoutes()[$r][$state] = (is_null($route[$state])) ? [ $closure ] : array_merge($route[$state], [ $closure ]); 
+        foreach (self::getInstance()->getRoutes() as $r => $route) {
+            if ($route['group'] === $group && !in_array($r, $excepts)) {
+                self::getInstance()->getRoutes()[$r][$state] = (is_null($route[$state])) ? [$closure] : array_merge($route[$state], [$closure]); 
             }
         }
 
@@ -111,14 +111,14 @@ 
     private static function addInRoute(string $state, $closure): RouterInterface
     {
         $route = self::getInstance()->inSave();
-        $route[$state] = (!is_null($route[$state])) ? [ $closure ] : array_merge($route[$state], [ $closure ]);
-        self::updateRoute($route,array_key_last(self::getInstance()->getRoutes()));
+        $route[$state] = (!is_null($route[$state])) ? [$closure] : array_merge($route[$state], [$closure]);
+        self::updateRoute($route, array_key_last(self::getInstance()->getRoutes()));
         return self::getInstance();
     }
 
     protected function executeBefore(): void
     {
-        if(!in_array($this->currentName(), (array) $this->getState('before', true))){
+        if (!in_array($this->currentName(), (array) $this->getState('before', true))) {
             ($this->getState('before', false))();
         }
 
@@ -129,15 +129,15 @@ 
     {
         $this->executeState('after');
 
-        if(!in_array($this->currentName(), (array) $this->getState('after', true))){
+        if (!in_array($this->currentName(), (array) $this->getState('after', true))) {
             ($this->getState('after', false))();
         }
     }
 
     private function executeState(string $stage): void
     {
-        foreach($this->current()[$stage] as $state){
-            if(is_callable($state)){
+        foreach ($this->current()[$stage] as $state) {
+            if (is_callable($state)) {
                 $state();
                 continue;
             }
@@ -148,31 +148,31 @@ 
 
     private function executeController(string $controllerMeth): void
     {
-        if(count(explode('@',$controllerMeth)) !== 2){
+        if (count(explode('@', $controllerMeth)) !== 2) {
             $path = urldecode($this->current()['uri']->getPath());
             throw new \RuntimeException("Misconfigured route action ({$path})");
         }
 
-        $controller = (string) explode('@',$controllerMeth)[0];
-        $method = (string) explode('@',$controllerMeth)[1];
+        $controller = (string) explode('@', $controllerMeth)[0];
+        $method = (string) explode('@', $controllerMeth)[1];
 
         $this->checkControllerMeth($controllerMeth);
 
-        call_user_func_array([(new $controller()),$method], $_REQUEST);
+        call_user_func_array([(new $controller()), $method], $_REQUEST);
     }
 
     private function checkControllerMeth(string $controllerMeth): void
     {
-        $routeURI = str_replace(['{:','{','}'],'',urldecode(unserialize($this->current()['uri'])->getPath()));
+        $routeURI = str_replace(['{:', '{', '}'], '', urldecode(unserialize($this->current()['uri'])->getPath()));
 
-        $controller = (string) explode('@',$controllerMeth)[0];
-        $method = (string) explode('@',$controllerMeth)[1];
+        $controller = (string) explode('@', $controllerMeth)[0];
+        $method = (string) explode('@', $controllerMeth)[1];
 
-        if(!class_exists($controller)){
+        if (!class_exists($controller)) {
             throw new \RuntimeException("Controller not found in route URI {$routeURI}");
         }
 
-        if(!method_exists($controller, $method)){
+        if (!method_exists($controller, $method)) {
             throw new \RuntimeException("Method {$method} not found in controller {$controller} in route URI {$routeURI}");
         }