hnrazevedo / Router

src/OwnerTrait.php

Spacing +2 added lines, -2 removed lines

@@ -16,7 +16,7 @@ 
     {
         $this->hasRouteName($name);
 
-        if(!$this->loaded){
+        if (!$this->loaded) {
             $this->loadIn($name);
         }
         
@@ -25,7 +25,7 @@ 
 
     public function hasCurrentRoute(): void
     {
-        if(!isset($this->currentRoute)){
+        if (!isset($this->currentRoute)) {
             throw new \RuntimeException('Route not yet loaded');
         }
     }

examples/index.php

Braces +1 added lines, -1 removed lines

@@ -26,7 +26,7 @@
     /* Return current action route */
     $action = Router::currentAction();
 
-}catch(Exception $er){
+} catch(Exception $er){
 
     die("Code Error: {$er->getCode()}, Line: {$er->getLine()}, File: {$er->getFile()}, Message: {$er->getMessage()}.");
 

Spacing +2 added lines, -2 removed lines

@@ -9,7 +9,7 @@ 
 
 /* NOTE: in case of error an exception is thrown */
 
-try{
+try {
 
     Router::globalMiddlewares([
         'Lasted'=> \HnrAzevedo\Router\Example\Middleware\Lasted::class
@@ -26,7 +26,7 @@ 
     /* Return current action route */
     $action = Router::currentAction();
 
-}catch(Exception $er){
+}catch (Exception $er) {
 
     die("Code Error: {$er->getCode()}, Line: {$er->getLine()}, File: {$er->getFile()}, Message: {$er->getMessage()}.");
 

examples/Middleware/Middleware.php

Spacing +4 added lines, -4 removed lines

@@ -8,23 +8,23 @@
 use Psr\Http\Server\MiddlewareInterface;
 use Psr\Http\Server\RequestHandlerInterface;
 
-class Middleware implements MiddlewareInterface{
+class Middleware implements MiddlewareInterface {
     protected static array $data = [];
     protected static Response $response;
 
     public function __get($key)
     {
-        return (array_key_exists($key,self::$data)) ? self::$data[$key] : null;
+        return (array_key_exists($key, self::$data)) ? self::$data[$key] : null;
     }
 
-    public function __set($key,$value)
+    public function __set($key, $value)
     {
         self::$data[$key] = $value;
     }
 
     public function process(ServerRequestInterface $request, RequestHandlerInterface $handler): ResponseInterface
     {
-        if(!isset(self::$response)){
+        if (!isset(self::$response)) {
             self::$response = new Response();
         }
         return self::$response;

src/Router.php

Braces +2 added lines, -2 removed lines

@@ -79,7 +79,7 @@ 
                 self::getInstance()->checkMethod($route, $_SERVER['REQUEST_METHOD']);
                 self::getInstance()->checkData($route, (new Uri($_SERVER['REQUEST_URI']))->getPath());
                 return self::getInstance();
-            }catch(\Exception $er){
+            } catch(\Exception $er){
                 continue;
             }
         }
@@ -98,7 +98,7 @@ 
         
         try{
             self::getInstance()->executeRouteAction();
-        }catch(\Exception $er){
+        } catch(\Exception $er){
             self::getInstance()->error = $er;
         }
         

Spacing +8 added lines, -8 removed lines

@@ -25,7 +25,7 @@ 
         $route = self::getInstance()->inSave();
         $route['name'] = $name;
         self::getInstance()->routesName[$name] = $name;
-        self::getInstance()->unsetRoute(array_key_last(self::getInstance()->getRoutes()))->updateRoute($route,$name);
+        self::getInstance()->unsetRoute(array_key_last(self::getInstance()->getRoutes()))->updateRoute($route, $name);
         return self::getInstance();
     }
 
@@ -64,15 +64,15 @@ 
         self::getInstance()->loaded = true;
         self::getInstance()->sortRoutes();
 
-        foreach(self::getInstance()->getRoutes() as $r => $route){
+        foreach (self::getInstance()->getRoutes() 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, (new Uri($_SERVER['REQUEST_URI']))->getPath());
                 return self::getInstance();
-            }catch(\Exception $er){
+            }catch (\Exception $er) {
                 continue;
             }
         }
@@ -83,15 +83,15 @@ 
 
     public static function run(): RouterInterface
     {
-        if(!self::getInstance()->loaded){
+        if (!self::getInstance()->loaded) {
             self::getInstance()->load();
         }
 
         self::getInstance()->executeBefore();
         
-        try{
+        try {
             self::getInstance()->executeRouteAction();
-        }catch(\Exception $er){
+        }catch (\Exception $er) {
             self::getInstance()->error = $er;
         }
         
@@ -104,7 +104,7 @@ 
 
     private function checkError(): void
     {
-        if(isset($this->error)){
+        if (isset($this->error)) {
             throw $this->error;
         }
     }

examples/Middleware/Lasted.php

Indentation +2 added lines, -2 removed lines

@@ -8,8 +8,8 @@
 use Psr\Http\Server\RequestHandlerInterface;
 
 /** 
-  * @property string $error
-  */ 
+ * @property string $error
+ */ 
 class Lasted extends Middleware{
 
     public function process(ServerRequestInterface $request, RequestHandlerInterface $handler): ResponseInterface

Spacing +2 added lines, -2 removed lines

@@ -10,12 +10,12 @@
 /** 
   * @property string $error
   */ 
-class Lasted extends Middleware{
+class Lasted extends Middleware {
 
     public function process(ServerRequestInterface $request, RequestHandlerInterface $handler): ResponseInterface
     {
         var_dump('Lasted');
-        if(!isset($this->error)){
+        if (!isset($this->error)) {
             throw new Exception("Access not belonged: {$this->error}");
         }
 

examples/Middleware/Auth.php

Indentation +2 added lines, -2 removed lines

@@ -7,8 +7,8 @@
 use Psr\Http\Server\RequestHandlerInterface;
 
 /** 
-  * @property string $error
-  */ 
+ * @property string $error
+ */ 
 class Auth extends Middleware{
 
     public function process(ServerRequestInterface $request, RequestHandlerInterface $handler): ResponseInterface

Spacing +2 added lines, -2 removed lines

@@ -9,12 +9,12 @@
 /** 
   * @property string $error
   */ 
-class Auth extends Middleware{
+class Auth extends Middleware {
 
     public function process(ServerRequestInterface $request, RequestHandlerInterface $handler): ResponseInterface
     {
         var_dump('Auth');
-        if(!array_key_exists('user',$_SESSION)){
+        if (!array_key_exists('user', $_SESSION)) {
             $this->error = 'The user must be logged in to the system';
         }
 

src/PrioritizeTrait.php

Spacing +8 added lines, -8 removed lines

@@ -11,27 +11,27 @@ 
         $staticRoutes = [];
         $paramRoutes = [];
 
-        foreach($this->getRoutes() as $r => $route){
+        foreach ($this->getRoutes() as $r => $route) {
 
             $path = urldecode($route['uri']->getPath());
 
-            if(strstr($path,'{')){
-                $paramRoutes[$this->getKeyArray(substr_count($path,'/') + substr_count($path,'{'),$paramRoutes)] = $route;
+            if (strstr($path, '{')) {
+                $paramRoutes[$this->getKeyArray(substr_count($path, '/')+substr_count($path, '{'), $paramRoutes)] = $route;
                 continue;    
             }
 
-            $staticRoutes[$this->getKeyArray(substr_count($path,'/'),$staticRoutes)] = $route;
+            $staticRoutes[$this->getKeyArray(substr_count($path, '/'), $staticRoutes)] = $route;
         }
 
         rsort($paramRoutes);
         rsort($staticRoutes);
 
-        $this->orderRoutes(array_merge($staticRoutes,$paramRoutes));
+        $this->orderRoutes(array_merge($staticRoutes, $paramRoutes));
     }
 
     private function getKeyArray(int $index, array $array): int
     {
-        while(array_key_exists($index,$array)){
+        while (array_key_exists($index, $array)) {
             $index++;
         }
         return $index;
@@ -40,8 +40,8 @@ 
     private function orderRoutes(array $routes):void
     {
         $kRoutes = $routes;
-        foreach($routes as $r => $route){
-            if(array_key_exists('name',$route)){
+        foreach ($routes as $r => $route) {
+            if (array_key_exists('name', $route)) {
                 unset($kRoutes[$r]);
                 $kRoutes["'{$route['name']}'"] = $route;
             }

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