hnrazevedo / Router

src/Helper.php

Spacing +12 added lines, -12 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);
@@ -77,7 +77,7 @@ 
 
     protected function explodeRoute(bool $bar, array $url): array
     {   
-        return explode( '/', $bar ? substr($url, 0, -1) : $url );
+        return explode('/', $bar ? substr($url, 0, -1) : $url);
     }
 
 }
\ No newline at end of file

src/Router.php

Indentation +16 added lines, -16 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,7 +140,7 @@ 
     {
         $this->byName($route_name);
 
-		$currentProtocol = $this->getProtocol();
+        $currentProtocol = $this->getProtocol();
 
         foreach(array_reverse($this->routers) as $r => $route){
 
@@ -150,17 +150,17 @@ 
             
             $route_request = $this->explodeRoute((substr($_SERVER['REQUEST_URI'],strlen($_SERVER['REQUEST_URI'])-1,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;
             }
             
             $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,15 +142,15 @@ 
 
 		$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 = $this->explodeRoute((substr($route['url'],strlen($route['url'])-1,1) === '/') , $route['url']);
+            $route_loop = $this->explodeRoute((substr($route['url'], strlen($route['url'])-1, 1) === '/'), $route['url']);
             
-            $route_request = $this->explodeRoute((substr($_SERVER['REQUEST_URI'],strlen($_SERVER['REQUEST_URI'])-1,1) === '/') , $_SERVER['REQUEST_URI']);
+            $route_request = $this->explodeRoute((substr($_SERVER['REQUEST_URI'], strlen($_SERVER['REQUEST_URI'])-1, 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;
             }
             
@@ -160,18 +160,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;
                 }
 
@@ -180,24 +180,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'];
         }