hnrazevedo / Router

examples/Routes/default.php

Spacing +9 added lines, -9 removed lines

@@ -3,30 +3,30 @@ 
 use HnrAzevedo\Router\Router;
 
 /* Returning parameters passed via URL in anonymous functions */
-Router::match('GET|POST|AJAX','/{parameter}/{otherparameter}', function($parameter, $otherparameter){
+Router::match('GET|POST|AJAX', '/{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('/my-account','Controller\\User:my_account');
+Router::get('/my-account', 'Controller\\User:my_account');
 
 /* Passing value via parameter */
-Router::get('/my-account/teste/teste','Controller\\User:my_account')->where([
+Router::get('/my-account/teste/teste', 'Controller\\User:my_account')->where([
     'teste'=>'[a-zA-Z]{1,10}',
     'teste2' => '[0-9]{1}'
 ]);
 
-Router::get('/my-account/{:teste}/{teste2}','Controller\\User:my_account')->where([
+Router::get('/my-account/{:teste}/{teste2}', 'Controller\\User:my_account')->where([
     'teste'=>'[a-zA-Z]{1,10}',
     'teste2'=>'[a-zA-Z]{1,10}',
     //'teste2' => '[0-9]{1}'
 ]);
 
-Router::get('/my-account/{:teste}','Controller\\User:my_account')->where([
+Router::get('/my-account/{:teste}', 'Controller\\User:my_account')->where([
     'teste'=>'[a-zA-Z]{1,10}'
 ]);
 
@@ -35,11 +35,11 @@ 
 
 
 
-Router::get('/my-account1',function(){
+Router::get('/my-account1', function() {
     echo 'is Ok!';
-})->middleware(['\Example\Middleware\Auth::class','Lasted']);
+})->middleware(['\Example\Middleware\Auth::class', 'Lasted']);
 
 /* Accessed by all protocols */
-Router::any('/',function(){
+Router::any('/', function() {
     //
 })->name('index');

src/CheckTrait.php

Spacing +7 added lines, -7 removed lines

@@ -10,28 +10,28 @@ 
     
     protected function hasRouteName(string $name): void
     {
-        if(!isset($this->routesName[$name])){
+        if (!isset($this->routesName[$name])) {
             throw new \RuntimeException("There is no route named with {$name}");
         }
     }
 
     protected function isInNameGroup(): void
     {
-        if(!is_null($this->group)){
+        if (!is_null($this->group)) {
             throw new \RuntimeException("It is not allowed to assign names to groups");
         }
     }
 
     protected function isInPseudGroup(): void
     {
-        if(!is_null($this->group)){
+        if (!is_null($this->group)) {
             throw new \RuntimeException("To assign actions before or after the execution of the route, use beforeGroup or afterGroup");
         }
     }
 
     protected function existRouteName(string $name): void
     {
-        if(isset($this->routesName[$name])){
+        if (isset($this->routesName[$name])) {
             throw new \RuntimeException("There is already a route named with {$name}");
         }
     }
@@ -39,12 +39,12 @@ 
     protected function checkMethod(array $route, $method): void
     {
         $hasMethod = false;
-        foreach(explode('|',$route['method']) as $routeMethod){
-            if(@preg_match("/{$routeMethod}/",$method) !== 0 || $method === '*'){
+        foreach (explode('|', $route['method']) as $routeMethod) {
+            if (@preg_match("/{$routeMethod}/", $method) !== 0 || $method === '*') {
                 $hasMethod = true;
             }
         }
-        if(!$hasMethod){
+        if (!$hasMethod) {
             throw new \Exception('This route is not released for the accessed method');
         }
         

src/WhereTrait.php

Spacing +15 added lines, -15 removed lines

@@ -9,8 +9,8 @@ 
     public static function where(array $wheres): Router
     {
         $route = self::getInstance()->inSave();
-        $route['where'] = (is_array($route['where'])) ? array_merge($route['where'],$wheres) : $wheres;
-        self::getInstance()->updateRoute($route,array_key_last(self::getInstance()->routes));
+        $route['where'] = (is_array($route['where'])) ? array_merge($route['where'], $wheres) : $wheres;
+        self::getInstance()->updateRoute($route, array_key_last(self::getInstance()->routes));
         return self::getInstance();
     }
 
@@ -18,32 +18,32 @@ 
     {
         $this->checkCount($route['uri']->getPath(), $uriPath);
 
-        $uriPath .= (substr($uriPath,strlen($uriPath)-1) !== '/') ? '/' : '';
+        $uriPath .= (substr($uriPath, strlen($uriPath)-1) !== '/') ? '/' : '';
 
-        $routePath = explode('/',urldecode($route['uri']->getPath()));
+        $routePath = explode('/', urldecode($route['uri']->getPath()));
         unset($routePath[0]);
-        $uriPath = explode('/',urldecode($uriPath));
+        $uriPath = explode('/', urldecode($uriPath));
         unset($uriPath[0]);
 
         $corretRoute = true;
-        foreach($routePath as $r => $routeFrag){
+        foreach ($routePath as $r => $routeFrag) {
             $where = is_array($route['where']) ? $route['where'] : [];
             $routeFrag = $this->replaceParam($where, $routeFrag, $uriPath[$r]);
 
-            if($routeFrag !== $uriPath[$r]){
+            if ($routeFrag !== $uriPath[$r]) {
                 $corretRoute = false;
             }
         }
 
-        if(!$corretRoute){
+        if (!$corretRoute) {
             throw new \Exception('continue');
         }
     }
 
     private function replaceParam(array $where, string $ref, string $value): string
     {
-        if(((substr($ref,0,1) === '{') && (substr($ref,strlen($ref)-1) === '}'))) {
-            if(array_key_exists(str_replace(['{:','{','}'],'',$ref),$where)){
+        if (((substr($ref, 0, 1) === '{') && (substr($ref, strlen($ref)-1) === '}'))) {
+            if (array_key_exists(str_replace(['{:', '{', '}'], '', $ref), $where)) {
                 $this->matchParam($where, $ref, $value);
             }
             return $value;
@@ -53,18 +53,18 @@ 
 
     private function checkCount(string $routePath, string $uriPath): void
     {
-        $countRequest = substr_count($uriPath,'/') - substr_count($routePath,'{:');
-        $countRoute = substr_count($routePath,'/') - substr_count($routePath,'{:');
+        $countRequest = substr_count($uriPath, '/')-substr_count($routePath, '{:');
+        $countRoute = substr_count($routePath, '/')-substr_count($routePath, '{:');
 
-        if($countRequest !== $countRoute){
+        if ($countRequest !== $countRoute) {
             throw new \Exception('continue');
         }
     }
 
     private function matchParam(array $where, string $ref, string $value): void
     {
-        if(substr($ref,0,2) === '{:' || $value !== ''){
-            if(!preg_match("/^{$where[str_replace(['{:','{','}'],'',$ref)]}$/",$value)){
+        if (substr($ref, 0, 2) === '{:' || $value !== '') {
+            if (!preg_match("/^{$where[str_replace(['{:', '{', '}'], '', $ref)]}$/", $value)) {
                 throw new \Exception('continue');
             }
         }

src/Router.php

Spacing +5 added lines, -5 removed lines

@@ -33,7 +33,7 @@ 
         $route = self::getInstance()->inSave();
         $route['name'] = $name;
         self::getInstance()->routesName[$name] = $name;
-        self::getInstance()->unsetRoute(count(self::getInstance()->routes)-1)->updateRoute($route,$name);
+        self::getInstance()->unsetRoute(count(self::getInstance()->routes)-1)->updateRoute($route, $name);
         return self::getInstance();
     }
 
@@ -73,15 +73,15 @@ 
 
         self::getInstance()->sortRoutes();
 
-        foreach(self::getInstance()->routes as $r => $route){
+        foreach (self::getInstance()->routes as $r => $route) {
             self::getInstance()->currentRoute = $route;
             self::getInstance()->currentRoute['name'] = $r;
 
-            try{
+            try {
                 self::getInstance()->checkMethod($route, $_SERVER['REQUEST_METHOD']);
                 self::getInstance()->checkData($route, $_SERVER['REQUEST_URI']);
                 return self::getInstance();
-            }catch(\Exception $er){
+            }catch (\Exception $er) {
                 continue;
             }
         }
@@ -92,7 +92,7 @@ 
 
     public static function run(): RouterInterface
     {
-        if(!self::getInstance()->loaded){
+        if (!self::getInstance()->loaded) {
             self::getInstance()->load();
         }