hnrazevedo / Router

src/Helper.php

Spacing +3 added lines, -3 removed lines

@@ -2,16 +2,16 @@
 
 namespace HnrAzevedo\Router;
 
-trait Helper{
+trait Helper {
     
     protected function getProtocol(): string
     {
-        if((isset($_SERVER['HTTP_X_REQUESTED_WITH']) && strtolower($_SERVER['HTTP_X_REQUESTED_WITH']) == 'xmlhttprequest')){
+        if ((isset($_SERVER['HTTP_X_REQUESTED_WITH']) && strtolower($_SERVER['HTTP_X_REQUESTED_WITH']) == 'xmlhttprequest')) {
             return 'ajax';
         }
         
         /* ONLY FOR DEBUG CONDITION */
-        if(!array_key_exists('REQUEST_METHOD',$_SERVER)){
+        if (!array_key_exists('REQUEST_METHOD', $_SERVER)) {
             return 'get';
         }
 

src/Router.php

Indentation +53 added lines, -53 removed lines

@@ -79,23 +79,23 @@ 
 
     public function set($url , $role , $protocol = null): Router
     {
-		$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.");
             }
-    	}
+        }
 
-		$route = [
-			'url' => $this->prefix.$url,
-			'role' => $role,
-			'protocol' => $protocol,
-			'filters' => null,
+        $route = [
+            'url' => $this->prefix.$url,
+            'role' => $role,
+            'protocol' => $protocol,
+            'filters' => null,
             'group' => self::getInstance()->group
-		];
+        ];
 
-		$this->routers[] = $route;		
+        $this->routers[] = $route;		
         
         return self::getInstance();
     }
@@ -137,33 +137,33 @@ 
 
     public function dispatch(?string $route_name = null): bool
     {
-		$currentProtocol = $this->getProtocol();
+        $currentProtocol = $this->getProtocol();
         $context = [];
 
-		if(!empty($route_name)){
+        if(!empty($route_name)){
 
-			if(!array_key_exists($route_name,$this->routers)){
+            if(!array_key_exists($route_name,$this->routers)){
                 throw new Exception('Page not found.'.$route_name,404);
             }
 
-			$route = $this->routers[$route_name];
+            $route = $this->routers[$route_name];
 
-			if($route['protocol']!==$currentProtocol){
+            if($route['protocol']!==$currentProtocol){
                 throw new Exception('Page not found.'.$route_name,404);
             }
 
-			if(!empty($route['filters'])){
-	            if(is_array($route['filters'])){
-	                foreach($route['filters'] as $filter){
-	                    $this->filter->filtering($filter);
-	                }
-	            }else{
-	                $this->filter->filtering($route['filters']);
-	            }
-	        }
+            if(!empty($route['filters'])){
+                if(is_array($route['filters'])){
+                    foreach($route['filters'] as $filter){
+                        $this->filter->filtering($filter);
+                    }
+                }else{
+                    $this->filter->filtering($route['filters']);
+                }
+            }
 
             $this->Controller($route['role']);
-			return true;
+            return true;
         }
 
         foreach(array_reverse($this->routers) as $r => $route){
@@ -173,13 +173,13 @@ 
                         continue;
                     }
                 }
-	        }else{
-				if($route['protocol'] !== $currentProtocol){
+            }else{
+                if($route['protocol'] !== $currentProtocol){
                     continue;
                 }
-			}
+            }
 
-	        $route_loop = explode(
+            $route_loop = explode(
                 '/',
                 (substr($route['url'],strlen($route['url'])-1,1) === '/') 
                     ? substr($route['url'], 0, -1) 
@@ -188,45 +188,45 @@ 
 
             /* ONLY FOR DEBUG CONDITION */
             $route_request = $route_loop;
-	        /*$route_request = explode(
+            /*$route_request = explode(
                 '/',
                 (substr($_SERVER['REQUEST_URI'],strlen($_SERVER['REQUEST_URI'])-1,1) === '/') 
                 ? substr($_SERVER['REQUEST_URI'], 0, -1) 
                 : $_SERVER['REQUEST_URI'] 
             );*/
 
-	        if(count($route_loop) !== count($route_request)){
+            if(count($route_loop) !== count($route_request)){
                 continue;
             }
 
-	        for($rr = 0; $rr < count($route_loop); $rr++){
-	            $param = (substr($route_loop[$rr],0,1)==='{');
+            for($rr = 0; $rr < count($route_loop); $rr++){
+                $param = (substr($route_loop[$rr],0,1)==='{');
 
-	            if($param){
+                if($param){
                     $param_name = substr($route_loop[$rr],1,strlen($route_loop[$rr])-2);
-	                $data[$param_name] = $route_request[$rr];
-	            }
+                    $data[$param_name] = $route_request[$rr];
+                }
 
-	            if(!$param and $route_loop[$rr] !== $route_request[$rr]){
+                if(!$param and $route_loop[$rr] !== $route_request[$rr]){
                     continue 2;
                 }
-	        }
-
-	        if(!empty($route['filters'])){
-	            if(is_array($route['filters'])){
-	                foreach($route['filters'] as $filter){
-	                    $this->filter->filtering($filter);
-	                }
-	            }else{
-	                $this->filter->filtering($route['filters']);
-	            }
-	        }
+            }
+
+            if(!empty($route['filters'])){
+                if(is_array($route['filters'])){
+                    foreach($route['filters'] as $filter){
+                        $this->filter->filtering($filter);
+                    }
+                }else{
+                    $this->filter->filtering($route['filters']);
+                }
+            }
 
             $this->Controller($route['role']);
-	        return true;
-	    }
+            return true;
+        }
 
-	    throw new Exception('Page not found.',404);
+        throw new Exception('Page not found.',404);
     }
 
     public static function filter($filters): Router
@@ -314,7 +314,7 @@ 
     }    
 
     public function ControllerForm($controller, string $method, array $values){
-		if(Validator::execute($values)){
+        if(Validator::execute($values)){
             if(!array_key_exists('role',$this->getData()['POST'])){
                 throw new Exception('O servidor não conseguiu identificar a finalidade deste formulário.');
             }

Spacing +60 added lines, -60 removed lines

@@ -6,7 +6,7 @@ 
 
 use Exception;
 
-class Router{
+class Router {
     use Helper;
 
     private static $instance = null;
@@ -25,7 +25,7 @@ 
 
     public static function create(): Router
     {
-        if(!defined('ROUTER_CONFIG')){
+        if (!defined('ROUTER_CONFIG')) {
             throw new Exception("Information for loading routes has not been defined.");
         }
         
@@ -35,7 +35,7 @@ 
 
     public static function getInstance(): Router
     {
-        if(is_null(self::$instance)){
+        if (is_null(self::$instance)) {
             self::$instance = new self();
         }
         return self::$instance;
@@ -44,8 +44,8 @@ 
     private static function import(string $path): Router
     {
         foreach (scandir($path) as $routeFile) {
-            if(pathinfo($path.DIRECTORY_SEPARATOR.$routeFile, PATHINFO_EXTENSION) === 'php'){
-                require_once($path. DIRECTORY_SEPARATOR .$routeFile);
+            if (pathinfo($path.DIRECTORY_SEPARATOR.$routeFile, PATHINFO_EXTENSION) === 'php') {
+                require_once($path.DIRECTORY_SEPARATOR.$routeFile);
             }
         }
 
@@ -77,12 +77,12 @@ 
         return self::getInstance()->set($uri, $controll, $protocol);
     }
 
-    public function set($url , $role , $protocol = null): Router
+    public function set($url, $role, $protocol = null): Router
     {
-		$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.");
             }
     	}
@@ -100,9 +100,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;
@@ -114,14 +114,14 @@ 
     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.");
         }
 
         $currentRoute = end(self::getInstance()->routers);
 
-        foreach(self::getInstance()->routers as $key => $value){
-            if(array_key_exists($name, self::getInstance()->routers)){
+        foreach (self::getInstance()->routers as $key => $value) {
+            if (array_key_exists($name, self::getInstance()->routers)) {
                 throw new Exception("There is already a route with the name {$name} configured.");
             }
         }
@@ -140,24 +140,24 @@ 
 		$currentProtocol = $this->getProtocol();
         $context = [];
 
-		if(!empty($route_name)){
+		if (!empty($route_name)) {
 
-			if(!array_key_exists($route_name,$this->routers)){
-                throw new Exception('Page not found.'.$route_name,404);
+			if (!array_key_exists($route_name, $this->routers)) {
+                throw new Exception('Page not found.'.$route_name, 404);
             }
 
 			$route = $this->routers[$route_name];
 
-			if($route['protocol']!==$currentProtocol){
-                throw new Exception('Page not found.'.$route_name,404);
+			if ($route['protocol'] !== $currentProtocol) {
+                throw new Exception('Page not found.'.$route_name, 404);
             }
 
-			if(!empty($route['filters'])){
-	            if(is_array($route['filters'])){
-	                foreach($route['filters'] as $filter){
+			if (!empty($route['filters'])) {
+	            if (is_array($route['filters'])) {
+	                foreach ($route['filters'] as $filter) {
 	                    $this->filter->filtering($filter);
 	                }
-	            }else{
+	            }else {
 	                $this->filter->filtering($route['filters']);
 	            }
 	        }
@@ -166,22 +166,22 @@ 
 			return true;
         }
 
-        foreach(array_reverse($this->routers) as $r => $route){
-            if(is_array($route['protocol'])){
-                foreach($route['protocol'] as $protocol){
-                    if($protocol !== $currentProtocol){
+        foreach (array_reverse($this->routers) as $r => $route) {
+            if (is_array($route['protocol'])) {
+                foreach ($route['protocol'] as $protocol) {
+                    if ($protocol !== $currentProtocol) {
                         continue;
                     }
                 }
-	        }else{
-				if($route['protocol'] !== $currentProtocol){
+	        }else {
+				if ($route['protocol'] !== $currentProtocol) {
                     continue;
                 }
 			}
 
 	        $route_loop = explode(
                 '/',
-                (substr($route['url'],strlen($route['url'])-1,1) === '/') 
+                (substr($route['url'], strlen($route['url'])-1, 1) === '/') 
                     ? substr($route['url'], 0, -1) 
                     : $route['url'] 
             );
@@ -195,29 +195,29 @@ 
                 : $_SERVER['REQUEST_URI'] 
             );*/
 
-	        if(count($route_loop) !== count($route_request)){
+	        if (count($route_loop) !== count($route_request)) {
                 continue;
             }
 
-	        for($rr = 0; $rr < count($route_loop); $rr++){
-	            $param = (substr($route_loop[$rr],0,1)==='{');
+	        for ($rr = 0; $rr < count($route_loop); $rr++) {
+	            $param = (substr($route_loop[$rr], 0, 1) === '{');
 
-	            if($param){
-                    $param_name = substr($route_loop[$rr],1,strlen($route_loop[$rr])-2);
+	            if ($param) {
+                    $param_name = substr($route_loop[$rr], 1, strlen($route_loop[$rr])-2);
 	                $data[$param_name] = $route_request[$rr];
 	            }
 
-	            if(!$param and $route_loop[$rr] !== $route_request[$rr]){
+	            if (!$param and $route_loop[$rr] !== $route_request[$rr]) {
                     continue 2;
                 }
 	        }
 
-	        if(!empty($route['filters'])){
-	            if(is_array($route['filters'])){
-	                foreach($route['filters'] as $filter){
+	        if (!empty($route['filters'])) {
+	            if (is_array($route['filters'])) {
+	                foreach ($route['filters'] as $filter) {
 	                    $this->filter->filtering($filter);
 	                }
-	            }else{
+	            }else {
 	                $this->filter->filtering($route['filters']);
 	            }
 	        }
@@ -226,23 +226,23 @@ 
 	        return true;
 	    }
 
-	    throw new Exception('Page not found.',404);
+	    throw new Exception('Page not found.', 404);
     }
 
     public static function filter($filters): Router
     {
-        if(self::getInstance()->lastReturn !== null){
+        if (self::getInstance()->lastReturn !== null) {
             $currentGroup = end(self::getInstance()->routers)['group'];
 
             foreach (self::getInstance()->routers as $key => $value) {
-                if($value['group'] === $currentGroup){
-                    $currentRoute = self::getInstance()->addFilter(self::getInstance()->routers[$key],$filters);
+                if ($value['group'] === $currentGroup) {
+                    $currentRoute = self::getInstance()->addFilter(self::getInstance()->routers[$key], $filters);
                     self::getInstance()->routers[$key] = $currentRoute;
                 }
             }
             
-        }else{
-            $currentRoute = self::getInstance()->addFilter(end(self::getInstance()->routers),$filters);
+        }else {
+            $currentRoute = self::getInstance()->addFilter(end(self::getInstance()->routers), $filters);
             self::getInstance()->routers[count(self::getInstance()->routers)-1] = $currentRoute;
         }
 
@@ -251,18 +251,18 @@ 
 
     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'];
         }
 
@@ -283,39 +283,39 @@ 
         $data = $this->getData();
 
         foreach ($data['GET'] as $name => $value) {
-            $controll = str_replace('{'.$name.'}',$value,$controll);
+            $controll = str_replace('{'.$name.'}', $value, $controll);
         }
 
-        $d = explode(':',$controll);
+        $d = explode(':', $controll);
 
-        if(count($d) != 2){
+        if (count($d) != 2) {
             throw new Exception("Controller {$controller} badly set.");
         }
 
-        if(!class_exists('Controllers\\' . ucfirst($d[0]))){
+        if (!class_exists('Controllers\\'.ucfirst($d[0]))) {
             throw new Exception("No controller {$d[0]} found.");
         }
 
-        if(!method_exists('Controllers\\' . ucfirst($d[0]), $d[1])){
+        if (!method_exists('Controllers\\'.ucfirst($d[0]), $d[1])) {
             throw new Exception("No method {$d[1]} found for {$d[0]}.");
         }
 
-        $controller = 'Controllers\\' . ucfirst($d[0]);
+        $controller = 'Controllers\\'.ucfirst($d[0]);
         $controller = new $controller();
         $method = $d[1];
 
-        $isForm = ( $this->getProtocol() == 'form');
+        $isForm = ($this->getProtocol() == 'form');
 
-        if($isform){
+        if ($isform) {
             $this->ControllerForm($controller, $method, $data['POST']);
         }else {
             $controller->$method($data);
         }
     }    
 
-    public function ControllerForm($controller, string $method, array $values){
-		if(Validator::execute($values)){
-            if(!array_key_exists('role',$this->getData()['POST'])){
+    public function ControllerForm($controller, string $method, array $values) {
+		if (Validator::execute($values)) {
+            if (!array_key_exists('role', $this->getData()['POST'])) {
                 throw new Exception('O servidor não conseguiu identificar a finalidade deste formulário.');
             }
 

Braces +6 added lines, -6 removed lines

@@ -157,7 +157,7 @@ 
 	                foreach($route['filters'] as $filter){
 	                    $this->filter->filtering($filter);
 	                }
-	            }else{
+	            } else{
 	                $this->filter->filtering($route['filters']);
 	            }
 	        }
@@ -173,7 +173,7 @@ 
                         continue;
                     }
                 }
-	        }else{
+	        } else{
 				if($route['protocol'] !== $currentProtocol){
                     continue;
                 }
@@ -217,7 +217,7 @@ 
 	                foreach($route['filters'] as $filter){
 	                    $this->filter->filtering($filter);
 	                }
-	            }else{
+	            } else{
 	                $this->filter->filtering($route['filters']);
 	            }
 	        }
@@ -241,7 +241,7 @@ 
                 }
             }
             
-        }else{
+        } else{
             $currentRoute = self::getInstance()->addFilter(end(self::getInstance()->routers),$filters);
             self::getInstance()->routers[count(self::getInstance()->routers)-1] = $currentRoute;
         }
@@ -262,7 +262,7 @@ 
             foreach ($route['filters'] as $key => $value) {
                 $filters[] = $value;
             }
-        }else{
+        } else{
             $filters[] = $route['filters'];
         }
 
@@ -308,7 +308,7 @@ 
 
         if($isform){
             $this->ControllerForm($controller, $method, $data['POST']);
-        }else {
+        } else {
             $controller->$method($data);
         }
     }    

examples/index.php

Spacing +2 added lines, -2 removed lines

@@ -7,11 +7,11 @@
 
 /* NOTE: in case of error an exception is thrown */
 
-try{
+try {
     
     Router::create()->dispatch();
 
-}catch(Exception $er){
+}catch (Exception $er) {
 
     die($er->getCode().'  -  '.$er->getMessage());
 

Braces +1 added lines, -1 removed lines

@@ -11,7 +11,7 @@
     
     Router::create()->dispatch();
 
-}catch(Exception $er){
+} catch(Exception $er){
 
     die($er->getCode().'  -  '.$er->getMessage());
 

examples/Routes/default.php

Spacing +1 added lines, -1 removed lines

@@ -2,4 +2,4 @@
 
 use HnrAzevedo\Router\Router;
 
-Router::get('/','Application:index');
\ No newline at end of file
+Router::get('/', 'Application:index');
\ No newline at end of file