hnrazevedo / Router

src/OwnerTrait.php

Spacing +2 added lines, -2 removed lines

@@ -16,7 +16,7 @@ 
     {
         $this->hasRouteName($name);
 
-        if(!$this->loaded){
+        if (!$this->loaded) {
             $this->loadIn($name);
         }
         
@@ -25,7 +25,7 @@ 
 
     public function hasCurrentRoute(): void
     {
-        if(!isset($this->currentRoute)){
+        if (!isset($this->currentRoute)) {
             throw new \RuntimeException('Route not yet loaded');
         }
     }

src/CheckTrait.php

Spacing +7 added lines, -7 removed lines

@@ -10,28 +10,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->group)){
+        if (!is_null($this->group)) {
             throw new \RuntimeException("It is not allowed to assign names to groups");
         }
     }
 
     protected function isInPseudGroup(): void
     {
-        if(!is_null($this->group)){
+        if (!is_null($this->group)) {
             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}");
         }
     }
@@ -39,12 +39,12 @@ 
     protected function checkMethod(array $route, $method): void
     {
         $hasMethod = false;
-        foreach(explode('|',$route['method']) as $routeMethod){
-            if(@preg_match("/{$routeMethod}/",$method) == true || $method === '*'){
+        foreach (explode('|', $route['method']) as $routeMethod) {
+            if (@preg_match("/{$routeMethod}/", $method) == true || $method === '*') {
                 $hasMethod = true;
             }
         }
-        if(!$hasMethod){
+        if (!$hasMethod) {
             throw new \Exception('This route is not released for the accessed method');
         }
         

src/DefinitionsTrait.php

Indentation +5 added lines, -5 removed lines

@@ -57,10 +57,10 @@ 
         
         self::checkDuplicity($uri,$method);
         
-		self::getInstance()->routes[] = [
-			'uri' => new Uri(self::getInstance()->host.self::getInstance()->prefix.$uri),
-			'action' => $closure,
-			'method' => strtoupper($method),
+        self::getInstance()->routes[] = [
+            'uri' => new Uri(self::getInstance()->host.self::getInstance()->prefix.$uri),
+            'action' => $closure,
+            'method' => strtoupper($method),
             'middlewares' => null,
             'where' => null,
             'before' => null,
@@ -75,7 +75,7 @@ 
     private static function checkDuplicity(string $uri, string $method): void
     {
         foreach(self::getInstance()->routes 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 +11 added lines, -11 removed lines

@@ -12,32 +12,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
@@ -48,14 +48,14 @@ 
 
     public static function any(string $uri, $closure): RouterInterface
     {
-        return self::set('*',$uri,$closure);
+        return self::set('*', $uri, $closure);
     }
 
     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);
         
 		self::getInstance()->routes[] = [
 			'uri' => new Uri(self::getInstance()->host.self::getInstance()->prefix.$uri),
@@ -74,8 +74,8 @@ 
 
     private static function checkDuplicity(string $uri, string $method): void
     {
-        foreach(self::getInstance()->routes as $route){
-    		if( md5($route['uri'].$route['method']) === md5($uri.$method) ){
+        foreach (self::getInstance()->routes 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/Router.php

Spacing +5 added lines, -5 removed lines

@@ -33,7 +33,7 @@ 
         $route = self::getInstance()->inSave();
         $route['name'] = $name;
         self::getInstance()->routesNames[$name] = $name;
-        self::getInstance()->unsetRoute(count(self::getInstance()->routes)-1)->updateRoute($route,$name);
+        self::getInstance()->unsetRoute(count(self::getInstance()->routes)-1)->updateRoute($route, $name);
         return self::getInstance();
     }
 
@@ -71,16 +71,16 @@ 
     {
         self::getInstance()->loaded = true;
 
-        foreach(self::getInstance()->routes as $r => $route){
+        foreach (self::getInstance()->routes as $r => $route) {
             self::getInstance()->currentRoute = $route;
             self::getInstance()->currentRoute['name'] = $r;
 
-            try{
+            try {
                 self::getInstance()->checkMethod($route, $_SERVER['REQUEST_METHOD']);
                 self::getInstance()->checkData($route['uri']->getPath(), $_SERVER['REQUEST_URI']);
                 self::getInstance()->sortRoutes();                
                 return self::getInstance();
-            }catch(\Exception $er){
+            }catch (\Exception $er) {
                 continue;
             }
         }
@@ -91,7 +91,7 @@ 
 
     public static function run(): RouterInterface
     {
-        if(!self::getInstance()->loaded){
+        if (!self::getInstance()->loaded) {
             self::getInstance()->load();
         }
 

Braces +1 added lines, -1 removed lines

@@ -80,7 +80,7 @@
                 self::getInstance()->checkData($route['uri']->getPath(), $_SERVER['REQUEST_URI']);
                 self::getInstance()->sortRoutes();                
                 return self::getInstance();
-            }catch(\Exception $er){
+            } catch(\Exception $er){
                 continue;
             }
         }

src/PrioritizeTrait.php

Spacing +9 added lines, -9 removed lines

@@ -2,7 +2,7 @@ 
 
 namespace HnrAzevedo\Router;
 
-trait PrioritizeTrait{
+trait PrioritizeTrait {
 
     protected array $routes = [];
 
@@ -11,28 +11,28 @@ 
         $staticRoutes = [];
         $paramRoutes = [];
 
-        foreach($this->routes as $r => $route){
+        foreach ($this->routes as $r => $route) {
 
             $path = urldecode($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));
     }
 
     private function getKeyArray(int $index, array $array): int
     {
-        while(array_key_exists($index,$array)){
+        while (array_key_exists($index, $array)) {
             $index++;
         }
         return $index;
@@ -41,8 +41,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/MiddlewareTrait.php

Spacing +6 added lines, -6 removed lines

@@ -20,8 +20,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");
             }
         }
@@ -31,16 +31,16 @@ 
 
     public static function middleware($middlewares): RouterInterface
     {
-        $middlewares = (is_array($middlewares)) ? $middlewares : [ $middlewares ];
+        $middlewares = (is_array($middlewares)) ? $middlewares : [$middlewares];
         $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()->routes));
+        $route['middlewares'] = (is_array($route['middlewares'])) ? array_merge($route['middlewares'], $middlewares) : $middlewares;
+        self::getInstance()->updateRoute($route, array_key_last(self::getInstance()->routes));
         return self::getInstance();
     }
 
     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");
         }
     }

src/WhereTrait.php

Spacing +9 added lines, -9 removed lines

@@ -9,37 +9,37 @@ 
     public static function where(array $wheres): Router
     {
         $route = self::getInstance()->inSabe();
-        $route['where'] = (is_array($route['where'])) ? array_merge($route['where'],$wheres) : $wheres;
-        self::getInstance()->updateRoute($route,array_key_last(self::getInstance()->routes));
+        $route['where'] = (is_array($route['where'])) ? array_merge($route['where'], $wheres) : $wheres;
+        self::getInstance()->updateRoute($route, array_key_last(self::getInstance()->routes));
         return self::getInstance();
     }
 
     protected function checkData(string $routePath, string $uriPath): void
     {
-        $routePath = explode('/',urldecode($routePath));
+        $routePath = explode('/', urldecode($routePath));
         unset($routePath[0]);
-        $uriPath = explode('/',urldecode($uriPath));
+        $uriPath = explode('/', urldecode($uriPath));
         unset($uriPath[0]);
 
         $this->checkCount($routePath, $uriPath);
         
         $corretRoute = true;
-        foreach($routePath as $r => $routeFrag){
+        foreach ($routePath as $r => $routeFrag) {
             $routeFrag = $this->replaceParam($routeFrag, $uriPath[$r]);
 
-            if($routeFrag !== $uriPath[$r]){
+            if ($routeFrag !== $uriPath[$r]) {
                 $corretRoute = false;
             }
         }
 
-        if(!$corretRoute){
+        if (!$corretRoute) {
             throw new \Exception('continue');
         }
     }
 
     private function replaceParam(string $ref, string $value): string
     {
-        if(((substr($ref,0,1) === '{') && (substr($ref,strlen($ref)-1) === '}'))) {
+        if (((substr($ref, 0, 1) === '{') && (substr($ref, strlen($ref)-1) === '}'))) {
             return $value;
         } 
         return $ref;
@@ -47,7 +47,7 @@ 
 
     private function checkCount(array $routePath, array $uriPath): void
     {
-        if(count($routePath) !== count($uriPath)){
+        if (count($routePath) !== count($uriPath)) {
             throw new \Exception('Continue');
         }
     }

src/RunInTrait.php

Spacing +10 added lines, -10 removed lines

@@ -11,24 +11,24 @@ 
 
     public static function before($closure): RouterInterface
     {
-        return self::addInRoute('before',$closure);
+        return self::addInRoute('before', $closure);
     }
 
     public static function after($closure): RouterInterface
     {
-        return self::addInRoute('after',$closure);
+        return self::addInRoute('after', $closure);
     }
 
     public static function beforeAll($closure, $excepts): RouterInterface
     {
-        self::getInstance()->beforeExcepts = (is_array($excepts)) ? $excepts : [ $excepts ];
+        self::getInstance()->beforeExcepts = (is_array($excepts)) ? $excepts : [$excepts];
         self::getInstance()->beforeAll = $closure;
         return self::getInstance();
     }
 
     public static function afterAll($closure, $excepts): RouterInterface
     {
-        self::getInstance()->afterExcepts = (is_array($excepts)) ? $excepts : [ $excepts ];
+        self::getInstance()->afterExcepts = (is_array($excepts)) ? $excepts : [$excepts];
         self::getInstance()->afterAll = $closure;
         return self::getInstance();
     }
@@ -46,12 +46,12 @@ 
     private static function addInRoutes(string $state, $closure, $excepts): RouterInterface
     {
         self::getInstance()->isInPseudGroup();
-        $excepts = (is_array($excepts)) ? $excepts : [ $excepts ];
+        $excepts = (is_array($excepts)) ? $excepts : [$excepts];
         $group = self::getInstance()->inSave()['group'];
 
-        foreach(self::getInstance()->routes as $r => $route){
-            if($route['group'] === $group && !in_array($r,$excepts)){
-                self::getInstance()->routes[$r][$state] = (is_null($route[$state])) ? [ $closure ] : array_merge($route[$state], [ $closure ]); 
+        foreach (self::getInstance()->routes as $r => $route) {
+            if ($route['group'] === $group && !in_array($r, $excepts)) {
+                self::getInstance()->routes[$r][$state] = (is_null($route[$state])) ? [$closure] : array_merge($route[$state], [$closure]); 
             }
         }
 
@@ -61,9 +61,9 @@ 
     private static function addInRoute(string $state, $closure): RouterInterface
     {
         $route = self::getInstance()->inSave();
-        $state = (!is_null($route[$state])) ? [ $closure ] : array_merge($route[$state], [ $closure ]);
+        $state = (!is_null($route[$state])) ? [$closure] : array_merge($route[$state], [$closure]);
         $route[$state] = $state;
-        self::updateRoute($route,array_key_last(self::getInstance()->routes));
+        self::updateRoute($route, array_key_last(self::getInstance()->routes));
         return self::getInstance();
     }
 

examples/index.php

Spacing +2 added lines, -2 removed lines

@@ -9,7 +9,7 @@ 
 
 /* NOTE: in case of error an exception is thrown */
 
-try{
+try {
 
     Router::globalMiddlewares([
         'Lasted'=> \Example\Middleware\Lasted::class
@@ -26,7 +26,7 @@ 
     /* Return current action route */
     $action = Router::currentAction();
 
-}catch(Exception $er){
+}catch (Exception $er) {
 
     die("Code Error: {$er->getCode()}, Line: {$er->getLine()}, File: {$er->getFile()}, Message: {$er->getMessage()}.");
 

Braces +1 added lines, -1 removed lines

@@ -26,7 +26,7 @@
     /* Return current action route */
     $action = Router::currentAction();
 
-}catch(Exception $er){
+} catch(Exception $er){
 
     die("Code Error: {$er->getCode()}, Line: {$er->getLine()}, File: {$er->getFile()}, Message: {$er->getMessage()}.");