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

Indentation +11 added lines, -11 removed lines

@@ -44,20 +44,20 @@ 
     {
         $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.");
             }
         }
         
         $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,
@@ -65,9 +65,9 @@ 
             'after' => null,
             'afterAll' => $this->afterAll,
             'group' => self::getInstance()->group
-		];
+        ];
 
-		$this->routers[] = $route;		
+        $this->routers[] = $route;		
         
         return self::getInstance();
     }
@@ -145,7 +145,7 @@ 
 
         $instance->getInstance()->byName($routeName);
 
-		$currentProtocol = $instance->getInstance()->getProtocol();
+        $currentProtocol = $instance->getInstance()->getProtocol();
 
         foreach(array_reverse($instance->getInstance()->routers) as $r => $route){
 
@@ -178,7 +178,7 @@ 
         
         $instance->getInstance()->currentRoute = null;
 
-	    throw new Exception('Page not found.',404);
+        throw new Exception('Page not found.',404);
     }
 
     public function filter($filters): Router

Spacing +28 added lines, -28 removed lines

@@ -4,7 +4,7 @@ 
 
 use Exception;
 
-class Router{
+class Router {
     use Helper, CheckTrait, CheckWhere, DefinitionsTrait, ExtraJobsTrait;
 
     private static $instance = null;
@@ -25,7 +25,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;
@@ -40,14 +40,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.");
             }
         }
@@ -72,9 +72,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;
@@ -85,7 +85,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.");
         }
 
@@ -96,7 +96,7 @@ 
 
     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.");
         }
 
@@ -104,11 +104,11 @@ 
 
         self::getInstance()->hasRouteName($name);
 
-        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;
         }
 
@@ -121,15 +121,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);
@@ -147,11 +147,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;
             }
 
@@ -161,11 +161,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;
             }
 
@@ -178,18 +178,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;
                 }
 
@@ -198,24 +198,24 @@ 
             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 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/Helper.php

Indentation +1 added lines, -1 removed lines

@@ -50,7 +50,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;
 

Braces +2 added lines, -2 removed lines

@@ -77,7 +77,7 @@ 
 
         if( ($this->getProtocol() == 'form') ){
             $this->ControllerForm($controller, $method, $data['POST']);
-        }else {
+        } else {
             $data = (array_key_exists('data',$data['POST'])) ? json_decode($data['POST']['data'], true) : $data['GET'];
             call_user_func_array([$controller,$method],  $data);
         }
@@ -123,7 +123,7 @@ 
         if($route[$state] !== null){
             if(is_string($route[$state])){
                 $this->Controller($route[$state]);
-            }else{
+            } else{
                 $route[$state]();
             }
         }

Spacing +33 added lines, -33 removed lines

@@ -2,7 +2,7 @@ 
 
 namespace HnrAzevedo\Router;
 
-trait Helper{
+trait Helper {
     use CheckTrait, ControllerTrait;
     
     private $currentRoute = null;
@@ -25,7 +25,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;
     }
@@ -43,18 +43,18 @@ 
     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->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
@@ -62,7 +62,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);
@@ -71,30 +71,30 @@ 
 
         $this->checkControllmethod($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 {
-            $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] = '';
                 };
             }
@@ -105,28 +105,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]();
             }
         }