hnrazevedo / Router

src/MiddlewareTrait.php

Spacing +6 added lines, -6 removed lines

@@ -19,8 +19,8 @@ 
 
     public static function globalMiddlewares(array $middlewares): RouterInterface
     {
-        foreach($middlewares as $middleware){
-            if(!class_exists($middleware)){
+        foreach ($middlewares as $middleware) {
+            if (!class_exists($middleware)) {
                 throw new \RuntimeException("Middleware class {$middleware} not exists");
             }
         }
@@ -30,16 +30,16 @@ 
 
     public static function middleware($middlewares): RouterInterface
     {
-        $middlewares = (is_array($middlewares)) ? $middlewares : [ $middlewares ];
+        $middlewares = (is_array($middlewares)) ? $middlewares : [$middlewares];
         $route = self::getInstance()->inSave();
-        $route['middlewares'] = (is_array($route['middlewares'])) ? array_merge($route['middlewares'],$middlewares) : $middlewares;
-        self::getInstance()->updateRoute($route,array_key_last(self::getInstance()->getRoutes()));
+        $route['middlewares'] = (is_array($route['middlewares'])) ? array_merge($route['middlewares'], $middlewares) : $middlewares;
+        self::getInstance()->updateRoute($route, array_key_last(self::getInstance()->getRoutes()));
         return self::getInstance();
     }
 
     private static function existMiddleware(string $name): void
     {
-        if(!class_exists($name) && !array_key_exists($name,self::$globalMiddlewares)){
+        if (!class_exists($name) && !array_key_exists($name, self::$globalMiddlewares)) {
             throw new \RuntimeException("Middleware {$name} does not exist");
         }
     }

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/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');
         }
         

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,25 +64,25 @@ 
 
     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');
         }
     }
 
     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)) {
                 echo 2;
                 throw new \Exception('continue');
             }

src/RunInTrait.php

Spacing +28 added lines, -28 removed lines

@@ -15,7 +15,7 @@ 
 
     protected function getState(string $state, bool $except = false)
     {
-        if($state === 'before'){
+        if ($state === 'before') {
             return ($except) ? $this->beforeExcepts : $this->beforeAll;
         }
 
@@ -24,8 +24,8 @@ 
 
     protected function setState(string $state, $settable, bool $except = false): bool
     {
-        if($state === 'before'){
-            if($except){
+        if ($state === 'before') {
+            if ($except) {
                 $this->beforeExcepts = $settable;
                 return true;
             }
@@ -34,7 +34,7 @@ 
             return true;
         }
 
-        if($except){
+        if ($except) {
             $this->afterExcepts = $settable;
             return true;
         }
@@ -45,24 +45,24 @@ 
 
     public static function before($closure): RouterInterface
     {
-        return self::addInRoute('before',$closure);
+        return self::addInRoute('before', $closure);
     }
 
     public static function after($closure): RouterInterface
     {
-        return self::addInRoute('after',$closure);
+        return self::addInRoute('after', $closure);
     }
 
     public static function beforeAll($closure, $excepts): RouterInterface
     {
-        self::getInstance()->setState('before', (is_array($excepts)) ? $excepts : [ $excepts ] ,true);
+        self::getInstance()->setState('before', (is_array($excepts)) ? $excepts : [$excepts], true);
         self::getInstance()->setState('before', $closure, false);
         return self::getInstance();
     }
 
     public static function afterAll($closure, $excepts): RouterInterface
     {
-        self::getInstance()->setState('after', (is_array($excepts)) ? $excepts : [ $excepts ] ,true);
+        self::getInstance()->setState('after', (is_array($excepts)) ? $excepts : [$excepts], true);
         self::getInstance()->setState('after', $closure, false);
         return self::getInstance();
     }
@@ -79,7 +79,7 @@ 
 
     protected function executeRouteAction(): bool
     {
-        if(is_callable($this->current()['action'])){        
+        if (is_callable($this->current()['action'])) {        
             call_user_func_array($this->current()['action'], $_REQUEST);
             return true;
         }
@@ -91,12 +91,12 @@ 
     private static function addInRoutes(string $state, $closure, $excepts): RouterInterface
     {
         self::getInstance()->isInPseudGroup();
-        $excepts = (is_array($excepts)) ? $excepts : [ $excepts ];
+        $excepts = (is_array($excepts)) ? $excepts : [$excepts];
         $group = self::getInstance()->inSave()['group'];
 
-        foreach(self::getInstance()->getRoutes() as $r => $route){
-            if($route['group'] === $group && !in_array($r,$excepts)){
-                self::getInstance()->getRoutes()[$r][$state] = (is_null($route[$state])) ? [ $closure ] : array_merge($route[$state], [ $closure ]); 
+        foreach (self::getInstance()->getRoutes() as $r => $route) {
+            if ($route['group'] === $group && !in_array($r, $excepts)) {
+                self::getInstance()->getRoutes()[$r][$state] = (is_null($route[$state])) ? [$closure] : array_merge($route[$state], [$closure]); 
             }
         }
 
@@ -106,14 +106,14 @@ 
     private static function addInRoute(string $state, $closure): RouterInterface
     {
         $route = self::getInstance()->inSave();
-        $route[$state] = (!is_null($route[$state])) ? [ $closure ] : array_merge($route[$state], [ $closure ]);
-        self::updateRoute($route,array_key_last(self::getInstance()->getRoutes()));
+        $route[$state] = (!is_null($route[$state])) ? [$closure] : array_merge($route[$state], [$closure]);
+        self::updateRoute($route, array_key_last(self::getInstance()->getRoutes()));
         return self::getInstance();
     }
 
     protected function executeBefore(): void
     {
-        if(!in_array($this->currentName(), (array) $this->getState('before', true))){
+        if (!in_array($this->currentName(), (array) $this->getState('before', true))) {
             ($this->getState('before', false))();
         }
 
@@ -122,7 +122,7 @@ 
 
     protected function executeAfter(): void
     {
-        if(!in_array($this->currentName(), (array) $this->getState('after', true))){
+        if (!in_array($this->currentName(), (array) $this->getState('after', true))) {
             ($this->getState('after', false))();
         }
 
@@ -131,8 +131,8 @@ 
 
     private function executeState(string $stage): void
     {
-        foreach($this->current()[$stage] as $state){
-            if(is_callable($state)){
+        foreach ($this->current()[$stage] as $state) {
+            if (is_callable($state)) {
                 $state();
                 continue;
             }
@@ -143,31 +143,31 @@ 
 
     private function executeController(string $controllerMeth): void
     {
-        if(count(explode('@',$controllerMeth)) !== 2){
+        if (count(explode('@', $controllerMeth)) !== 2) {
             $path = urldecode($this->current()['uri']->getPath());
             throw new \RuntimeException("Misconfigured route action ({$path})");
         }
 
-        $controller = (string) explode('@',$controllerMeth)[0];
-        $method = (string) explode('@',$controllerMeth)[1];
+        $controller = (string) explode('@', $controllerMeth)[0];
+        $method = (string) explode('@', $controllerMeth)[1];
 
         $this->checkControllerMeth($controllerMeth);
 
-        call_user_func_array([(new $controller()),$method], $_REQUEST);
+        call_user_func_array([(new $controller()), $method], $_REQUEST);
     }
 
     private function checkControllerMeth(string $controllerMeth): void
     {
-        $routeURI = str_replace(['{:','{','}'],'',urldecode($this->current()['uri']->getPath()));
+        $routeURI = str_replace(['{:', '{', '}'], '', urldecode($this->current()['uri']->getPath()));
 
-        $controller = (string) explode('@',$controllerMeth)[0];
-        $method = (string) explode('@',$controllerMeth)[1];
+        $controller = (string) explode('@', $controllerMeth)[0];
+        $method = (string) explode('@', $controllerMeth)[1];
 
-        if(!class_exists($controller)){
+        if (!class_exists($controller)) {
             throw new \RuntimeException("Controller not found in route URI {$routeURI}");
         }
 
-        if(!method_exists($controller, $method)){
+        if (!method_exists($controller, $method)) {
             throw new \RuntimeException("Method {$method} not found in controller {$controller} in route URI {$routeURI}");
         }
         

src/CurrentTrait.php

Spacing +1 added lines, -1 removed lines

@@ -2,7 +2,7 @@
 
 namespace HnrAzevedo\Router;
 
-trait CurrentTrait{
+trait CurrentTrait {
     use Helper;
 
     protected array $currentRoute = [];