hnrazevedo / Router

src/MiddlewareTrait.php

Spacing +11 added lines, -11 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace HnrAzevedo\Router;
 
@@ -22,9 +22,9 @@ 
 
     public static function globalMiddlewares(?array $middlewares = null): array
     {
-        if(null !== $middlewares) {
-            foreach($middlewares as $middleware){
-                if(!class_exists($middleware)) {
+        if (null !== $middlewares) {
+            foreach ($middlewares as $middleware) {
+                if (!class_exists($middleware)) {
                     throw new \RuntimeException("Middleware class {$middleware} not exists");
                 }
             }
@@ -55,8 +55,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;
             }
 
@@ -68,7 +68,7 @@ 
 
     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");
         }
     }
@@ -81,7 +81,7 @@ 
 
         $this->serverRequest = (!isset($this->serverRequest)) ? $factory->createServerRequest($requestMethod, unserialize($this->current()['uri']), ['route' => $this->current()]) : $this->serverRequest;
         
-        foreach ($this->current()['middlewares'] as $middleware){
+        foreach ($this->current()['middlewares'] as $middleware) {
             $this->currentMiddlewares[] = (class_exists($middleware)) ? new $middleware() : new $this->globalMiddlewares[$middleware]();
         }
 
@@ -98,14 +98,14 @@ 
 
     public function process(ServerRequestInterface $request, RequestHandlerInterface $handler): ResponseInterface
     {
-        if(!$this->getInstance()->loaded()) {
+        if (!$this->getInstance()->loaded()) {
             $this->getInstance()->load();
         }
 
         $route = $this->getInstance()->current();
-        if(!empty($route)) {
+        if (!empty($route)) {
 
-            $route['action'] = function () {
+            $route['action'] = function() {
                 $this->getInstance()->executeBefore();
                 $this->getInstance()->executeRouteAction(unserialize($this->getInstance()->current()['action']));
                 $this->getInstance()->executeAfter();

src/OwnerTrait.php

Spacing +3 added lines, -3 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace HnrAzevedo\Router;
 
@@ -20,7 +20,7 @@ 
     {
         $this->hasRouteName($name);
 
-        if(!$this->loaded()) {
+        if (!$this->loaded()) {
             $this->loadIn($name);
         }
         
@@ -29,7 +29,7 @@ 
 
     public function hasCurrentRoute(): void
     {
-        if(!isset($this->currentRoute)) {
+        if (!isset($this->currentRoute)) {
             throw new \RuntimeException('Route not yet loaded');
         }
     }

src/PrioritizeTrait.php

Spacing +9 added lines, -9 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace HnrAzevedo\Router;
 
@@ -12,7 +12,7 @@ 
 
     protected function sorted(?bool $sorted = null): bool
     {
-        if(null !== $sorted) {
+        if (null !== $sorted) {
             $this->sorted = $sorted;
         }
         return $this->sorted;
@@ -20,19 +20,19 @@ 
     
     protected function sortRoutes(): bool
     {
-        if($this->sorted()) {
+        if ($this->sorted()) {
             return true;
         }
 
         $staticRoutes = [];
         $paramRoutes = [];
 
-        foreach($this->getRoutes() as $r => $route){
+        foreach ($this->getRoutes() as $r => $route) {
 
             $path = urldecode(unserialize($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;    
             }
 
@@ -48,7 +48,7 @@ 
 
     private function getKeyArray(int $index, array $array): int
     {
-        while(array_key_exists($index, $array)){
+        while (array_key_exists($index, $array)) {
             $index++;
         }
         return $index;
@@ -57,8 +57,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/Router.php

Spacing +14 added lines, -14 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace HnrAzevedo\Router;
 
@@ -35,7 +35,7 @@ 
     {
         $route = self::getInstance()->inSave();
 
-        if(null === $value) {
+        if (null === $value) {
             return (isset($route['attributes'][$name])) ? $route['attributes'][$name] : null;
         }
 
@@ -48,8 +48,8 @@ 
     public static function groupAttribute(string $name, $value = null, ?array $excepts = []): Router
     {
         $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;
             }
 
@@ -62,7 +62,7 @@ 
     public static function group(string $prefix, \Closure $closure): Router
     {
         $id = sha1(date('d/m/Y h:m:i'));
-        while(array_key_exists($id, self::getInstance()->groupsName)){
+        while (array_key_exists($id, self::getInstance()->groupsName)) {
             $id = sha1(date('d/m/Y h:m:i').$id);
         }
 
@@ -83,7 +83,7 @@ 
     {
         self::getInstance()->loaded = true;
 
-        if(null !== $name) {
+        if (null !== $name) {
             return self::getInstance()->loadByName($name);
         }
 
@@ -91,15 +91,15 @@ 
 
         $requestMethod = (isset($_REQUEST['REQUEST_METHOD'])) ? $_REQUEST['REQUEST_METHOD'] : $_SERVER['REQUEST_METHOD'];
 
-        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, $requestMethod);
                 self::getInstance()->checkData($route, (new Uri($_SERVER['REQUEST_URI']))->getPath());
                 return self::getInstance();
-            }catch(\Exception $er){
+            }catch (\Exception $er) {
                 continue;
             }
         }
@@ -113,7 +113,7 @@ 
 
     public static function run(?string $name = null): RouterInterface
     {
-        if(!self::getInstance()->loaded) {
+        if (!self::getInstance()->loaded) {
             self::getInstance()->load($name);
         }
 
@@ -123,10 +123,10 @@ 
 
         self::getInstance()->executeBefore();
         
-        try{
+        try {
             $action = unserialize(self::getInstance()->current()['action']);
             self::getInstance()->executeRouteAction((is_string($action)) ? $action : $action->getClosure());
-        }catch(\Exception $er){
+        }catch (\Exception $er) {
             self::getInstance()->error = $er;
         }
         
@@ -139,7 +139,7 @@ 
 
     private function checkError(): void
     {
-        if(isset($this->error)) {
+        if (isset($this->error)) {
             throw $this->error;
         }
     }
@@ -153,7 +153,7 @@ 
 
     public static function routes(?array $routes = null): array
     {
-        if(null !== $routes) {
+        if (null !== $routes) {
             self::getInstance()->setRoutes($routes);
             self::getInstance()->sortRoutes();
         }

Braces +2 added lines, -2 removed lines

@@ -99,7 +99,7 @@ 
                 self::getInstance()->checkMethod($route, $requestMethod);
                 self::getInstance()->checkData($route, (new Uri($_SERVER['REQUEST_URI']))->getPath());
                 return self::getInstance();
-            }catch(\Exception $er){
+            } catch(\Exception $er){
                 continue;
             }
         }
@@ -126,7 +126,7 @@ 
         try{
             $action = unserialize(self::getInstance()->current()['action']);
             self::getInstance()->executeRouteAction((is_string($action)) ? $action : $action->getClosure());
-        }catch(\Exception $er){
+        } catch(\Exception $er){
             self::getInstance()->error = $er;
         }
         

examples/Routes/default.php

Spacing +23 added lines, -23 removed lines

@@ -7,12 +7,12 @@ 
 /**
  * Defines a route for the GET method
  */
-Router::get('/foo','HnrAzevedo\Router\Example\Controllers\Controller@method');
+Router::get('/foo', 'HnrAzevedo\Router\Example\Controllers\Controller@method');
 
 /**
  * Defines a route to the GET method with an anonymous function
  */
-Router::get('/bar', function(){
+Router::get('/bar', function() {
     //
     echo '/bar executed!';
 });
@@ -20,14 +20,14 @@ 
 /**
  * Defines a route to the POST method with an anonymous function
  */
-Router::post('/bar', function(){
+Router::post('/bar', function() {
     //
 });
 
 /**
  * Defining route for any method
  */
-Router::any('/any', function(){
+Router::any('/any', function() {
     //
 });
 
@@ -37,14 +37,14 @@ 
  * @param string $route
  * @param \Closure|string $action
  */
-Router::match('GET|post', '/get_post', function(){
+Router::match('GET|post', '/get_post', function() {
     //
 });
 
 /**
  * Defines the route name
  */
-Router::get('/named', function(){
+Router::get('/named', function() {
     //
 })->name('baz');
 
@@ -56,32 +56,32 @@ 
 /**
  * Run before all requests, regardless of error occurrences
  */
-Router::beforeAll(function(){
+Router::beforeAll(function() {
     //
 }, null);
 
 /**
  * Run after all requests, regardless of error occurrences
  */
-Router::afterAll(function(){
+Router::afterAll(function() {
     //
 }, null);
 
 /**
  * Executes after executing the triggered route action
  */
-Router::get('/after', function(){
+Router::get('/after', function() {
     //
-})->after(function(){
+})->after(function() {
     //
 });
 
 /**
  * Executes before executing the triggered route action
  */
-Router::get('/before', function(){
+Router::get('/before', function() {
     //
-})->before(function(){
+})->before(function() {
     //
 });
 /**
@@ -102,21 +102,21 @@ 
 /**
  * Example of route definition with parameters
  */
-Router::get('/passingParameters/{param}', function($param){
+Router::get('/passingParameters/{param}', function($param) {
     echo $param;
 });
 
 /**
  * Example of setting an optional parameter
  */
-Router::get('/passingParameters/{?optionalParam}', function($optionalParam){
+Router::get('/passingParameters/{?optionalParam}', function($optionalParam) {
     echo $optionalParam;
 });
 
 /**
  * Example of regular expression test for parameters
  */
-Router::get('/testingParameters/{param}', function($param){
+Router::get('/testingParameters/{param}', function($param) {
     echo $param;
 })->where([
     'param'=>'[0-9]{1,11}'
@@ -132,16 +132,16 @@ 
  * @param string $prefix
  * @param \Closure $routeDefinitions
  */
-Router::group('/admin', function(){
-    Router::get('/users/{teste}', function($teste){
+Router::group('/admin', function() {
+    Router::get('/users/{teste}', function($teste) {
         echo $teste;
     })->where([
         'teste'=>'[a-zA-Z]*'
     ]);
 });
 
-Router::group('/admin2', function(){
-    Router::get('/users/{teste}', function($teste){
+Router::group('/admin2', function() {
+    Router::get('/users/{teste}', function($teste) {
         echo $teste;
     })->name('teste');
 })
@@ -152,7 +152,7 @@ 
  */
 ->groupWhere([
     'teste'=>'[a-zA-Z]*'
-],[]);
+], []);
 
 
 
@@ -169,7 +169,7 @@ 
 /**
  * Defining route middleware - implements Psr\Http\Server\MiddlewareInterface
  */
-Router::get('/passingParameters/{?optionalParam}', function($optionalParam = null){
+Router::get('/passingParameters/{?optionalParam}', function($optionalParam = null) {
     echo $optionalParam;
 })->middleware([
     HnrAzevedo\Router\Example\Middleware\Auth::class
@@ -178,7 +178,7 @@ 
 /**
  * Defining middleware by nickname
  */
-Router::get('/lasted', function(){
+Router::get('/lasted', function() {
     //
 })->middleware([
     'Lasted'
@@ -188,7 +188,7 @@ 
  * Defining multiple middlewares
  * NOTE: Importantly, the execution follows the same order of definition
  */
-Router::get('/middlewares', function(){
+Router::get('/middlewares', function() {
     //
 })->middleware([
     HnrAzevedo\Router\Example\Middleware\Auth::class,

examples/AttributeExample.php

Spacing +2 added lines, -2 removed lines

@@ -7,7 +7,7 @@ 
 
 use HnrAzevedo\Router\Router;
 
-try{
+try {
 
     /**
      * Add to composer.json autoload
@@ -35,7 +35,7 @@ 
      */ 
     $action = Router::currentAction();
 
-}catch(Exception $er){
+}catch (Exception $er) {
 
     die("Code Error: {$er->getCode()}".PHP_EOL."Line: {$er->getLine()}".PHP_EOL."File: {$er->getFile()}".PHP_EOL."Message: {$er->getMessage()}.");
 

Braces +1 added lines, -1 removed lines

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

examples/Controllers/Controller.php

Spacing +1 added lines, -1 removed lines

@@ -2,7 +2,7 @@
 
 namespace HnrAzevedo\Router\Example\Controllers;
 
-class Controller{
+class Controller {
 
     public function method(): void
     {

src/AttributeTrait.php

Braces +4 added lines, -2 removed lines

@@ -45,7 +45,9 @@ 
     {
         try{
             foreach ($method->getAttributes() as $attr) {
-                if($attr->getName() != 'HnrAzevedo\Router\Route') continue;
+                if($attr->getName() != 'HnrAzevedo\Router\Route') {
+                    continue;
+                }
 
                 $args = $attr->getArguments();
     
@@ -64,7 +66,7 @@ 
                     ->attrWhere($args)
                     ->attrMiddleware($args);
             }
-        }catch(Exception $er){
+        } catch(Exception $er){
             throw new Exception('Failed to add route via attribute: '.$er->getMessage());
         }
     }

Spacing +14 added lines, -14 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace HnrAzevedo\Router;
 
@@ -29,23 +29,23 @@ 
 
     public static function loadPipeline(): void
     {
-        foreach(self::getInstance()->getPipeline() as $line){
+        foreach (self::getInstance()->getPipeline() as $line) {
             self::getInstance()->loadLine(new ReflectionObject(new $line()));
         }
     }
 
     private function loadLine(ReflectionObject $reflection): void
     {
-        foreach($reflection->getMethods() as $method){
+        foreach ($reflection->getMethods() as $method) {
             $this->loadMethod($method);
         }
     }
 
     private function loadMethod(ReflectionMethod $method): void
     {
-        try{
+        try {
             foreach ($method->getAttributes() as $attr) {
-                if($attr->getName() != 'HnrAzevedo\Router\Route') continue;
+                if ($attr->getName() != 'HnrAzevedo\Router\Route') continue;
 
                 $args = $attr->getArguments();
     
@@ -64,14 +64,14 @@ 
                     ->attrWhere($args)
                     ->attrMiddleware($args);
             }
-        }catch(Exception $er){
+        }catch (Exception $er) {
             throw new Exception('Failed to add route via attribute: '.$er->getMessage());
         }
     }
 
     private function checkArgs(array $args): self
     {
-        if(!array_key_exists('uri', $args) && !array_key_exists(0, $args)) {
+        if (!array_key_exists('uri', $args) && !array_key_exists(0, $args)) {
             throw new Exception('Misconfigured route attribute');
         }
         return $this;
@@ -79,7 +79,7 @@ 
 
     private function attrName(array $attr): self
     {
-        if(array_key_exists('name', $attr)) {
+        if (array_key_exists('name', $attr)) {
             self::getInstance()->name($attr['name']);
         }
         return $this;
@@ -87,7 +87,7 @@ 
 
     private function attrBefore(array $attr): self
     {
-        if(array_key_exists('before', $attr)) {
+        if (array_key_exists('before', $attr)) {
             self::getInstance()->before($attr['before']);
         }
         return $this;
@@ -95,7 +95,7 @@ 
 
     private function attrAfter(array $attr): self
     {
-        if(array_key_exists('after', $attr)) {
+        if (array_key_exists('after', $attr)) {
             self::getInstance()->after($attr['after']);
         }
         return $this;
@@ -103,8 +103,8 @@ 
 
     private function attrAttributes(array $attr): self
     {
-        if(array_key_exists('attributes', $attr)) {
-            foreach($attr['attributes'] as $attribute => $attrValue){
+        if (array_key_exists('attributes', $attr)) {
+            foreach ($attr['attributes'] as $attribute => $attrValue) {
                 self::getInstance()->attribute($attribute, $attrValue);
             }
         }
@@ -113,7 +113,7 @@ 
 
     private function attrWhere(array $attr): self
     {
-        if(array_key_exists('where', $attr)) {
+        if (array_key_exists('where', $attr)) {
             self::getInstance()->where($attr['where']);
         }
         return $this;
@@ -121,7 +121,7 @@ 
 
     private function attrMiddleware(array $attr): self
     {
-        if(array_key_exists('middleware', $attr)) {
+        if (array_key_exists('middleware', $attr)) {
             self::getInstance()->middleware($attr['middleware']);
         }
         return $this;

src/Route.php

Spacing +2 added lines, -2 removed lines

@@ -12,8 +12,8 @@
         private array $methods,
         private string $name,
         private ?array $where,
-        private ?string|?\Closure $after,
-        private ?string|?\Closure $before,
+        private ?string | ?\Closure $after,
+        private ?string | ?\Closure $before,
         private ?array $attributes,
         private ?array $middleware
     ) {}