hnrazevedo / Router

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 +11 added lines, -11 removed lines

@@ -4,17 +4,17 @@ 
 
 use HnrAzevedo\Validator\Validator;
 
-trait Helper{
+trait Helper {
     use CheckTrait, ControllerTrait;
     
     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();
 
@@ -55,7 +55,7 @@ 
         $data = $this->getData();
 
         foreach ($data['GET'] as $name => $value) {
-            $controll = str_replace('{'.$name.'}',$value,$controll);
+            $controll = str_replace('{'.$name.'}', $value, $controll);
         }
 
         $this->check_controllsettable($controll);
@@ -64,11 +64,11 @@ 
 
         $this->check_controllmethod($controll);
 
-        $controller = 'Controllers\\' . ucfirst(explode(':',$controll)[0]);
+        $controller = 'Controllers\\'.ucfirst(explode(':', $controll)[0]);
         $controller = new $controller();
-        $method = explode(':',$controll)[1];
+        $method = explode(':', $controll)[1];
 
-        if( ( $this->getProtocol() == 'form') ){
+        if (($this->getProtocol() == 'form')) {
             $this->ControllerForm($controller, $method, $data['POST']);
         }else {
             $controller->$method($data);

Braces +1 added lines, -1 removed lines

@@ -70,7 +70,7 @@
 
         if( ( $this->getProtocol() == 'form') ){
             $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("Code Error: {$er->getCode()}, Line: {$er->getLine()}, File: {$er->getFile()}, Message: {$er->getMessage()}.");
 

Braces +1 added lines, -1 removed lines

@@ -11,7 +11,7 @@
     
     Router::create()->dispatch();
 
-}catch(Exception $er){
+} catch(Exception $er){
 
     die("Code Error: {$er->getCode()}, Line: {$er->getLine()}, File: {$er->getFile()}, Message: {$er->getMessage()}.");
 

examples/Routes/default.php

Spacing +2 added lines, -2 removed lines

@@ -2,6 +2,6 @@
 
 use HnrAzevedo\Router\Router;
 
-Router::get('/','Application:index');
+Router::get('/', 'Application:index');
 
-Router::get('/{parameter}/{teste}','Params:index');
\ No newline at end of file
+Router::get('/{parameter}/{teste}', 'Params:index');
\ No newline at end of file

src/Router.php

Braces +1 added lines, -1 removed lines

@@ -217,7 +217,7 @@
             foreach ($route['filters'] as $key => $value) {
                 $filters[] = $value;
             }
-        }else{
+        } else{
             $filters[] = $route['filters'];
         }
 

Indentation +17 added lines, -17 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();
     }
@@ -140,13 +140,13 @@ 
     {
         $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) 
@@ -160,17 +160,17 @@ 
                 : $_SERVER['REQUEST_URI'] 
             );
 
-	        if($this->check_numparams($route_loop, $route_request) || $this->check_parameters($route_loop, $route_request)){
+            if($this->check_numparams($route_loop, $route_request) || $this->check_parameters($route_loop, $route_request)){
                 continue;
             }
             
             $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 +23 added lines, -23 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.");
             }
         }
@@ -119,7 +119,7 @@ 
 
     private function byName(?string $route_name)
     {
-        if(!is_null($route_name)){
+        if (!is_null($route_name)) {
             $currentProtocol = $this->getProtocol();
 
             $this->check_name($route_name);
@@ -142,25 +142,25 @@ 
 
 		$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'] 
             );
 
             $route_request = explode(
                 '/',
-                (substr($_SERVER['REQUEST_URI'],strlen($_SERVER['REQUEST_URI'])-1,1) === '/') 
+                (substr($_SERVER['REQUEST_URI'], strlen($_SERVER['REQUEST_URI'])-1, 1) === '/') 
                 ? substr($_SERVER['REQUEST_URI'], 0, -1) 
                 : $_SERVER['REQUEST_URI'] 
             );
 
-	        if($this->check_numparams($route_loop, $route_request) || $this->check_parameters($route_loop, $route_request)){
+	        if ($this->check_numparams($route_loop, $route_request) || $this->check_parameters($route_loop, $route_request)) {
                 continue;
             }
             
@@ -170,18 +170,18 @@ 
 	        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;
                 }
 
@@ -190,24 +190,24 @@ 
             return self::getInstance();
         }
         
-        self::getInstance()->routers[count(self::getInstance()->routers)-1] = self::getInstance()->addFilter(end(self::getInstance()->routers),$filters);
+        self::getInstance()->routers[count(self::getInstance()->routers)-1] = self::getInstance()->addFilter(end(self::getInstance()->routers), $filters);
         return self::getInstance();
     }
 
     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/ControllerTrait.php

Spacing +6 added lines, -6 removed lines

@@ -4,26 +4,26 @@
 
 use Exception;
 
-trait ControllerTrait{
+trait ControllerTrait {
 
     protected function check_controllsettable(string $controll)
     {
-        if(count(explode(':',$controll)) != 2){
+        if (count(explode(':', $controll)) != 2) {
             throw new Exception("Controller {$controll} badly set.");
         }
     }
 
     protected function check_controllexist(string $controll)
     {
-        if(!class_exists('Controllers\\' . ucfirst(explode(':',$controll)[0]))){
-            throw new Exception("No controller ".explode(':',$controll)[0]." found.");
+        if (!class_exists('Controllers\\'.ucfirst(explode(':', $controll)[0]))) {
+            throw new Exception("No controller ".explode(':', $controll)[0]." found.");
         }
     }
 
     protected function check_controllmethod(string $controll)
     {
-        if(!method_exists('Controllers\\' . ucfirst(explode(':',$controll)[0]), explode(':',$controll)[1])){
-            throw new Exception("No method ".explode(':',$controll)[1]." found for ".explode(':',$controll)[0].".");
+        if (!method_exists('Controllers\\'.ucfirst(explode(':', $controll)[0]), explode(':', $controll)[1])) {
+            throw new Exception("No method ".explode(':', $controll)[1]." found for ".explode(':', $controll)[0].".");
         }
     }
 

src/CheckTrait.php

Spacing +19 added lines, -19 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,7 +33,7 @@ 
 
     protected function check_config()
     {
-        if(!defined('ROUTER_CONFIG')){
+        if (!defined('ROUTER_CONFIG')) {
             throw new Exception("Information for loading routes has not been defined.");
         }
     }
@@ -45,12 +45,12 @@ 
 
     protected function check_parameters(array $route_loop, array $route_request)
     {
-        foreach($route_loop as $rr => $param){
-            if( (substr($param,0,1) === '{') ){
-                $data[ substr($param,1,strlen($param)-2) ] = $route_request[$rr];    
+        foreach ($route_loop as $rr => $param) {
+            if ((substr($param, 0, 1) === '{')) {
+                $data[substr($param, 1, strlen($param)-2)] = $route_request[$rr];    
             }
     
-            if($this->check_parameter($param, $route_request[$rr])){
+            if ($this->check_parameter($param, $route_request[$rr])) {
                 return false;
             }
         }
@@ -58,22 +58,22 @@ 
 
     protected function check_parameter(string $route_loop, string $route_request)
     {
-        return !( substr($route_loop,0,1) === '{' ) and $route_loop !== $route_request;
+        return !(substr($route_loop, 0, 1) === '{') and $route_loop !== $route_request;
     }
 
     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) {
                 continue;
             }
         }