hnrazevedo / Router

src/Router.php

Indentation +12 added lines, -12 removed lines

@@ -71,26 +71,26 @@ 
 
     public function set($url ,$walking , string $protocol): 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.");
             }
         }
         
         $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,
             'group' => self::getInstance()->group
-		];
+        ];
 
-		$this->routers[] = $route;		
+        $this->routers[] = $route;		
         
         return self::getInstance();
     }
@@ -189,7 +189,7 @@ 
 
         $instance->getInstance()->byName($routeName);
 
-		$currentProtocol = $instance->getInstance()->getProtocol();
+        $currentProtocol = $instance->getInstance()->getProtocol();
 
         foreach(array_reverse($instance->getInstance()->routers) as $r => $route){
 
@@ -207,7 +207,7 @@ 
 
             $routeRequest = $instance->getInstance()->explodeRoute((substr($_SERVER['REQUEST_URI'],strlen($_SERVER['REQUEST_URI'])-1,1) === '/') , $_SERVER['REQUEST_URI']);
 
-	        if($instance->getInstance()->checkNumparams($routeLoop, $routeRequest) || !$instance->getInstance()->checkParameters($routeLoop, $routeRequest)){
+            if($instance->getInstance()->checkNumparams($routeLoop, $routeRequest) || !$instance->getInstance()->checkParameters($routeLoop, $routeRequest)){
                 continue;
             }
 
@@ -223,7 +223,7 @@ 
         
         $instance->getInstance()->currentRoute = null;
 
-	    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, CheckWhere;
 
     private static $instance = null;
@@ -21,7 +21,7 @@ 
 
     public static function create(): Router
     {
-        if(!self::getInstance()->instanced){
+        if (!self::getInstance()->instanced) {
             self::getInstance()->checkConfig();
             self::getInstance()->import(ROUTER_CONFIG['path']);
             self::getInstance()->instanced = true;
@@ -69,12 +69,12 @@ 
         return self::getInstance()->set($uri, $walking, $protocol);
     }
 
-    public function set($url ,$walking , string $protocol): Router
+    public function set($url, $walking, string $protocol): 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.");
             }
         }
@@ -95,9 +95,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;
@@ -108,7 +108,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.");
         }
 
@@ -119,13 +119,13 @@ 
         $data = (count($data) > 1) ? [$data[0] => $data[1]] : $data[0];
         
         $route = end(self::getInstance()->routers);
-        $routeURI = explode('/',$route['url']);
+        $routeURI = explode('/', $route['url']);
         $params = [];
-        foreach($routeURI as $part){
-            if(substr($part,0,1) === '{' && substr($part,-1) === '}'){
-                $param = substr($part,1,-1);
+        foreach ($routeURI as $part) {
+            if (substr($part, 0, 1) === '{' && substr($part, -1) === '}') {
+                $param = substr($part, 1, -1);
 
-                self::getInstance()->checkExistParam($param,$data);
+                self::getInstance()->checkExistParam($param, $data);
 
                 $params[$param] = $data[$param];
             }
@@ -133,7 +133,7 @@ 
 
         self::getInstance()->checkWhereParams($params);
 
-        $route['where'] = (is_array($route['where'])) ? array_merge($route['where'],$params) : $params;
+        $route['where'] = (is_array($route['where'])) ? array_merge($route['where'], $params) : $params;
 
         self::getInstance()->routers[count(self::getInstance()->routers)-1] = $route;
 
@@ -142,14 +142,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.");
             }
         }
@@ -165,15 +165,15 @@ 
 
     private function byName(?string $routName)
     {
-        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->checkFiltering($route);
@@ -191,27 +191,27 @@ 
 
 		$currentProtocol = $instance->getInstance()->getProtocol();
 
-        foreach(array_reverse($instance->getInstance()->routers) as $r => $route){
+        foreach (array_reverse($instance->getInstance()->routers) as $r => $route) {
 
             $instance->getInstance()->currentRoute = $route;
 
-            if(!$instance->getInstance()->checkProtocol($route['protocol'], $currentProtocol)){
+            if (!$instance->getInstance()->checkProtocol($route['protocol'], $currentProtocol)) {
                 continue;
             }
 
             $instance->getInstance()->hasProtocol($route, $currentProtocol);
 
-            $routeLoop = $instance->getInstance()->explodeRoute( (substr($route['url'],strlen($route['url'])-1,1) === '/') , $route['url']);
+            $routeLoop = $instance->getInstance()->explodeRoute((substr($route['url'], strlen($route['url'])-1, 1) === '/'), $route['url']);
             
             $_SERVER['REQUEST_URI'] = (array_key_exists('REQUEST_URI', $_SERVER)) ? $_SERVER['REQUEST_URI'] : '';
 
-            $routeRequest = $instance->getInstance()->explodeRoute((substr($_SERVER['REQUEST_URI'],strlen($_SERVER['REQUEST_URI'])-1,1) === '/') , $_SERVER['REQUEST_URI']);
+            $routeRequest = $instance->getInstance()->explodeRoute((substr($_SERVER['REQUEST_URI'], strlen($_SERVER['REQUEST_URI'])-1, 1) === '/'), $_SERVER['REQUEST_URI']);
 
-	        if($instance->getInstance()->checkNumparams($routeLoop, $routeRequest) || !$instance->getInstance()->checkParameters($routeLoop, $routeRequest)){
+	        if ($instance->getInstance()->checkNumparams($routeLoop, $routeRequest) || !$instance->getInstance()->checkParameters($routeLoop, $routeRequest)) {
                 continue;
             }
 
-            if($instance->getInstance()->checkWhere($route, $routeRequest)){
+            if ($instance->getInstance()->checkWhere($route, $routeRequest)) {
 
                 $instance->getInstance()->checkFiltering($route);
 
@@ -223,18 +223,18 @@ 
         
         $instance->getInstance()->currentRoute = null;
 
-	    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;
                 }
 
@@ -245,24 +245,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/CheckWhere.php

Spacing +10 added lines, -10 removed lines

@@ -4,25 +4,25 @@ 
 
 use Exception;
 
-trait CheckWhere{
+trait CheckWhere {
         
     protected function checkWhereParam($data)
     {
-        if(count($data) === 0){
+        if (count($data) === 0) {
             throw new Exception('It is necessary to define a condition to be tested.');
         }
     }
 
     protected function checkExistParam($param, $data)
     {
-        if(!array_key_exists($param,$data)){
+        if (!array_key_exists($param, $data)) {
             throw new Exception('Test parameter not available on the route in question.');
         }
     }
 
     protected function checkWhereParams($params)
     {
-        if(count($params) === 0){
+        if (count($params) === 0) {
             throw new Exception('The route in question has no parameters to be tested.');
         }
     }
@@ -31,18 +31,18 @@ 
     {
         $pass = true;
 
-        if(!is_array($route['where'])){
+        if (!is_array($route['where'])) {
             return $pass;
         }
 
-        $routeURI = explode('/',$route['url']);
+        $routeURI = explode('/', $route['url']);
         $params = [];
-        foreach($routeURI as $p => $part){
-            if(substr($part,0,1) === '{' && substr($part,-1) === '}'){
-                $param = substr($part,1,-1);
+        foreach ($routeURI as $p => $part) {
+            if (substr($part, 0, 1) === '{' && substr($part, -1) === '}') {
+                $param = substr($part, 1, -1);
                 $params[$param] = $route['where'][$param];
 
-                if(!preg_match("/^{$params[$param]}$/",$request[$p])){
+                if (!preg_match("/^{$params[$param]}$/", $request[$p])) {
                     $pass = false;
                 }
             }