hnrazevedo / Router

examples/index.php

Spacing +2 added lines, -2 removed lines

@@ -9,7 +9,7 @@ 
 
 /* NOTE: in case of error an exception is thrown */
 
-try{
+try {
     
     Router::dispatch();
 
@@ -20,7 +20,7 @@ 
     /* Return current action route */
     $action = Router::currentRouteAction();
 
-}catch(Exception $er){
+}catch (Exception $er) {
 
     die("Code Error: {$er->getCode()}, Line: {$er->getLine()}, File: {$er->getFile()}, Message: {$er->getMessage()}.");
 

examples/Controllers/User.php

Spacing +1 added lines, -1 removed lines

@@ -4,7 +4,7 @@
 
 use HnrAzevedo\Router\Controller;
 
-class User extends Controller{
+class User extends Controller {
 
     public function requereLogin($username, $password): void
     {

examples/Filters/User.php

Spacing +4 added lines, -4 removed lines

@@ -4,15 +4,15 @@
 
 use HnrAzevedo\Filter\Filter as HnrFilter;
 
-class User extends HnrFilter{
+class User extends HnrFilter {
 
     public function user_in(): bool
     {
-        $this->addMessage('user_in','User required to be logged in.');
+        $this->addMessage('user_in', 'User required to be logged in.');
 
-        $this->addTreat('user_in','report_notLogged');
+        $this->addTreat('user_in', 'report_notLogged');
 
-        return (array_key_exists('user',$_SESSION));
+        return (array_key_exists('user', $_SESSION));
     }
 
     public function report_notLogged(): void

src/Controller.php

Spacing +8 added lines, -8 removed lines

@@ -5,14 +5,14 @@ 
 use HnrAzevedo\Validator\Validator;
 use Exception;
 
-class Controller{
+class Controller {
     use Helper;
 
     protected array $fail = [];
 
     private function checkMethod(string $method): void
     {
-        if(!method_exists($this,$method)){
+        if (!method_exists($this, $method)) {
             throw new Exception("{$method} not found in ".get_class($this).".");
         }
     }
@@ -21,7 +21,7 @@ 
     {        
         $this->ValidateData();
 
-        if($this->checkFailData()){
+        if ($this->checkFailData()) {
             return false;
         }
 
@@ -29,7 +29,7 @@ 
 
         $this->checkMethod($method);
 
-        call_user_func_array([$this,$method],  func_get_args());
+        call_user_func_array([$this, $method], func_get_args());
 
         return true;
     }
@@ -38,8 +38,8 @@ 
     {
         $valid = Validator::execute($this->getData()['POST']);
 
-        if(!$valid){
-            foreach(Validator::getErrors() as $err => $message){
+        if (!$valid) {
+            foreach (Validator::getErrors() as $err => $message) {
                 $this->fail[] = [
                     'input' => array_keys($message)[0],
                     'message' => $message[array_keys($message)[0]]
@@ -50,12 +50,12 @@ 
 
     private function checkFailData(): bool
     {
-        if(count($this->fail) > 0 ){
+        if (count($this->fail) > 0) {
             echo json_encode([
                 'error'=> $this->fail
             ]);
         }
-        return (count($this->fail) > 0 );
+        return (count($this->fail) > 0);
     }
 
 }
\ No newline at end of file

src/DefinitionsTrait.php

Spacing +2 added lines, -2 removed lines

@@ -2,12 +2,12 @@
 
 namespace HnrAzevedo\Router;
 
-trait DefinitionsTrait{
+trait DefinitionsTrait {
     private static $instance = null;
 
     public static function match(string $protocols, string $uri, $walking): Router
     {
-        foreach(explode('|',$protocols) as $protocol){
+        foreach (explode('|', $protocols) as $protocol) {
             self::getInstance()->add($uri, $walking, $protocol);
         }
         return self::$instance;

src/ExtraJobsTrait.php

Spacing +9 added lines, -9 removed lines

@@ -2,11 +2,11 @@ 
 
 namespace HnrAzevedo\Router;
 
-trait ExtraJobsTrait{
+trait ExtraJobsTrait {
 
     public function before($walking): Router
     {
-        return $this->setOnRoute($walking,'before');
+        return $this->setOnRoute($walking, 'before');
     }
 
     public static function beforeAll($walking, $except = null): Router
@@ -14,12 +14,12 @@ 
         $excepts = is_array($except) ? $except : [$except];
         self::getInstance()->beforeExcepts = $excepts;
         self::getInstance()->beforeAll = $walking;
-        return self::getInstance()->setOnRoutes($walking,'beforeAll',$excepts);
+        return self::getInstance()->setOnRoutes($walking, 'beforeAll', $excepts);
     }
 
     public function after($walking): Router
     {
-        return $this->setOnRoute($walking,'after');
+        return $this->setOnRoute($walking, 'after');
     }
 
     public static function afterAll($walking, $except = null): Router
@@ -27,17 +27,17 @@ 
         $excepts = is_array($except) ? $except : [$except];
         self::getInstance()->afterExcepts = $excepts;
         self::getInstance()->afterAll = $walking;
-        return self::getInstance()->setOnRoutes($walking,'afterAll',$excepts);
+        return self::getInstance()->setOnRoutes($walking, 'afterAll', $excepts);
     }
 
     private function setOnRoute($walking, string $state): Router
     {
-        if($this->lastReturn !== null){
+        if ($this->lastReturn !== null) {
             $currentGroup = end($this->routers)['group'];
 
             foreach ($this->routers as $key => $value) {
 
-                if($value['group'] === $currentGroup){
+                if ($value['group'] === $currentGroup) {
                     $this->routers[$key][$state] = $walking;
                 }
 
@@ -51,8 +51,8 @@ 
 
     private function setOnRoutes($walking, string $state, array $excepts): Router
     {
-        foreach($this->routers as $r => $route){
-            if(!in_array($this->routers,$excepts)){
+        foreach ($this->routers as $r => $route) {
+            if (!in_array($this->routers, $excepts)) {
                 $this->routers[$r][$state] = $walking;
             }
         }

src/CheckWhere.php

Spacing +19 added lines, -19 removed lines

@@ -4,18 +4,18 @@ 
 
 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 checkWhereParams($params)
     {
-        if(count($params) === 0){
+        if (count($params) === 0) {
             throw new Exception('The route in question has no parameters to be tested.');
         }
     }
@@ -24,24 +24,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;
                 }
             }
@@ -52,17 +52,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)
@@ -72,16 +72,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];
             }
                 
@@ -89,7 +89,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)
     {
-        $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);
@@ -19,20 +19,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

Spacing +17 added lines, -17 removed lines

@@ -4,7 +4,7 @@ 
 
 use Exception;
 
-trait CheckTrait{
+trait CheckTrait {
     use FilterTrait, CheckWhere;
 
     protected function checkProtocol(string $expected, string $current): bool
@@ -12,14 +12,14 @@ 
         return (strtoupper($expected) === strtoupper($current));
     }
 
-    protected function checkName(string $routeName){
-        if(!array_key_exists($routeName,$this->routers)){
+    protected function checkName(string $routeName) {
+        if (!array_key_exists($routeName, $this->routers)) {
             throw new Exception('Page not found.', 404);
         }
     }
 
-    protected function checkTypeRole($role){
-        if(!is_string($role) && @get_class($role) !== 'Closure' ){
+    protected function checkTypeRole($role) {
+        if (!is_string($role) && @get_class($role) !== 'Closure') {
             throw new Exception("Improperly defined route track.");
         }
     }
@@ -31,12 +31,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;
             }
         }
@@ -45,22 +45,22 @@ 
 
     protected function checkParameter(string $routeLoop, string $routeRequest)
     {
-        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.');
         }
     }
 
     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;
             }
         }
@@ -68,9 +68,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;
@@ -78,7 +78,7 @@ 
 
     protected function hasRouteName(string $name): void
     {
-        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.");
         }
     }