hnrazevedo / Router

src/CheckWhere.php

Spacing +19 added lines, -19 removed lines

@@ -4,11 +4,11 @@ 
 
 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.');
         }
         return $this;
@@ -16,7 +16,7 @@ 
 
     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.');
         }
         return $this;
@@ -26,24 +26,24 @@ 
     {
         $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(!$this->isWhered($part,$request[$p])){
+        foreach ($routeURI as $p => $part) {
+            if (!$this->isWhered($part, $request[$p])) {
                 continue;
             }
                 
-            $param = substr(str_replace('?','',$part),1,-1);
+            $param = substr(str_replace('?', '', $part), 1, -1);
 
-            if(array_key_exists($param,$route['where'])){
+            if (array_key_exists($param, $route['where'])) {
                     
                 $params[$param] = $route['where'][$param];
 
-                if(!preg_match("/^{$params[$param]}$/",$request[$p])){
+                if (!preg_match("/^{$params[$param]}$/", $request[$p])) {
                     $pass = false;
                 }
             }
@@ -54,17 +54,17 @@ 
 
     private function isWhered(string $part, string $value): bool
     {
-        return $this->isParameter($part) && !$this->checkParameterOptional($part,$value);
+        return $this->isParameter($part) && !$this->checkParameterOptional($part, $value);
     }
 
     private function checkParameterOptional(string $part, string $value): bool
     {
-        return substr($part,0,2) === '{?' && empty($value);
+        return substr($part, 0, 2) === '{?' && empty($value);
     }
 
     protected function isParameter(string $part): bool
     {
-        return (substr($part,0,1) === '{' && substr($part,-1) === '}');
+        return (substr($part, 0, 1) === '{' && substr($part, -1) === '}');
     }
 
     protected function callWhereAdd($data)
@@ -74,16 +74,16 @@ 
         $data = (count($data) > 1) ? [$data[0] => $data[1]] : $data[0];
         
         $route = end($this->routers);
-        $routeURI = explode('/',$route['url']);
+        $routeURI = explode('/', $route['url']);
         $params = [];
-        foreach($routeURI as $part){
-            if(!$this->isParameter($part)){
+        foreach ($routeURI as $part) {
+            if (!$this->isParameter($part)) {
                 continue;
             }
             
-            $param = substr(str_replace('?','',$part),1,-1);
+            $param = substr(str_replace('?', '', $part), 1, -1);
 
-            if(array_key_exists($param,$data)){
+            if (array_key_exists($param, $data)) {
                 $params[$param] = $data[$param];
             }
                 
@@ -91,7 +91,7 @@ 
 
         $this->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;
 
         $this->routers[count($this->routers)-1] = $route;
 

src/CheckTrait.php

Spacing +18 added lines, -18 removed lines

@@ -4,7 +4,7 @@ 
 
 use Exception;
 
-trait CheckTrait{
+trait CheckTrait {
     use FilterTrait, CheckWhere;
 
     protected function checkProtocol(string $expected, string $current): bool
@@ -14,7 +14,7 @@ 
 
     protected function checkName(string $routeName)
     {
-        if(!array_key_exists($routeName,$this->routers)){
+        if (!array_key_exists($routeName, $this->routers)) {
             throw new Exception('Page not found.', 404);
         }
         return $this;
@@ -22,7 +22,7 @@ 
 
     protected function checkTypeRole($role)
     {
-        if(!is_string($role) && @get_class($role) !== 'Closure' ){
+        if (!is_string($role) && @get_class($role) !== 'Closure') {
             throw new Exception("Improperly defined route track.");
         }
         return $this;
@@ -35,12 +35,12 @@ 
 
     protected function checkParameters(array $routeLoop, array $routeRequest): bool
     {
-        foreach($routeLoop as $rr => $param){
-            if( (substr($param,0,1) === '{') ){
-                $_GET[ substr($param,1,strlen($param)-2) ] = $routeRequest[$rr];    
+        foreach ($routeLoop as $rr => $param) {
+            if ((substr($param, 0, 1) === '{')) {
+                $_GET[substr($param, 1, strlen($param)-2)] = $routeRequest[$rr];    
             }
     
-            if($this->checkParameter($param, $routeRequest[$rr])){
+            if ($this->checkParameter($param, $routeRequest[$rr])) {
                 return false;
             }
         }
@@ -50,12 +50,12 @@ 
 
     protected function checkParameter(string $routeLoop, string $routeRequest): bool
     {
-        return !( substr($routeLoop,0,1) === '{' ) and $routeLoop !== $routeRequest;
+        return !(substr($routeLoop, 0, 1) === '{') and $routeLoop !== $routeRequest;
     }
 
     protected function checkRole()
     {
-        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.');
         }
         return $this;
@@ -63,10 +63,10 @@ 
 
     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(strtoupper($protocol) !== strtoupper($currentProtocol)){
+        foreach ($protocols as $protocol) {
+            if (strtoupper($protocol) !== strtoupper($currentProtocol)) {
                 continue;
             }
         }
@@ -76,9 +76,9 @@ 
 
     protected function checkToHiking($route, $routeRequest, $routeLoop): bool
     {
-        if($this->checkNumparams($routeLoop, $routeRequest) || 
+        if ($this->checkNumparams($routeLoop, $routeRequest) || 
             !$this->checkParameters($routeLoop, $routeRequest) ||
-            !$this->checkWhere($route, $routeRequest)){
+            !$this->checkWhere($route, $routeRequest)) {
                 return false;
         }
         return true;
@@ -86,7 +86,7 @@ 
 
     protected function hasRouteName(string $name)
     {
-        if(array_key_exists($name, $this->routers)){
+        if (array_key_exists($name, $this->routers)) {
             throw new Exception("There is already a route with the name {$name} configured.");
         }
         return $this;
@@ -94,8 +94,8 @@ 
 
     protected function checkExistence(string $url, string $protocol)
     {
-        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.");
             }
         }
@@ -104,7 +104,7 @@ 
 
     protected function checkInGroup()
     {
-        if($this->lastReturn){
+        if ($this->lastReturn) {
             throw new Exception("At the moment it is not allowed to assign names or tests of parameters in groups..");
         }
         return $this;

src/Router.php

Spacing +16 added lines, -16 removed lines

@@ -2,7 +2,7 @@ 
 
 namespace HnrAzevedo\Router;
 
-class Router{
+class Router {
     use Helper, CheckTrait, CheckWhere, DefinitionsTrait, ExtraJobsTrait;
 
     private static $instance = null;
@@ -20,7 +20,7 @@ 
 
     public static function create(): Router
     {
-        if(!self::getInstance()->instanced){
+        if (!self::getInstance()->instanced) {
             self::getInstance()->instanced = true;
         }
         
@@ -33,13 +33,13 @@ 
         return self::$instance;
     }
 
-    public function set(string $url ,$walking , string $protocol): Router
+    public function set(string $url, $walking, string $protocol): Router
     {
         $this->lastReturn = null;
         
-		$url = (substr($url,0,1) !=='/' and strlen($url) > 0) ? "/{$url}" : $url;
+		$url = (substr($url, 0, 1) !== '/' and strlen($url) > 0) ? "/{$url}" : $url;
 
-    	$this->checkExistence($url,$protocol);
+    	$this->checkExistence($url, $protocol);
         $this->checkTypeRole($walking);
 
 		$route = [
@@ -62,7 +62,7 @@ 
 
     public static function group(string $prefix, callable $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;
@@ -82,11 +82,11 @@ 
 
         $currentRoute = end(self::getInstance()->routers);
 
-        if(in_array($name,self::getInstance()->beforeExcepts)){
+        if (in_array($name, self::getInstance()->beforeExcepts)) {
             $currentRoute['beforeAll'] = null;
         }
 
-        if(in_array($name,self::getInstance()->afterExcepts)){
+        if (in_array($name, self::getInstance()->afterExcepts)) {
             $currentRoute['afterAll'] = null;
         }
 
@@ -106,7 +106,7 @@ 
     {
         $instance = self::create()->getInstance();
 
-        if(!$instance->loaded){
+        if (!$instance->loaded) {
             self::load($routeName);
         }
 
@@ -117,36 +117,36 @@ 
 
     public function middleware($filters): Router
     {
-        if($this->lastReturn !== null){
+        if ($this->lastReturn !== null) {
             $currentGroup = end($this->routers)['group'];
 
             foreach ($this->routers as $key => $value) {
-                if($value['group'] === $currentGroup){
-                    $this->routers[$key] = $this->addMiddleware($this->routers[$key],$filters);
+                if ($value['group'] === $currentGroup) {
+                    $this->routers[$key] = $this->addMiddleware($this->routers[$key], $filters);
                 }
             }
             
             return $this;
         }
         
-        $this->routers[count($this->routers)-1] = $this->addMiddleware(end($this->routers),$filters);
+        $this->routers[count($this->routers)-1] = $this->addMiddleware(end($this->routers), $filters);
         return $this;
     }
 
     public static function addMiddleware(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'];
         }