hnrazevedo / Router

src/Helper.php

Spacing +1 added lines, -1 removed lines

@@ -45,7 +45,7 @@
 
     protected function setRoutes(array $routes): void
     {
-        $this->routes =  $routes;
+        $this->routes = $routes;
     }
 
     protected function getGroup(): ?string

src/WhereTrait.php

Spacing +19 added lines, -19 removed lines

@@ -11,8 +11,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()->getRoutes()));
+        $route['where'] = (is_array($route['where'])) ? array_merge($route['where'], $wheres) : $wheres;
+        self::getInstance()->updateRoute($route, array_key_last(self::getInstance()->getRoutes()));
         return self::getInstance();
     }
 
@@ -22,38 +22,38 @@ 
     
         $this->parameters = [];
 
-        $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');
         }
 
-        $_REQUEST = array_merge($_REQUEST,$this->parameters);
+        $_REQUEST = array_merge($_REQUEST, $this->parameters);
     }
 
     private function replaceParam(array $where, string $ref, string $value): string
     {
-        if(((substr($ref,0,1) === '{') && (substr($ref,strlen($ref)-1) === '}'))) {
-            $this->parameters[str_replace(['{:','{','}'],'',$ref)] = $value;
+        if (((substr($ref, 0, 1) === '{') && (substr($ref, strlen($ref)-1) === '}'))) {
+            $this->parameters[str_replace(['{:', '{', '}'], '', $ref)] = $value;
 
-            $this->checkValueRequire($ref,$value);
+            $this->checkValueRequire($ref, $value);
 
-            if(array_key_exists(str_replace(['{:','{','}'],'',$ref),$where)){
+            if (array_key_exists(str_replace(['{:', '{', '}'], '', $ref), $where)) {
                 $this->matchParam($where, $ref, $value);
             }
 
@@ -64,17 +64,17 @@ 
 
     private function checkValueRequire(string $ref, string $value): void
     {
-        if(substr($ref,0,2) !== '{:' && strlen($value) === 0){
+        if (substr($ref, 0, 2) !== '{:' && strlen($value) === 0) {
             throw new \Exception('continue');
         }
     }
 
     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');
         }
     }
@@ -82,9 +82,9 @@ 
     private function matchParam(array $where, string $ref, string $value): void
     {
         echo 3;
-        if(substr($ref,0,2) === '{' || $value !== ''){
+        if (substr($ref, 0, 2) === '{' || $value !== '') {
             echo 1;
-            if(!preg_match("/^{$where[str_replace(['{:','{','}'],'',$ref)]}$/",$value)){
+            if (!preg_match("/^{$where[str_replace(['{:', '{', '}'], '', $ref)]}$/", $value)) {
                 echo 2;
                 throw new \Exception('continue');
             }

src/DefinitionsTrait.php

Indentation +4 added lines, -4 removed lines

@@ -57,9 +57,9 @@ 
         
         $routes = self::getInstance()->getRoutes();
         $routes[] = [
-			'uri' => new Uri(self::getInstance()->getHost().self::getInstance()->getPrefix().$uri),
-			'action' => $closure,
-			'method' => strtoupper($method),
+            'uri' => new Uri(self::getInstance()->getHost().self::getInstance()->getPrefix().$uri),
+            'action' => $closure,
+            'method' => strtoupper($method),
             'middlewares' => null,
             'where' => null,
             'before' => [],
@@ -76,7 +76,7 @@ 
     private static function checkDuplicity(string $uri, string $method): void
     {
         foreach(self::getInstance()->getRoutes() as $route){
-    		if( md5($route['uri'].$route['method']) === md5($uri.$method) ){
+            if( md5($route['uri'].$route['method']) === md5($uri.$method) ){
                 throw new \RuntimeException("There is already a route with the URI {$uri} and with the {$method} METHOD configured.");
             }
         }

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->getGroup())){
+        if (!is_null($this->getGroup())) {
             throw new \RuntimeException("It is not allowed to assign names to groups");
         }
     }
 
     protected function isInPseudGroup(): void
     {
-        if(!is_null($this->getGroup())){
+        if (!is_null($this->getGroup())) {
             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');
         }