hnrazevedo / Router

examples/index.php

Spacing +2 added lines, -2 removed lines

@@ -7,11 +7,11 @@
 
 /* NOTE: in case of error an exception is thrown */
 
-try{
+try {
     
     Router::create()->dispatch();
 
-}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

@@ -11,7 +11,7 @@
     
     Router::create()->dispatch();
 
-}catch(Exception $er){
+} catch(Exception $er){
 
     die("Code Error: {$er->getCode()}, Line: {$er->getLine()}, File: {$er->getFile()}, Message: {$er->getMessage()}.");
 

src/Helper.php

Braces +1 added lines, -1 removed lines

@@ -70,7 +70,7 @@
 
         if( ( $this->getProtocol() == 'form') ){
             $this->ControllerForm($controller, $method, $data['POST']);
-        }else {
+        } else {
             $controller->$method($data);
         }
     }    

Indentation +1 added lines, -1 removed lines

@@ -33,7 +33,7 @@
     }
 
     protected function ControllerForm($controller, string $method, array $values){
-		$this->check_role();
+        $this->check_role();
         $role = ($method !== 'method') ? $method : $this->getData()['POST']['role'];
         $data = (!is_null($values)) ? json_decode($values['data']) : null;
         $controller->$role($data);

Spacing +11 added lines, -11 removed lines

@@ -2,13 +2,13 @@ 
 
 namespace HnrAzevedo\Router;
 
-trait Helper{
+trait Helper {
     use CheckTrait, ControllerTrait;
     
     protected function getProtocol(): string
     {
         $protocol = ((isset($_SERVER['HTTP_X_REQUESTED_WITH']) && strtolower($_SERVER['HTTP_X_REQUESTED_WITH']) == 'xmlhttprequest')) ? 'ajax' : 'get';
-        $protocol = (array_key_existS('REQUEST_METHOD',$_SESSION)) ? strtolower($_SERVER['REQUEST_METHOD']) : $protocol;
+        $protocol = (array_key_existS('REQUEST_METHOD', $_SESSION)) ? strtolower($_SERVER['REQUEST_METHOD']) : $protocol;
             
         return $protocol;
     }
@@ -26,13 +26,13 @@ 
     protected function import(string $path)
     {
         foreach (scandir($path) as $routeFile) {
-            if(pathinfo($path.DIRECTORY_SEPARATOR.$routeFile, PATHINFO_EXTENSION) === 'php'){
-                require_once($path. DIRECTORY_SEPARATOR .$routeFile);
+            if (pathinfo($path.DIRECTORY_SEPARATOR.$routeFile, PATHINFO_EXTENSION) === 'php') {
+                require_once($path.DIRECTORY_SEPARATOR.$routeFile);
             }
         }
     }
 
-    protected function ControllerForm($controller, string $method, array $values){
+    protected function ControllerForm($controller, string $method, array $values) {
 		$this->check_role();
         $role = ($method !== 'method') ? $method : $this->getData()['POST']['role'];
         $data = (!is_null($values)) ? json_decode($values['data']) : null;
@@ -44,7 +44,7 @@ 
         $data = $this->getData();
 
         foreach ($data['GET'] as $name => $value) {
-            $controll = str_replace('{'.$name.'}',$value,$controll);
+            $controll = str_replace('{'.$name.'}', $value, $controll);
         }
 
         $this->check_controllsettable($controll);
@@ -53,11 +53,11 @@ 
 
         $this->check_controllmethod($controll);
 
-        $controller = ROUTER_CONFIG['controller.namespace'].'\\'. ucfirst(explode(':',$controll)[0]);
+        $controller = ROUTER_CONFIG['controller.namespace'].'\\'.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 {
             $controller->$method($data);
@@ -66,12 +66,12 @@ 
 
     protected function explodeRoute(bool $bar, string $url): array
     {   
-        return explode( '/', $bar ? substr($url, 0, -1) : $url );
+        return explode('/', $bar ? substr($url, 0, -1) : $url);
     }
 
     protected function toHiking($walking)
     {
-        if(is_string($walking)){
+        if (is_string($walking)) {
             $this->Controller($walking);
             return true;
         }

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'];
         }
 

Indentation +14 added lines, -14 removed lines

@@ -61,25 +61,25 @@ 
 
     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->check_typeRole($walking);
 
-		$route = [
-			'url' => $this->prefix.$url,
-			'role' => $walking,
-			'protocol' => $protocol,
-			'filters' => null,
+        $route = [
+            'url' => $this->prefix.$url,
+            'role' => $walking,
+            'protocol' => $protocol,
+            'filters' => null,
             'group' => self::getInstance()->group
-		];
+        ];
 
-		$this->routers[] = $route;		
+        $this->routers[] = $route;		
         
         return self::getInstance();
     }
@@ -140,7 +140,7 @@ 
     {
         $this->byName($route_name);
 
-		$currentProtocol = $this->getProtocol();
+        $currentProtocol = $this->getProtocol();
 
         foreach(array_reverse($this->routers) as $r => $route){
 
@@ -156,19 +156,19 @@ 
 
             $route_request = $this->explodeRoute((substr($_SERVER['REQUEST_URI'],strlen($_SERVER['REQUEST_URI'])-1,1) === '/') , $_SERVER['REQUEST_URI']);
 
-	        if($this->check_numparams($route_loop, $route_request) || !$this->check_parameters($route_loop, $route_request)){
+            if($this->check_numparams($route_loop, $route_request) || !$this->check_parameters($route_loop, $route_request)){
                 continue;
             }
             
             $this->check_filtering($route);
 
             $this->toHiking($route['role']);
-	        return true;
+            return true;
         }
         
         unset($_SESSION['route']);
 
-	    throw new Exception('Page not found.',404);
+        throw new Exception('Page not found.',404);
     }
 
     public static function filter($filters): Router

Spacing +26 added lines, -26 removed lines

@@ -4,7 +4,7 @@ 
 
 use Exception;
 
-class Router{
+class Router {
     use Helper, CheckTrait;
 
     private static $instance = null;
@@ -59,12 +59,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.");
             }
         }
@@ -84,9 +84,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;
@@ -97,14 +97,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.");
             }
         }
@@ -120,15 +120,15 @@ 
 
     private function byName(?string $route_name)
     {
-        if(!is_null($route_name)){
+        if (!is_null($route_name)) {
             $currentProtocol = $this->getProtocol();
 
             $this->check_name($route_name);
     
             $route = $this->routers[$route_name];
     
-            if(!$this->check_protocol($route['protocol'], $currentProtocol)){
-                throw new Exception('Page not found.',404);
+            if (!$this->check_protocol($route['protocol'], $currentProtocol)) {
+                throw new Exception('Page not found.', 404);
             }
     
             $this->check_filtering($route);
@@ -144,23 +144,23 @@ 
 
 		$currentProtocol = $this->getProtocol();
 
-        foreach(array_reverse($this->routers) as $r => $route){
+        foreach (array_reverse($this->routers) as $r => $route) {
 
             $_SESSION['route'] = serialize($route);
 
-            if(!$this->check_protocol($route['protocol'], $currentProtocol)){
+            if (!$this->check_protocol($route['protocol'], $currentProtocol)) {
                 continue;
             }
 
             $this->hasProtocol($route, $currentProtocol);
 
-            $route_loop = $this->explodeRoute( (substr($route['url'],strlen($route['url'])-1,1) === '/') , $route['url']);
+            $route_loop = $this->explodeRoute((substr($route['url'], strlen($route['url'])-1, 1) === '/'), $route['url']);
             
             $_SERVER['REQUEST_URI'] = (array_key_exists('REQUEST_URI', $_SERVER)) ? $_SERVER['REQUEST_URI'] : '';
 
-            $route_request = $this->explodeRoute((substr($_SERVER['REQUEST_URI'],strlen($_SERVER['REQUEST_URI'])-1,1) === '/') , $_SERVER['REQUEST_URI']);
+            $route_request = $this->explodeRoute((substr($_SERVER['REQUEST_URI'], strlen($_SERVER['REQUEST_URI'])-1, 1) === '/'), $_SERVER['REQUEST_URI']);
 
-	        if($this->check_numparams($route_loop, $route_request) || !$this->check_parameters($route_loop, $route_request)){
+	        if ($this->check_numparams($route_loop, $route_request) || !$this->check_parameters($route_loop, $route_request)) {
                 continue;
             }
             
@@ -172,18 +172,18 @@ 
         
         unset($_SESSION['route']);
 
-	    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;
                 }
 
@@ -194,24 +194,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'];
         }
 

examples/Filters/User.php

Spacing +4 added lines, -4 removed lines

@@ -2,15 +2,15 @@
 
 namespace HnrAzevedo\Filter;
 
-class User extends Filter{
+class User extends Filter {
 
     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/ControllerTrait.php

Spacing +7 added lines, -7 removed lines

@@ -4,28 +4,28 @@
 
 use Exception;
 
-trait ControllerTrait{
+trait ControllerTrait {
 
     protected function check_controllsettable(string $controll)
     {
-        if(count(explode(':',$controll)) != 2){
+        if (count(explode(':', $controll)) != 2) {
             throw new Exception("Controller {$controll} badly set.");
         }
     }
 
     protected function check_controllexist(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 check_controllmethod(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}.");
         }
     }

examples/Routes/default.php

Spacing +7 added lines, -7 removed lines

@@ -3,30 +3,30 @@
 use HnrAzevedo\Router\Router;
 
 
-Router::get('/{teste}',function(){
+Router::get('/{teste}', function() {
     echo 'teste';
 });
 
-Router::get('/1',function(){
+Router::get('/1', function() {
     echo 1;
 });
 
-Router::get('/3',function(){
+Router::get('/3', function() {
     echo 3;
 });
 
 /* Returning parameters passed via URL in anonymous functions */
-Router::get('/{parameter}/{otherparameter}', function($data){
+Router::get('/{parameter}/{otherparameter}', function($data) {
     echo "Parameter 1:{$data['parameter']}, Parameter 2:{$data['otherparameter']}.";
 });
 
 /* Passing controller and/or method via parameter in URL */
-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');
 
 

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 my_account(array $data): void
     {

src/FilterTrait.php

Spacing +10 added lines, -10 removed lines

@@ -4,13 +4,13 @@ 
 
 use Exception;
 
-trait FilterTrait{
+trait FilterTrait {
     protected function check_filtering(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->check_filter($filter);
@@ -19,24 +19,24 @@ 
 
     protected function check_filter(string $filtername)
     {
-        if(count(explode(':',$filtername)) != 2){
+        if (count(explode(':', $filtername)) != 2) {
             throw new Exception("Wrongly configured filter: {$filtername}.");
         }
 
-        $filter = $this->check_filClassExist(explode(':',$filtername)[0]);
+        $filter = $this->check_filClassExist(explode(':', $filtername)[0]);
 
-        if(!$filter->check(explode(':',$filtername)[1])){
-            throw new Exception($filter->getMessage(explode(':',$filtername)[1]));
+        if (!$filter->check(explode(':', $filtername)[1])) {
+            throw new Exception($filter->getMessage(explode(':', $filtername)[1]));
         }
     }
 
     protected function check_filClassExist(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();
         }
-        if(file_exists(ROUTER_CONFIG['path.filters'].$class.'.php')){
+        if (file_exists(ROUTER_CONFIG['path.filters'].$class.'.php')) {
             require_once(ROUTER_CONFIG['path.filters'].$class.'.php');
             $filter = ROUTER_CONFIG['filter.namespace']."\\{$class}";
             return new $filter();

src/Controller.php

Spacing +7 added lines, -7 removed lines

@@ -5,14 +5,14 @@ 
 use HnrAzevedo\Validator\Validator;
 use Exception;
 
-class Controller{
+class Controller {
     use Helper;
 
     protected array $fail = [];
 
     private function check_method(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->check_failData()){
+        if ($this->check_failData()) {
             return false;
         }
 
@@ -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 check_failData(): 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