hnrazevedo / Router

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.");
             }
         }