hnrazevedo / Router

src/Helper.php

Indentation +2 added lines, -2 removed lines

@@ -43,7 +43,7 @@ 
     }
 
     protected function ControllerForm($controller, string $method, array $values){
-		$this->checkRole();
+        $this->checkRole();
         $method = ($method !== 'method') ? $method : $this->getData()['POST']['role'];
         $data = (array_key_exists('data',$values)) ? json_decode($values['data'], true) : null;
 
@@ -157,7 +157,7 @@ 
         }
         
         $this->currentRoute = null;
-	    throw new Exception('Page not found.',404);
+        throw new Exception('Page not found.',404);
     }
 
     protected function loadByName(?string $routName = null): Router

Spacing +39 added lines, -39 removed lines

@@ -4,7 +4,7 @@ 
 
 use Exception;
 
-trait Helper{
+trait Helper {
     use CheckTrait, ControllerTrait;
     
     private $currentRoute = null;
@@ -27,7 +27,7 @@ 
     protected function getProtocol(): string
     {
         $protocol = ((isset($_SERVER['HTTP_X_REQUESTED_WITH']) && strtolower($_SERVER['HTTP_X_REQUESTED_WITH']) == 'xmlhttprequest')) ? 'ajax' : 'get';
-        $protocol = (array_key_existS('HTTP_REQUESTED_METHOD',$_SERVER)) ? strtolower($_SERVER['HTTP_REQUESTED_METHOD']) : $protocol;
+        $protocol = (array_key_existS('HTTP_REQUESTED_METHOD', $_SERVER)) ? strtolower($_SERVER['HTTP_REQUESTED_METHOD']) : $protocol;
             
         return $protocol;
     }
@@ -42,12 +42,12 @@ 
         ];
     }
 
-    protected function ControllerForm($controller, string $method, array $values){
+    protected function ControllerForm($controller, string $method, array $values) {
 		$this->checkRole();
         $method = ($method !== 'method') ? $method : $this->getData()['POST']['role'];
-        $data = (array_key_exists('data',$values)) ? json_decode($values['data'], true) : null;
+        $data = (array_key_exists('data', $values)) ? json_decode($values['data'], true) : null;
 
-        call_user_func_array([$controller,$method],  $data);
+        call_user_func_array([$controller, $method], $data);
     }
 
     protected function Controller(string $controll): void
@@ -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->checkControllsettable($controll);
@@ -64,30 +64,30 @@ 
 
         $this->checkControllmethod($controll);
 
-        $controller = ucfirst(explode(':',$controll)[0]);
+        $controller = 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 {
-            $data = (array_key_exists('data',$data['POST'])) ? json_decode($data['POST']['data'], true) : $data['GET'];
-            call_user_func_array([$controller,$method],  $data);
+            $data = (array_key_exists('data', $data['POST'])) ? json_decode($data['POST']['data'], true) : $data['GET'];
+            call_user_func_array([$controller, $method], $data);
         }
        
     }    
 
-    protected function explodeRoutes(bool $bar, string $url ,bool $bar_, string $url_): array
+    protected function explodeRoutes(bool $bar, string $url, bool $bar_, string $url_): array
     {   
-        $url = $bar ? substr($url, 0, -1) : $url ;
-        $url = explode('/',$url);
+        $url = $bar ? substr($url, 0, -1) : $url;
+        $url = explode('/', $url);
 
-        $url_ = $bar_ ? substr($url_, 0, -1) : $url_ ;
-        $url_ = explode('/',$url_);
+        $url_ = $bar_ ? substr($url_, 0, -1) : $url_;
+        $url_ = explode('/', $url_);
 
-        foreach($url as $ur => $u){
-            if(substr($u,0,2) === '{?'){
-                if(!array_key_exists($ur,$url_)){
+        foreach ($url as $ur => $u) {
+            if (substr($u, 0, 2) === '{?') {
+                if (!array_key_exists($ur, $url_)) {
                     $url_[$ur] = '';
                 };
             }
@@ -98,28 +98,28 @@ 
 
     protected function toHiking(array $route)
     {
-        $this->callOnRoute($route,'beforeAll');
-        $this->callOnRoute($route,'before');
+        $this->callOnRoute($route, 'beforeAll');
+        $this->callOnRoute($route, 'before');
 
-        if(is_string($route['role'])){
+        if (is_string($route['role'])) {
             $this->Controller($route['role']);
-            $this->callOnRoute($route,'after');
-            $this->callOnRoute($route,'afterAll');
+            $this->callOnRoute($route, 'after');
+            $this->callOnRoute($route, 'afterAll');
             return true;
         }
 
-        call_user_func_array($route['role'],$this->getData()['GET']);
+        call_user_func_array($route['role'], $this->getData()['GET']);
 
-        $this->callOnRoute($route,'after');
-        $this->callOnRoute($route,'afterAll');
+        $this->callOnRoute($route, 'after');
+        $this->callOnRoute($route, 'afterAll');
     }
 
-    protected function callOnRoute(array $route,string $state)
+    protected function callOnRoute(array $route, string $state)
     {
-        if($route[$state] !== null){
-            if(is_string($route[$state])){
+        if ($route[$state] !== null) {
+            if (is_string($route[$state])) {
                 $this->Controller($route[$state]);
-            }else{
+            }else {
                 $route[$state]();
             }
         }
@@ -129,12 +129,12 @@ 
     {
         $currentProtocol = $this->getProtocol();
 
-        foreach(array_reverse($this->routers) as $r => $route){
+        foreach (array_reverse($this->routers) as $r => $route) {
 
             $this->currentRoute = $route;
             $this->currentRoute['name'] = $r;
 
-            if(!$this->checkProtocol($route['protocol'], $currentProtocol)){
+            if (!$this->checkProtocol($route['protocol'], $currentProtocol)) {
                 continue;
             }
 
@@ -144,11 +144,11 @@ 
 
 
             $routs = $this->explodeRoutes(
-                (substr($route['url'],strlen($route['url'])-1,1) === '/') , $route['url'],
-                (substr($_SERVER['REQUEST_URI'],strlen($_SERVER['REQUEST_URI'])-1,1) === '/') , $_SERVER['REQUEST_URI']
+                (substr($route['url'], strlen($route['url'])-1, 1) === '/'), $route['url'],
+                (substr($_SERVER['REQUEST_URI'], strlen($_SERVER['REQUEST_URI'])-1, 1) === '/'), $_SERVER['REQUEST_URI']
             );
 
-            if(!$this->checkToHiking($route, $routs['routeRequest'], $routs['routeLoop'])){
+            if (!$this->checkToHiking($route, $routs['routeRequest'], $routs['routeLoop'])) {
                 continue;
             }
 
@@ -157,7 +157,7 @@ 
         }
         
         $this->currentRoute = null;
-	    throw new Exception('Page not found.',404);
+	    throw new Exception('Page not found.', 404);
     }
 
     protected function loadByName(?string $routName = null): Router
@@ -166,8 +166,8 @@ 
         $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->currentRoute = $route;

src/Router.php

Indentation +8 added lines, -8 removed lines

@@ -43,15 +43,15 @@ 
     {
         $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 = [
-			'url' => $this->prefix.$url,
-			'role' => $walking,
-			'protocol' => $protocol,
+        $route = [
+            'url' => $this->prefix.$url,
+            'role' => $walking,
+            'protocol' => $protocol,
             'filters' => null,
             'where' => null,
             'before' => null,
@@ -59,9 +59,9 @@ 
             'after' => null,
             'afterAll' => $this->afterAll,
             'group' => self::getInstance()->group
-		];
+        ];
 
-		$this->routers[] = $route;		
+        $this->routers[] = $route;		
         
         return self::getInstance();
     }

Spacing +16 added lines, -16 removed lines

@@ -4,7 +4,7 @@ 
 
 use Exception;
 
-class Router{
+class Router {
     use Helper, CheckTrait, CheckWhere, DefinitionsTrait, ExtraJobsTrait;
 
     private static $instance = null;
@@ -26,7 +26,7 @@ 
 
     public static function create(): Router
     {
-        if(!self::getInstance()->instanced){
+        if (!self::getInstance()->instanced) {
             self::getInstance()->instanced = true;
         }
         
@@ -39,13 +39,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 = [
@@ -68,7 +68,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;
@@ -88,11 +88,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;
         }
 
@@ -112,7 +112,7 @@ 
     {
         $instance = self::create()->getInstance();
 
-        if(!$instance->loaded){
+        if (!$instance->loaded) {
             self::load($routeName);
         }
 
@@ -123,36 +123,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'];
         }
 

src/CheckWhere.php

Spacing +19 added lines, -19 removed lines

@@ -4,11 +4,11 @@ 
 
 use Exception;
 
-trait CheckWhere{
+trait CheckWhere {
         
     protected function checkWhereParam($data): parent
     {
-        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): parent
     {
-        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): parent
@@ -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/FilterTrait.php

Spacing +9 added lines, -9 removed lines

@@ -4,13 +4,13 @@ 
 
 use Exception;
 
-trait FilterTrait{
+trait FilterTrait {
     protected function checkFiltering(array $route): parent
     {
-        $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->checkFilter($filter);
@@ -21,20 +21,20 @@ 
 
     protected function checkFilter(string $filtername)
     {
-        if(count(explode(':',$filtername)) != 2){
+        if (count(explode(':', $filtername)) != 2) {
             throw new Exception("Wrongly configured filter: {$filtername}.");
         }
 
-        $filter = $this->checkFilClassExist(explode(':',$filtername)[0]);
+        $filter = $this->checkFilClassExist(explode(':', $filtername)[0]);
 
-        if(!$filter->check(explode(':',$filtername)[1])){
-            throw new Exception($filter->getMessage(explode(':',$filtername)[1]),403);
+        if (!$filter->check(explode(':', $filtername)[1])) {
+            throw new Exception($filter->getMessage(explode(':', $filtername)[1]), 403);
         }
     }
 
     protected function checkFilClassExist(string $class)
     {
-        if(class_exists($class)){
+        if (class_exists($class)) {
             return new $class();
         }
         throw new Exception("Filter {$class} not found.");

src/CheckTrait.php

Indentation +1 added lines, -1 removed lines

@@ -95,7 +95,7 @@
     protected function checkExistence(string $url, string $protocol): parent
     {
         foreach($this->routers as $key => $value){
-    		if( md5($this->prefix . $value['url'] . $value['protocol'] ) === md5( $url . $protocol ) ){
+            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.");
             }
         }

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): parent
     {
-        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): parent
     {
-        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(): parent
     {
-        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): parent
     {
-        $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): parent
     {
-        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): parent
     {
-        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(): parent
     {
-        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;