hnrazevedo / Router

src/Router.php

Braces +1 added lines, -1 removed lines

@@ -217,7 +217,7 @@
             foreach ($route['filters'] as $key => $value) {
                 $filters[] = $value;
             }
-        }else{
+        } else{
             $filters[] = $route['filters'];
         }
 

Spacing +32 added lines, -32 removed lines

@@ -4,7 +4,7 @@ 
 
 use Exception;
 
-class Router{
+class Router {
     use Helper, CheckTrait, CheckWhere, DefinitionsTrait;
 
     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;
@@ -36,14 +36,14 @@ 
         return self::$instance;
     }
 
-    public function set($url ,$walking , string $protocol): Router
+    public function set($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;
 
-    	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.");
             }
         }
@@ -66,9 +66,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;
@@ -79,7 +79,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.");
         }
 
@@ -90,14 +90,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.");
             }
         }
@@ -111,15 +111,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);
@@ -137,11 +137,11 @@ 
 
 		$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;
             }
 
@@ -151,11 +151,11 @@ 
 
 
             $routs = $instance->getInstance()->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(!$instance->getInstance()->checkToHiking($route, $routs['routeRequest'], $routs['routeLoop'])){
+            if (!$instance->getInstance()->checkToHiking($route, $routs['routeRequest'], $routs['routeLoop'])) {
                 continue;
             }
 
@@ -168,18 +168,18 @@ 
         
         $instance->getInstance()->currentRoute = null;
 
-	    throw new Exception('Page not found.',404);
+	    throw new Exception('Page not found.', 404);
     }
 
     public function filter($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){
-                    $currentRoute = $this->addFilter($this->routers[$key],$filters);
+                if ($value['group'] === $currentGroup) {
+                    $currentRoute = $this->addFilter($this->routers[$key], $filters);
                     $this->routers[$key] = $currentRoute;
                 }
 
@@ -188,28 +188,28 @@ 
             return $this;
         }
         
-        $this->routers[count($this->routers)-1] = $this->addFilter(end($this->routers),$filters);
+        $this->routers[count($this->routers)-1] = $this->addFilter(end($this->routers), $filters);
         return $this;
     }
  
     public function before($walking): Router
     {
-        return $this->setOnRoute($walking,'before');
+        return $this->setOnRoute($walking, 'before');
     }
 
     public function after($walking): Router
     {
-        return $this->setOnRoute($walking,'after');
+        return $this->setOnRoute($walking, 'after');
     }
 
     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;
                 }
 
@@ -226,18 +226,18 @@ 
 
     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'];
         }
 

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()}.");
 

Braces +1 added lines, -1 removed lines

@@ -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

examples/Routes/default.php

Spacing +6 added lines, -6 removed lines

@@ -3,21 +3,21 @@
 use HnrAzevedo\Router\Router;
 
 /* Returning parameters passed via URL in anonymous functions */
-Router::get('/{parameter}/{otherparameter}', function($parameter, $otherparameter){
+Router::get('/{parameter}/{otherparameter}', function($parameter, $otherparameter) {
     echo "Parameter 1:{$parameter}, Parameter 2:{$otherparameter}.";
 });
 
 /* Passing controller and/or method via parameter in URL */
-Router::get('/{controller}/{method}','{controller}:{method}');
-Router::get('/{controller}/{method}','{controller}:method');
+Router::get('/{controller}/{method}', '{controller}:{method}');
+Router::get('/{controller}/{method}', '{controller}:method');
 
 /* Passing value via parameter */
-Router::get('/my-account/{teste}','User:my_account');
+Router::get('/my-account/{teste}', 'User:my_account');
 
 /* Filter example */
-Router::get('/my-account','User:my_account')->filter('User:user_in');
+Router::get('/my-account', 'User:my_account')->filter('User:user_in');
 
 /* Accessed by all protocols */
-Router::any('/',function(){
+Router::any('/', function() {
     //
 });

src/ControllerTrait.php

Spacing +7 added lines, -7 removed lines

@@ -4,28 +4,28 @@
 
 use Exception;
 
-trait ControllerTrait{
+trait ControllerTrait {
 
     protected function checkControllsettable(string $controll)
     {
-        if(count(explode(':',$controll)) != 2){
+        if (count(explode(':', $controll)) != 2) {
             throw new Exception("Controller {$controll} badly set.");
         }
     }
 
     protected function checkControllexist(string $controll)
     {
-        $controllname = ROUTER_CONFIG['controller.namespace'].'\\'.ucfirst(explode(':',$controll)[0]);
-        if(!class_exists($controllname)){
+        $controllname = ROUTER_CONFIG['controller.namespace'].'\\'.ucfirst(explode(':', $controll)[0]);
+        if (!class_exists($controllname)) {
             throw new Exception("No controller {$controllname} found.");
         }
     }
 
     protected function checkControllmethod(string $controll)
     {
-        $controllname = ROUTER_CONFIG['controller.namespace'].'\\'.ucfirst(explode(':',$controll)[0]);
-        $method = explode(':',$controll)[1];
-        if(!method_exists($controllname, $method)){
+        $controllname = ROUTER_CONFIG['controller.namespace'].'\\'.ucfirst(explode(':', $controll)[0]);
+        $method = explode(':', $controll)[1];
+        if (!method_exists($controllname, $method)) {
             throw new Exception("No method {$method} found for {$controllname}.");
         }
     }

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(ROUTER_CONFIG['filter.namespace']."\\{$class}")){
+        if (class_exists(ROUTER_CONFIG['filter.namespace']."\\{$class}")) {
             $filter = ROUTER_CONFIG['filter.namespace']."\\{$class}";
             return new $filter();
         }

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;