hnrazevedo / Router

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

src/Router.php

Indentation +24 added lines, -24 removed lines

@@ -61,23 +61,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();
     }
@@ -139,13 +139,13 @@ 
             return $this->byName($route_name);
         }
 
-		$currentProtocol = $this->getProtocol();
+        $currentProtocol = $this->getProtocol();
 
         foreach(array_reverse($this->routers) as $r => $route){
 
             $this->hasProtocol($route, $currentProtocol);
 
-	        $route_loop = explode(
+            $route_loop = explode(
                 '/',
                 (substr($route['url'],strlen($route['url'])-1,1) === '/') 
                     ? substr($route['url'], 0, -1) 
@@ -154,26 +154,26 @@ 
 
             /* 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;
                 }
             }
@@ -181,10 +181,10 @@ 
             $this->check_filtering($route);
 
             $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

Spacing +35 added lines, -35 removed lines

@@ -4,7 +4,7 @@ 
 
 use Exception;
 
-class Router{
+class Router {
     use Helper, CheckTrait;
 
     private static $instance = null;
@@ -59,12 +59,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.");
             }
     	}
@@ -82,9 +82,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;
@@ -96,14 +96,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.");
             }
         }
@@ -135,19 +135,19 @@ 
 
     public function dispatch(?string $route_name = null): bool
     {
-        if(!is_null($route_name)){
+        if (!is_null($route_name)) {
             return $this->byName($route_name);
         }
 
 		$currentProtocol = $this->getProtocol();
 
-        foreach(array_reverse($this->routers) as $r => $route){
+        foreach (array_reverse($this->routers) as $r => $route) {
 
             $this->hasProtocol($route, $currentProtocol);
 
 	        $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'] 
             );
@@ -161,19 +161,19 @@ 
                 : $_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;
                 }
             }
@@ -184,25 +184,25 @@ 
 	        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{
-            self::getInstance()->routers[count(self::getInstance()->routers)-1] = self::getInstance()->addFilter(end(self::getInstance()->routers),$filters);
+        }else {
+            self::getInstance()->routers[count(self::getInstance()->routers)-1] = self::getInstance()->addFilter(end(self::getInstance()->routers), $filters);
         }
 
         return self::getInstance();
@@ -210,18 +210,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'];
         }
 
@@ -234,28 +234,28 @@ 
         $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 {$controll} 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];
 
-        if( ( $this->getProtocol() == 'form') ){
+        if (($this->getProtocol() == 'form')) {
             $this->ControllerForm($controller, $method, $data['POST']);
         }else {
             $controller->$method($data);

Braces +3 added lines, -3 removed lines

@@ -201,7 +201,7 @@ 
 
             }
             
-        }else{
+        } else{
             self::getInstance()->routers[count(self::getInstance()->routers)-1] = self::getInstance()->addFilter(end(self::getInstance()->routers),$filters);
         }
 
@@ -221,7 +221,7 @@ 
             foreach ($route['filters'] as $key => $value) {
                 $filters[] = $value;
             }
-        }else{
+        } else{
             $filters[] = $route['filters'];
         }
 
@@ -257,7 +257,7 @@ 
 
         if( ( $this->getProtocol() == 'form') ){
             $this->ControllerForm($controller, $method, $data['POST']);
-        }else {
+        } else {
             $controller->$method($data);
         }
     }    

src/CheckTrait.php

Spacing +14 added lines, -14 removed lines

@@ -4,27 +4,27 @@ 
 
 use Exception;
 
-trait CheckTrait{
+trait CheckTrait {
 
     protected function check_protocol(string $expected, string $current)
     {
-        if($expected !== $current){
-            throw new Exception('Page not found.',404);
+        if ($expected !== $current) {
+            throw new Exception('Page not found.', 404);
         }
     }
 
-    protected function check_name(string $route_name){
-        if(!array_key_exists($route_name,$this->routers)){
-            throw new Exception('Page not found.',404);
+    protected function check_name(string $route_name) {
+        if (!array_key_exists($route_name, $this->routers)) {
+            throw new Exception('Page not found.', 404);
         }
     }
 
     protected function check_filtering(array $route)
     {
-        $filters = (is_array($route['filters'])) ? $route['filters'] : [ $route['filters'] ];
+        $filters = (is_array($route['filters'])) ? $route['filters'] : [$route['filters']];
 
-        foreach($filters as $filter){
-            if(is_null($filter)){
+        foreach ($filters as $filter) {
+            if (is_null($filter)) {
                 continue;
             }
             $this->filter->filtering($filter);
@@ -33,24 +33,24 @@ 
 
     protected function check_config()
     {
-        if(!defined('ROUTER_CONFIG')){
+        if (!defined('ROUTER_CONFIG')) {
             throw new Exception("Information for loading routes has not been defined.");
         }
     }
 
     protected function check_role()
     {
-        if(!array_key_exists('role', $this->getData()['POST'])){
+        if (!array_key_exists('role', $this->getData()['POST'])) {
             throw new Exception('O servidor não conseguiu identificar a finalidade deste formulário.');
         }
     }
 
     protected function hasProtocol(array $route, string $currentProtocol)
     {
-        $protocols = ( is_array($route['protocol']) ) ? $route['protocol'] : [ $route['protocol'] ];
+        $protocols = (is_array($route['protocol'])) ? $route['protocol'] : [$route['protocol']];
 
-        foreach($protocols as $protocol){
-            if($protocol !== $currentProtocol){
+        foreach ($protocols as $protocol) {
+            if ($protocol !== $currentProtocol) {
                 parent::continue;
             }
         }

src/Helper.php

Indentation +1 added lines, -1 removed lines

@@ -40,7 +40,7 @@
     }
 
     protected function ControllerForm($controller, string $method, array $values){
-		if(Validator::execute($values)){
+        if(Validator::execute($values)){
 
             $this->check_role();
 

Spacing +7 added lines, -7 removed lines

@@ -4,17 +4,17 @@ 
 
 use HnrAzevedo\Validator\Validator;
 
-trait Helper{
+trait Helper {
     use CheckTrait;
     
     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';
         }
 
@@ -33,14 +33,14 @@ 
     protected function import(string $path)
     {
         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);
             }
         }
     }
 
-    protected function ControllerForm($controller, string $method, array $values){
-		if(Validator::execute($values)){
+    protected function ControllerForm($controller, string $method, array $values) {
+		if (Validator::execute($values)) {
 
             $this->check_role();