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/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 = ucfirst(explode(':',$controll)[0]);
-        if(!class_exists($controllname)){
+        $controllname = ucfirst(explode(':', $controll)[0]);
+        if (!class_exists($controllname)) {
             throw new Exception("No controller {$controllname} found.");
         }
     }
 
     protected function checkControllmethod(string $controll)
     {
-        $controllname = ucfirst(explode(':',$controll)[0]);
-        $method = explode(':',$controll)[1];
-        if(!method_exists($controllname, $method)){
+        $controllname = 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 +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}','Controller\\User:my_account');
+Router::get('/my-account/{teste}', 'Controller\\User:my_account');
 
 /* Filter example */
-Router::get('/my-account','Controller\\User:my_account')->filter('Filter\\User:user_in');
+Router::get('/my-account', 'Controller\\User:my_account')->filter('Filter\\User:user_in');
 
 /* Accessed by all protocols */
-Router::any('/',function(){
+Router::any('/', function() {
     //
 });

src/Helper.php

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;