hnrazevedo / Router

src/Router.php

Indentation +11 added lines, -11 removed lines

@@ -43,20 +43,20 @@ 
     {
         $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.");
             }
         }
         
         $this->checkTypeRole($walking);
 
-		$route = [
-			'url' => $this->prefix.$url,
-			'role' => $walking,
-			'protocol' => $protocol,
+        $route = [
+            'url' => $this->prefix.$url,
+            'role' => $walking,
+            'protocol' => $protocol,
             'filters' => null,
             'where' => null,
             'before' => null,
@@ -64,9 +64,9 @@ 
             'after' => null,
             'afterAll' => $this->afterAll,
             'group' => self::getInstance()->group
-		];
+        ];
 
-		$this->routers[] = $route;		
+        $this->routers[] = $route;		
         
         return self::getInstance();
     }
@@ -148,7 +148,7 @@ 
             return $instance;
         }
 
-		$currentProtocol = $instance->getProtocol();
+        $currentProtocol = $instance->getProtocol();
 
         foreach(array_reverse($instance->routers) as $r => $route){
 
@@ -178,7 +178,7 @@ 
         }
         
         $instance->currentRoute = null;
-	    throw new Exception('Page not found.',404);
+        throw new Exception('Page not found.',404);
     }
 
     public static function dispatch(?string $routeName = null): bool

Spacing +30 added lines, -30 removed lines

@@ -4,7 +4,7 @@ 
 
 use Exception;
 
-class Router{
+class Router {
     use Helper, CheckTrait, CheckWhere, DefinitionsTrait, ExtraJobsTrait;
 
     private static $instance = null;
@@ -26,7 +26,7 @@ 
 
     public static function create(): Router
     {
-        if(!self::getInstance()->instanced){
+        if (!self::getInstance()->instanced) {
             self::getInstance()->instanced = true;
         }
         
@@ -39,14 +39,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.");
             }
         }
@@ -71,9 +71,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;
@@ -84,7 +84,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.");
         }
 
@@ -95,7 +95,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.");
         }
 
@@ -103,11 +103,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;
         }
 
@@ -120,15 +120,15 @@ 
 
     private function byName(?string $routName): bool
     {
-        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->currentRoute = $route;
@@ -144,18 +144,18 @@ 
     {
         $instance = self::create()->getInstance();
 
-        if($instance->byName($routeName)){
+        if ($instance->byName($routeName)) {
             return $instance;
         }
 
 		$currentProtocol = $instance->getProtocol();
 
-        foreach(array_reverse($instance->routers) as $r => $route){
+        foreach (array_reverse($instance->routers) as $r => $route) {
 
             $instance->currentRoute = $route;
             $instance->currentRoute['name'] = $r;
 
-            if(!$instance->checkProtocol($route['protocol'], $currentProtocol)){
+            if (!$instance->checkProtocol($route['protocol'], $currentProtocol)) {
                 continue;
             }
 
@@ -165,11 +165,11 @@ 
 
 
             $routs = $instance->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->checkToHiking($route, $routs['routeRequest'], $routs['routeLoop'])){
+            if (!$instance->checkToHiking($route, $routs['routeRequest'], $routs['routeLoop'])) {
                 continue;
             }
 
@@ -178,14 +178,14 @@ 
         }
         
         $instance->currentRoute = null;
-	    throw new Exception('Page not found.',404);
+	    throw new Exception('Page not found.', 404);
     }
 
     public static function dispatch(?string $routeName = null): bool
     {
         $instance = self::create()->getInstance();
 
-        if(!$instance->loaded){
+        if (!$instance->loaded) {
             self::load($routeName);
         }
 
@@ -197,13 +197,13 @@ 
 
     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;
                 }
 
@@ -212,24 +212,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'];
         }