hnrazevedo / Router

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 = [];