hnrazevedo / Router

examples/MiddlewareExample.php

Spacing +6 added lines, -6 removed lines

@@ -14,13 +14,13 @@ 
 use HnrAzevedo\Router\Router;
 use Psr\Http\Server\MiddlewareInterface;
 
-try{
+try {
     $serverRequest = (new Factory())->createServerRequest($_SERVER['REQUEST_METHOD'], 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);
             }
@@ -31,7 +31,7 @@ 
         }
     }
 
-    define('GLOBAL_MIDDLEWARES',[
+    define('GLOBAL_MIDDLEWARES', [
         Router::class,
         App::class
     ]);
@@ -67,7 +67,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);
@@ -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()}.");
 

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()}.");
 

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()}.");
 

examples/Routes/default.php

Spacing +23 added lines, -23 removed lines

@@ -7,26 +7,26 @@ 
 /**
  * Defines a route for the GET method
  */
-Router::get('/foo','\HnrAzevedo\Router\Examples\Controller@method');
+Router::get('/foo', '\HnrAzevedo\Router\Examples\Controller@method');
 
 /**
  * Defines a route to the GET method with an anonymous function
  */
-Router::get('/bar', function(){
+Router::get('/bar', function() {
     //
 });
 
 /**
  * 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() {
     //
 });
 
@@ -36,14 +36,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');
 
@@ -55,32 +55,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() {
     //
 });
 /**
@@ -101,21 +101,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}'
@@ -131,8 +131,8 @@ 
  * @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]*'
@@ -140,13 +140,13 @@ 
 });
 
 
-Router::group('/admin2', function(){
-    Router::get('/users/{teste}', function($teste){
+Router::group('/admin2', function() {
+    Router::get('/users/{teste}', function($teste) {
         echo $teste;
     })->name('teste');
 })->groupWhere([
     'teste'=>'[a-zA-Z]*'
-],[]);
+], []);
 
 
 
@@ -163,7 +163,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
@@ -172,7 +172,7 @@ 
 /**
  * Defining middleware by nickname
  */
-Router::get('/lasted', function(){
+Router::get('/lasted', function() {
     //
 })->middleware([
     'Lasted'
@@ -182,7 +182,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,

src/CheckTrait.php

Spacing +8 added lines, -8 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace HnrAzevedo\Router;
 
@@ -12,28 +12,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}");
         }
     }
@@ -41,12 +41,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/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;
 
@@ -13,27 +13,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;
@@ -42,8 +42,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 +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/WhereTrait.php

Spacing +17 added lines, -17 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace HnrAzevedo\Router;
 
@@ -21,8 +21,8 @@ 
     public static function groupWhere(array $wheres, 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;
             }
 
@@ -47,30 +47,30 @@ 
         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);
             }
 
@@ -81,25 +81,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');
             }
         }

src/RunInTrait.php

Spacing +29 added lines, -29 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace HnrAzevedo\Router;
 
@@ -17,7 +17,7 @@ 
 
     protected function getState(string $state, bool $except = false)
     {
-        if($state === 'before'){
+        if ($state === 'before') {
             return ($except) ? $this->beforeExcepts : $this->beforeAll;
         }
 
@@ -26,8 +26,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;
             }
@@ -36,7 +36,7 @@ 
             return true;
         }
 
-        if($except){
+        if ($except) {
             $this->afterExcepts = $settable;
             return true;
         }
@@ -47,24 +47,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();
     }
@@ -81,7 +81,7 @@ 
 
     protected function executeRouteAction($action): bool
     {
-        if(is_callable($action)){        
+        if (is_callable($action)) {        
             call_user_func_array($action, $_REQUEST);
             return true;
         }
@@ -93,12 +93,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]); 
             }
         }
 
@@ -108,14 +108,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))();
         }
 
@@ -126,15 +126,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;
             }
@@ -145,31 +145,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/Router.php

Spacing +9 added lines, -9 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace HnrAzevedo\Router;
 
@@ -33,7 +33,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);
         }
 
@@ -55,15 +55,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;
             }
         }
@@ -77,7 +77,7 @@ 
 
     public static function run(): RouterInterface
     {
-        if(!self::getInstance()->loaded){
+        if (!self::getInstance()->loaded) {
             self::getInstance()->load();
         }
 
@@ -87,9 +87,9 @@ 
 
         self::getInstance()->executeBefore();
         
-        try{
+        try {
             self::getInstance()->executeRouteAction(self::getInstance()->current()['action']);
-        }catch(\Exception $er){
+        }catch (\Exception $er) {
             self::getInstance()->error = $er;
         }
         
@@ -102,7 +102,7 @@ 
 
     private function checkError(): void
     {
-        if(isset($this->error)){
+        if (isset($this->error)) {
             throw $this->error;
         }
     }

Braces +2 added lines, -2 removed lines

@@ -63,7 +63,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;
             }
         }
@@ -89,7 +89,7 @@ 
         
         try{
             self::getInstance()->executeRouteAction(self::getInstance()->current()['action']);
-        }catch(\Exception $er){
+        } catch(\Exception $er){
             self::getInstance()->error = $er;
         }