hnrazevedo / Router

src/OwnerTrait.php

Spacing +3 added lines, -3 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace HnrAzevedo\Router;
 
@@ -19,7 +19,7 @@ 
     {
         $this->hasRouteName($name);
 
-        if(!$this->loaded()){
+        if (!$this->loaded()) {
             $this->loadIn($name);
         }
         
@@ -28,7 +28,7 @@ 
 
     public function hasCurrentRoute(): void
     {
-        if(!isset($this->currentRoute)){
+        if (!isset($this->currentRoute)) {
             throw new \RuntimeException('Route not yet loaded');
         }
     }

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

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;
         }
         

Spacing +15 added lines, -15 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace HnrAzevedo\Router;
 
@@ -34,7 +34,7 @@ 
     {
         $route = self::getInstance()->inSave();
 
-        if(null === $value){
+        if (null === $value) {
             return (isset($route['attributes'][$name])) ? $route['attributes'][$name] : null;
         }
 
@@ -47,8 +47,8 @@ 
     public static function groupAttribute(string $name, $value = null, ?array $excepts = []): Router
     {
         $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 @@ 
     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);
         }
 
@@ -82,7 +82,7 @@ 
     {
         self::getInstance()->loaded = true;
 
-        if(null !== $name){
+        if (null !== $name) {
             return self::getInstance()->loadByName($name);
         }
 
@@ -90,15 +90,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;
             }
         }
@@ -112,7 +112,7 @@ 
 
     public static function run(?string $name = null): RouterInterface
     {
-        if(!self::getInstance()->loaded){
+        if (!self::getInstance()->loaded) {
             self::getInstance()->load($name);
         }
 
@@ -122,10 +122,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;
         }
         
@@ -138,7 +138,7 @@ 
 
     private function checkError(): void
     {
-        if(isset($this->error)){
+        if (isset($this->error)) {
             throw $this->error;
         }
     }
@@ -152,7 +152,7 @@ 
 
     public static function routes(?array $routes = null): array
     {
-        if(null !== $routes){
+        if (null !== $routes) {
             self::getInstance()->setRoutes($routes);
             self::getInstance()->sortRoutes();
         }

src/CheckTrait.php

Spacing +9 added lines, -9 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace HnrAzevedo\Router;
 
@@ -12,28 +12,28 @@ 
     
     protected function hasRouteName(string $name): void
     {
-        if(!isset($this->routesName[$name])){
+        if (!isset($this->routesName[$name])) {
             throw new \RuntimeException("There is no route named with {$name}");
         }
     }
 
     protected function isInNameGroup(): void
     {
-        if(!is_null($this->getGroup())){
+        if (!is_null($this->getGroup())) {
             throw new \RuntimeException("It is not allowed to assign names to groups");
         }
     }
 
     protected function isInPseudGroup(): void
     {
-        if(!is_null($this->getGroup())){
+        if (!is_null($this->getGroup())) {
             throw new \RuntimeException("To assign actions before or after the execution of the route, use beforeGroup or afterGroup");
         }
     }
 
     protected function existRouteName(string $name): void
     {
-        if(isset($this->routesName[$name])){
+        if (isset($this->routesName[$name])) {
             throw new \RuntimeException("There is already a route named with {$name}");
         }
     }
@@ -41,19 +41,19 @@ 
     protected function checkMethod(array $route, $method): void
     {
         $hasMethod = false;
-        foreach(explode('|',$route['method']) as $routeMethod){
-            if(@preg_match("/{$routeMethod}/",$method) !== 0 || $method === '*'){
+        foreach (explode('|', $route['method']) as $routeMethod) {
+            if (@preg_match("/{$routeMethod}/", $method) !== 0 || $method === '*') {
                 $hasMethod = true;
             }
         }
-        if(!$hasMethod){
+        if (!$hasMethod) {
             throw new \Exception('This route is not released for the accessed method');
         } 
     }
 
     protected function throwCallable($value): void
     {
-        if(is_callable($value)){
+        if (is_callable($value)) {
             throw new \Exception('Passing functions as attributes is not allowed');
         }
     }

src/AttributeTrait.php

Spacing +15 added lines, -15 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace HnrAzevedo\Router;
 
@@ -19,30 +19,30 @@ 
 
     public static function loadPipeline(): void
     {
-        foreach(self::getInstance()->pipeline as $line){
+        foreach (self::getInstance()->pipeline as $line) {
             self::getInstance()->loadLine(new ReflectionObject(new $line()));
         }
     }
 
     private function loadLine(ReflectionObject $reflection): void
     {
-        foreach($reflection->getMethods() as $method){
+        foreach ($reflection->getMethods() as $method) {
             $this->loadMethod($method);
         }
     }
 
     private function loadMethod(ReflectionMethod $method): void
     {
-        try{
+        try {
             foreach ($method->getAttributes() as $attr) {
-                if($attr->getName() != 'HnrAzevedo\Router\RouteAttribute') continue;
+                if ($attr->getName() != 'HnrAzevedo\Router\RouteAttribute') continue;
 
                 $args = $attr->getArguments();
     
                 $this->checkArgs($attr->getArguments());
                 
                 self::set(
-                    strtolower(implode('|',$args['methods'])),
+                    strtolower(implode('|', $args['methods'])),
                     $args['uri'],
                     $method->class.'@'.$method->name
                 );
@@ -54,14 +54,14 @@ 
                     ->attrWhere($args)
                     ->attrMiddleware($args);
             }
-        }catch(Exception $er){
+        }catch (Exception $er) {
             throw new Exception('Failed to add route via attribute: '.$er->getMessage());
         }
     }
 
     private function checkArgs(array $args): self
     {
-        if(!array_key_exists('uri',$args) || !array_key_exists('methods',$args)){
+        if (!array_key_exists('uri', $args) || !array_key_exists('methods', $args)) {
             throw new Exception('Misconfigured route attribute');
         }
         return $this;
@@ -69,7 +69,7 @@ 
 
     private function attrName(array $attr): self
     {
-        if(array_key_exists('name',$attr)){
+        if (array_key_exists('name', $attr)) {
             $this->name($attr['name']);
         }
         return $this;
@@ -77,7 +77,7 @@ 
 
     private function attrBefore(array $attr): self
     {
-        if(array_key_exists('before',$attr)){
+        if (array_key_exists('before', $attr)) {
             $this->before($attr['before']);
         }
         return $this;
@@ -85,7 +85,7 @@ 
 
     private function attrAfter(array $attr): self
     {
-        if(array_key_exists('after',$attr)){
+        if (array_key_exists('after', $attr)) {
             $this->after($attr['after']);
         }
         return $this;
@@ -93,8 +93,8 @@ 
 
     private function attrAttributes(array $attr): self
     {
-        if(array_key_exists('attributes',$attr)){
-            foreach($attr['attributes'] as $attribute){
+        if (array_key_exists('attributes', $attr)) {
+            foreach ($attr['attributes'] as $attribute) {
                 $this->attribute($attribute[0], $attribute[1]);
             }
         }
@@ -103,7 +103,7 @@ 
 
     private function attrWhere(array $attr): self
     {
-        if(array_key_exists('where',$attr)){
+        if (array_key_exists('where', $attr)) {
             $this->where($attr['where']);
         }
         return $this;
@@ -111,7 +111,7 @@ 
 
     private function attrMiddleware(array $attr): self
     {
-        if(array_key_exists('middleware',$attr)){
+        if (array_key_exists('middleware', $attr)) {
             $this->middleware($attr['middleware']);
         }
         return $this;

src/DefinitionsTrait.php

Indentation +4 added lines, -4 removed lines

@@ -69,9 +69,9 @@ 
         }
 
         $routes[strval($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' => [],
@@ -90,7 +90,7 @@ 
     private static function checkDuplicity(string $uri, string $method): void
     {
         foreach(self::getInstance()->getRoutes() as $route){
-    		if( md5(strtoupper(unserialize($route['uri'])->getPath().$route['method'])) === md5(strtoupper($uri.$method)) ){
+            if( md5(strtoupper(unserialize($route['uri'])->getPath().$route['method'])) === md5(strtoupper($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 = count($routes);
 
-        while(array_key_exists($index, $routes)){
+        while (array_key_exists($index, $routes)) {
             $index++;
         }
 
@@ -89,8 +89,8 @@ 
 
     private static function checkDuplicity(string $uri, string $method): void
     {
-        foreach(self::getInstance()->getRoutes() as $route){
-    		if( md5(strtoupper(unserialize($route['uri'])->getPath().$route['method'])) === md5(strtoupper($uri.$method)) ){
+        foreach (self::getInstance()->getRoutes() as $route) {
+    		if (md5(strtoupper(unserialize($route['uri'])->getPath().$route['method'])) === md5(strtoupper($uri.$method))) {
                 throw new \RuntimeException("There is already a route with the URI {$uri} and with the {$method} METHOD configured.");
             }
         }

src/RunInTrait.php

Spacing +32 added lines, -32 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,14 +84,14 @@ 
 
     protected function executeRouteAction($action): bool
     {
-        if(is_callable($action)){ 
+        if (is_callable($action)) { 
             
             $params = [];
             $closure = (get_class($action) !== 'Closure') ? $action->getClosure() : $action;
-            $ReflectionMethod =  new \ReflectionFunction ($closure);
+            $ReflectionMethod = new \ReflectionFunction($closure);
 
-            foreach($ReflectionMethod->getParameters() as $param){
-                if(!isset($_REQUEST[$param->name])) continue;
+            foreach ($ReflectionMethod->getParameters() as $param) {
+                if (!isset($_REQUEST[$param->name])) continue;
                 $params[$param->name] = $_REQUEST[$param->name];
             }
             
@@ -109,9 +109,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)){
-                $route[$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)) {
+                $route[$state] = (is_null($route[$state])) ? [$closure] : array_merge($route[$state], [$closure]); 
                 self::getInstance()->updateRoute($route, $r);
             }
         }
@@ -122,14 +122,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))();
         }
 
@@ -140,15 +140,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;
             }
@@ -159,40 +159,40 @@ 
 
     private function executeController(string $controllerMeth): void
     {
-        if(count(explode('@',$controllerMeth)) !== 2){
+        if (count(explode('@', $controllerMeth)) !== 2) {
             $path = urldecode(unserialize($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);
 
         $params = [];
 
-        $ReflectionMethod =  new \ReflectionMethod(new $controller(), $method);
+        $ReflectionMethod = new \ReflectionMethod(new $controller(), $method);
 
-        foreach($ReflectionMethod->getParameters() as $param){
-            if(!isset($_REQUEST[$param->name])) continue;
+        foreach ($ReflectionMethod->getParameters() as $param) {
+            if (!isset($_REQUEST[$param->name])) continue;
             $params[$param->name] = $_REQUEST[$param->name];
         }
 
-        call_user_func_array([(new $controller()),$method], $params);
+        call_user_func_array([(new $controller()), $method], $params);
     }
 
     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}");
         }
         

Braces +6 added lines, -2 removed lines

@@ -91,7 +91,9 @@ 
             $ReflectionMethod =  new \ReflectionFunction ($closure);
 
             foreach($ReflectionMethod->getParameters() as $param){
-                if(!isset($_REQUEST[$param->name])) continue;
+                if(!isset($_REQUEST[$param->name])) {
+                    continue;
+                }
                 $params[$param->name] = $_REQUEST[$param->name];
             }
             
@@ -174,7 +176,9 @@ 
         $ReflectionMethod =  new \ReflectionMethod(new $controller(), $method);
 
         foreach($ReflectionMethod->getParameters() as $param){
-            if(!isset($_REQUEST[$param->name])) continue;
+            if(!isset($_REQUEST[$param->name])) {
+                continue;
+            }
             $params[$param->name] = $_REQUEST[$param->name];
         }
 

src/MiddlewareTrait.php

Spacing +15 added lines, -15 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace HnrAzevedo\Router;
 
@@ -22,9 +22,9 @@ 
 
     public static function globalMiddlewares(?array $middlewares = null): array
     {
-        if(null !== $middlewares){
-            foreach($middlewares as $middleware){
-                if(!class_exists($middleware)){
+        if (null !== $middlewares) {
+            foreach ($middlewares as $middleware) {
+                if (!class_exists($middleware)) {
                     throw new \RuntimeException("Middleware class {$middleware} not exists");
                 }
             }
@@ -46,8 +46,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();
     }
 
@@ -55,8 +55,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;
             }
 
@@ -68,7 +68,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");
         }
     }
@@ -79,9 +79,9 @@ 
 
         $requestMethod = (isset($_REQUEST['REQUEST_METHOD'])) ? $_REQUEST['REQUEST_METHOD'] : $_SERVER['REQUEST_METHOD'];
 
-        $this->serverRequest = (!isset($this->serverRequest)) ? $factory->createServerRequest($requestMethod, unserialize($this->current()['uri']),['route' => $this->current()]) : $this->serverRequest;
+        $this->serverRequest = (!isset($this->serverRequest)) ? $factory->createServerRequest($requestMethod, 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]();
         }
 
@@ -96,21 +96,21 @@ 
 
     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)){
+        if (!empty($route)) {
 
-            $route['action'] = function(){
+            $route['action'] = function() {
                 $this->getInstance()->executeBefore();
                 $this->getInstance()->executeRouteAction(unserialize($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/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');
             }
         }