hnrazevedo / Router

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;

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

examples/MiddlewareExample.php

Braces +1 added lines, -1 removed lines

@@ -77,7 +77,7 @@
 
     runMiddlewares($serverRequest);
 
-}catch(Exception $er){
+} catch(Exception $er){
 
     die("Code Error: {$er->getCode()}<br>Line: {$er->getLine()}<br>File: {$er->getFile()}<br>Message: {$er->getMessage()}.");
 

Spacing +6 added lines, -6 removed lines

@@ -14,15 +14,15 @@ 
 use HnrAzevedo\Router\Router;
 use Psr\Http\Server\MiddlewareInterface;
 
-try{
+try {
     $requestMethod = (isset($_REQUEST['REQUEST_METHOD'])) ? $_REQUEST['REQUEST_METHOD'] : $_SERVER['REQUEST_METHOD'];
 
     $serverRequest = (new Factory())->createServerRequest($requestMethod, new Uri($_SERVER['REQUEST_URI']));
 
-    class App implements MiddlewareInterface{
+    class App implements MiddlewareInterface {
         public function process(ServerRequestInterface $request, RequestHandlerInterface $handler): ResponseInterface
         {
-            if(empty($request->getAttribute('route')))
+            if (empty($request->getAttribute('route')))
             {
                 throw new Exception('Page not found', 404);
             }
@@ -33,7 +33,7 @@ 
         }
     }
 
-    define('GLOBAL_MIDDLEWARES',[
+    define('GLOBAL_MIDDLEWARES', [
         Router::class,
         App::class
     ]);
@@ -69,7 +69,7 @@ 
 
     function runMiddlewares($serverRequest)
     {
-        nextExample(new class implements RequestHandlerInterface{
+        nextExample(new class implements RequestHandlerInterface {
             public function handle(ServerRequestInterface $request): ResponseInterface
             {
                 return (new Factory())->createResponse(200);
@@ -79,7 +79,7 @@ 
 
     runMiddlewares($serverRequest);
 
-}catch(Exception $er){
+}catch (Exception $er) {
 
     die("Code Error: {$er->getCode()}<br>Line: {$er->getLine()}<br>File: {$er->getFile()}<br>Message: {$er->getMessage()}.");
 

examples/DefaultUseExample.php

Spacing +2 added lines, -2 removed lines

@@ -7,7 +7,7 @@ 
 
 use HnrAzevedo\Router\Router;
 
-try{
+try {
 
     Router::defineHost('https://localhost');
     
@@ -28,7 +28,7 @@ 
      */ 
     $action = Router::currentAction();
 
-}catch(Exception $er){
+}catch (Exception $er) {
 
     die("Code Error: {$er->getCode()}<br>Line: {$er->getLine()}<br>File: {$er->getFile()}<br>Message: {$er->getMessage()}.");
 

Braces +1 added lines, -1 removed lines

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

src/Helper.php

Spacing +2 added lines, -2 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace HnrAzevedo\Router;
 
@@ -54,7 +54,7 @@ 
 
     protected function setRoutes(array $routes): void
     {
-        $this->routes =  $routes;
+        $this->routes = $routes;
     }
 
     protected function getGroup(): ?string

src/CurrentTrait.php

Spacing +1 added lines, -1 removed lines

@@ -1,6 +1,6 @@
 <?php
 
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace HnrAzevedo\Router;
 

src/RunInTrait.php

Braces +6 added lines, -2 removed lines

@@ -93,7 +93,9 @@ 
             $ReflectionMethod =  new \ReflectionFunction($closure);
 
             foreach($ReflectionMethod->getParameters() as $param){
-                if(!isset($_REQUEST[$param->name])) continue;
+                if(!isset($_REQUEST[$param->name])) {
+                    continue;
+                }
                 $params[$param->name] = $_REQUEST[$param->name];
             }
             
@@ -176,7 +178,9 @@ 
         $ReflectionMethod =  new \ReflectionMethod(new $controller(), $method);
 
         foreach($ReflectionMethod->getParameters() as $param){
-            if(!isset($_REQUEST[$param->name])) continue;
+            if(!isset($_REQUEST[$param->name])) {
+                continue;
+            }
             $params[$param->name] = $_REQUEST[$param->name];
         }
 

Spacing +24 added lines, -24 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace HnrAzevedo\Router;
 
@@ -17,12 +17,12 @@ 
 
     protected function getState(string $state, bool $except = false)
     {
-        $this->beforeAll = (!isset($this->beforeAll)) ? function () {
+        $this->beforeAll = (!isset($this->beforeAll)) ? function() {
         } : $this->beforeAll;
-        $this->afterAll = (!isset($this->afterAll)) ? function () {
+        $this->afterAll = (!isset($this->afterAll)) ? function() {
         } : $this->afterAll;
         
-        if($state === 'before') {
+        if ($state === 'before') {
             return ($except) ? $this->beforeExcepts : $this->beforeAll;
         }
 
@@ -31,8 +31,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;
             }
@@ -41,7 +41,7 @@ 
             return true;
         }
 
-        if($except) {
+        if ($except) {
             $this->afterExcepts = $settable;
             return true;
         }
@@ -86,14 +86,14 @@ 
 
     protected function executeRouteAction($action): bool
     {
-        if(is_callable($action)) { 
+        if (is_callable($action)) { 
             
             $params = [];
             $closure = (get_class($action) !== 'Closure') ? $action->getClosure() : $action;
-            $ReflectionMethod =  new \ReflectionFunction($closure);
+            $ReflectionMethod = new \ReflectionFunction($closure);
 
-            foreach($ReflectionMethod->getParameters() as $param){
-                if(!isset($_REQUEST[$param->name])) continue;
+            foreach ($ReflectionMethod->getParameters() as $param) {
+                if (!isset($_REQUEST[$param->name])) continue;
                 $params[$param->name] = $_REQUEST[$param->name];
             }
             
@@ -111,9 +111,9 @@ 
         $excepts = (is_array($excepts)) ? $excepts : [];
         $group = self::getInstance()->inSave()['group'];
 
-        foreach(self::getInstance()->getRoutes() as $r => $route){
-            if($route['group'] === $group && !in_array($r, $excepts)) {
-                $route[$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)) {
+                $route[$state] = (is_null($route[$state])) ? [$closure] : array_merge($route[$state], [$closure]); 
                 self::getInstance()->updateRoute($route, $r);
             }
         }
@@ -124,14 +124,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 ]);
+        $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))();
         }
 
@@ -142,15 +142,15 @@ 
     {
         $this->executeState('after');
 
-        if(!in_array($this->currentName(), (array) $this->getState('after', true))) {
+        if (!in_array($this->currentName(), (array) $this->getState('after', true))) {
             ($this->getState('after', false))();
         }
     }
 
     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;
             }
@@ -161,7 +161,7 @@ 
 
     private function executeController(string $controllerMeth): void
     {
-        if(count(explode('@', $controllerMeth)) !== 2) {
+        if (count(explode('@', $controllerMeth)) !== 2) {
             $path = urldecode(unserialize($this->current()['uri'])->getPath());
             throw new \RuntimeException("Misconfigured route action ({$path})");
         }
@@ -173,14 +173,14 @@ 
 
         $params = [];
 
-        $ReflectionMethod =  new \ReflectionMethod(new $controller(), $method);
+        $ReflectionMethod = new \ReflectionMethod(new $controller(), $method);
 
-        foreach($ReflectionMethod->getParameters() as $param){
-            if(!isset($_REQUEST[$param->name])) continue;
+        foreach ($ReflectionMethod->getParameters() as $param) {
+            if (!isset($_REQUEST[$param->name])) continue;
             $params[$param->name] = $_REQUEST[$param->name];
         }
 
-        call_user_func_array([(new $controller()),$method], $params);
+        call_user_func_array([(new $controller()), $method], $params);
     }
 
 }

src/WhereTrait.php

Spacing +15 added lines, -15 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace HnrAzevedo\Router;
 
@@ -23,8 +23,8 @@ 
         $excepts = (is_array($excepts)) ? $excepts : [];
         
         $group = self::getInstance()->inSave()['group'];
-        foreach(self::getInstance()->getRoutes() as $r => $route){
-            if($route['group'] !== $group || in_array($route['name'], $excepts)) {
+        foreach (self::getInstance()->getRoutes() as $r => $route) {
+            if ($route['group'] !== $group || in_array($route['name'], $excepts)) {
                 continue;
             }
 
@@ -49,16 +49,16 @@ 
         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');
         }
 
@@ -67,12 +67,12 @@ 
 
     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);
 
-            if(array_key_exists(str_replace(['{?','{','}'], '', $ref), $where)) {
+            if (array_key_exists(str_replace(['{?', '{', '}'], '', $ref), $where)) {
                 $this->matchParam($where, $ref, $value);
             }
 
@@ -83,25 +83,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)) {
                 throw new \Exception('continue');
             }
         }