hnrazevedo / Router

src/Router.php

Spacing +28 added lines, -28 removed lines

@@ -4,7 +4,7 @@ 
 
 use Exception;
 
-class Router{
+class Router {
     use Helper, CheckTrait, CheckWhere, DefinitionsTrait, ExtraJobsTrait;
 
     private static $instance = null;
@@ -25,7 +25,7 @@ 
 
     public static function create(): Router
     {
-        if(!self::getInstance()->instanced){
+        if (!self::getInstance()->instanced) {
             self::getInstance()->checkConfig();
             self::getInstance()->import(ROUTER_CONFIG['path']);
             self::getInstance()->instanced = true;
@@ -40,14 +40,14 @@ 
         return self::$instance;
     }
 
-    public function set($url ,$walking , string $protocol): Router
+    public function set($url, $walking, string $protocol): Router
     {
         $this->lastReturn = null;
         
-		$url = (substr($url,0,1) !=='/' and strlen($url) > 0) ? "/{$url}" : $url;
+		$url = (substr($url, 0, 1) !== '/' and strlen($url) > 0) ? "/{$url}" : $url;
 
-    	foreach($this->routers as $key => $value){
-    		if( md5($this->prefix . $value['url'] . $value['protocol'] ) === md5( $url . $protocol ) ){
+    	foreach ($this->routers as $key => $value) {
+    		if (md5($this->prefix.$value['url'].$value['protocol']) === md5($url.$protocol)) {
                 throw new Exception("There is already a route with the url {$url} and with the {$protocol} protocol configured.");
             }
         }
@@ -72,9 +72,9 @@ 
         return self::getInstance();
     }
 
-    public static function group(string $prefix,$callback): Router
+    public static function group(string $prefix, $callback): Router
     {
-        self::getInstance()->prefix = (substr($prefix,0,1) !== '/') ? "/{$prefix}" : $prefix;
+        self::getInstance()->prefix = (substr($prefix, 0, 1) !== '/') ? "/{$prefix}" : $prefix;
         self::getInstance()->group = sha1(date('d/m/Y h:m:i'));
         $callback();
         self::getInstance()->group = null;
@@ -85,7 +85,7 @@ 
 
     public static function where(): Router
     {
-        if(self::getInstance()->lastReturn){
+        if (self::getInstance()->lastReturn) {
             throw new Exception("It is not possible to define parameter tests for groups of routes.");
         }
 
@@ -96,7 +96,7 @@ 
 
     public static function name(string $name): Router
     {
-        if(self::getInstance()->lastReturn){
+        if (self::getInstance()->lastReturn) {
             throw new Exception("There is no reason to call a {$name} route group.");
         }
 
@@ -104,11 +104,11 @@ 
 
         self::getInstance()->hasRouteName($name);
 
-        if(in_array($name,self::getInstance()->beforeExcepts)){
+        if (in_array($name, self::getInstance()->beforeExcepts)) {
             $currentRoute['beforeAll'] = null;
         }
 
-        if(in_array($name,self::getInstance()->afterExcepts)){
+        if (in_array($name, self::getInstance()->afterExcepts)) {
             $currentRoute['afterAll'] = null;
         }
 
@@ -121,15 +121,15 @@ 
 
     private function byName(?string $routName)
     {
-        if(!is_null($routName)){
+        if (!is_null($routName)) {
             $currentProtocol = $this->getProtocol();
 
             $this->checkName($routName);
     
             $route = $this->routers[$routName];
     
-            if(!$this->checkProtocol($route['protocol'], $currentProtocol)){
-                throw new Exception('Page not found.',404);
+            if (!$this->checkProtocol($route['protocol'], $currentProtocol)) {
+                throw new Exception('Page not found.', 404);
             }
     
             $this->checkFiltering($route);
@@ -147,11 +147,11 @@ 
 
 		$currentProtocol = $instance->getInstance()->getProtocol();
 
-        foreach(array_reverse($instance->getInstance()->routers) as $r => $route){
+        foreach (array_reverse($instance->getInstance()->routers) as $r => $route) {
 
             $instance->getInstance()->currentRoute = $route;
 
-            if(!$instance->getInstance()->checkProtocol($route['protocol'], $currentProtocol)){
+            if (!$instance->getInstance()->checkProtocol($route['protocol'], $currentProtocol)) {
                 continue;
             }
 
@@ -161,11 +161,11 @@ 
 
 
             $routs = $instance->getInstance()->explodeRoutes(
-                (substr($route['url'],strlen($route['url'])-1,1) === '/') , $route['url'],
-                (substr($_SERVER['REQUEST_URI'],strlen($_SERVER['REQUEST_URI'])-1,1) === '/') , $_SERVER['REQUEST_URI']
+                (substr($route['url'], strlen($route['url'])-1, 1) === '/'), $route['url'],
+                (substr($_SERVER['REQUEST_URI'], strlen($_SERVER['REQUEST_URI'])-1, 1) === '/'), $_SERVER['REQUEST_URI']
             );
 
-            if(!$instance->getInstance()->checkToHiking($route, $routs['routeRequest'], $routs['routeLoop'])){
+            if (!$instance->getInstance()->checkToHiking($route, $routs['routeRequest'], $routs['routeLoop'])) {
                 continue;
             }
 
@@ -178,18 +178,18 @@ 
         
         $instance->getInstance()->currentRoute = null;
 
-	    throw new Exception('Page not found.',404);
+	    throw new Exception('Page not found.', 404);
     }
 
     public function filter($filters): Router
     {
-        if($this->lastReturn !== null){
+        if ($this->lastReturn !== null) {
             $currentGroup = end($this->routers)['group'];
 
             foreach ($this->routers as $key => $value) {
 
-                if($value['group'] === $currentGroup){
-                    $currentRoute = $this->addFilter($this->routers[$key],$filters);
+                if ($value['group'] === $currentGroup) {
+                    $currentRoute = $this->addFilter($this->routers[$key], $filters);
                     $this->routers[$key] = $currentRoute;
                 }
 
@@ -198,24 +198,24 @@ 
             return $this;
         }
         
-        $this->routers[count($this->routers)-1] = $this->addFilter(end($this->routers),$filters);
+        $this->routers[count($this->routers)-1] = $this->addFilter(end($this->routers), $filters);
         return $this;
     }
 
     public static function addFilter(array $route, $filter): array
     {
-        if(is_null($route['filters'])){
+        if (is_null($route['filters'])) {
             $route['filters'] = $filter;
             return $route;
         }
 
         $filters = (is_array($filter)) ? $filter : [0 => $filter];
 
-        if(is_array($route['filters'])){
+        if (is_array($route['filters'])) {
             foreach ($route['filters'] as $key => $value) {
                 $filters[] = $value;
             }
-        }else{
+        }else {
             $filters[] = $route['filters'];
         }
 

src/ExtraJobsTrait.php

Spacing +9 added lines, -9 removed lines

@@ -2,11 +2,11 @@ 
 
 namespace HnrAzevedo\Router;
 
-trait ExtraJobsTrait{
+trait ExtraJobsTrait {
 
     public function before($walking): Router
     {
-        return $this->setOnRoute($walking,'before');
+        return $this->setOnRoute($walking, 'before');
     }
 
     public static function beforeAll($walking, $except = null): Router
@@ -14,12 +14,12 @@ 
         $excepts = is_array($except) ? $except : [$except];
         self::getInstance()->beforeExcepts = $excepts;
         self::getInstance()->beforeAll = $walking;
-        return self::getInstance()->setOnRoutes($walking,'beforeAll',$excepts);
+        return self::getInstance()->setOnRoutes($walking, 'beforeAll', $excepts);
     }
 
     public function after($walking): Router
     {
-        return $this->setOnRoute($walking,'after');
+        return $this->setOnRoute($walking, 'after');
     }
 
     public static function afterAll($walking, $except = null): Router
@@ -27,17 +27,17 @@ 
         $excepts = is_array($except) ? $except : [$except];
         self::getInstance()->afterExcepts = $excepts;
         self::getInstance()->afterAll = $walking;
-        return self::getInstance()->setOnRoutes($walking,'afterAll',$excepts);
+        return self::getInstance()->setOnRoutes($walking, 'afterAll', $excepts);
     }
 
     private function setOnRoute($walking, string $state): Router
     {
-        if($this->lastReturn !== null){
+        if ($this->lastReturn !== null) {
             $currentGroup = end($this->routers)['group'];
 
             foreach ($this->routers as $key => $value) {
 
-                if($value['group'] === $currentGroup){
+                if ($value['group'] === $currentGroup) {
                     $this->routers[$key][$state] = $walking;
                 }
 
@@ -51,8 +51,8 @@ 
 
     private function setOnRoutes($walking, string $state, array $excepts): Router
     {
-        foreach($this->routers as $r => $route){
-            if(!in_array($this->routers[$r]['name'],$excepts)){
+        foreach ($this->routers as $r => $route) {
+            if (!in_array($this->routers[$r]['name'], $excepts)) {
                 $this->routers[$r][$state] = $walking;
             }
         }