hnrazevedo / Router

src/DefinitionsTrait.php

Indentation +4 added lines, -4 removed lines

@@ -64,9 +64,9 @@ 
         }
 
         $routes[$index] = [
-			'uri' => new Uri(self::getInstance()->getHost().self::getInstance()->getPrefix().$uri),
-			'action' => $closure,
-			'method' => strtoupper($method),
+            'uri' => new Uri(self::getInstance()->getHost().self::getInstance()->getPrefix().$uri),
+            'action' => $closure,
+            'method' => strtoupper($method),
             'middlewares' => [],
             'where' => null,
             'before' => [],
@@ -83,7 +83,7 @@ 
     private static function checkDuplicity(string $uri, string $method): void
     {
         foreach(self::getInstance()->getRoutes() as $route){
-    		if( md5($route['uri'].$route['method']) === md5($uri.$method) ){
+            if( md5($route['uri'].$route['method']) === md5($uri.$method) ){
                 throw new \RuntimeException("There is already a route with the URI {$uri} and with the {$method} METHOD configured.");
             }
         }

src/MiddlewareTrait.php

Spacing +8 added lines, -8 removed lines

@@ -19,8 +19,8 @@ 
 
     public static function globalMiddlewares(array $middlewares): RouterInterface
     {
-        foreach($middlewares as $middleware){
-            if(!class_exists($middleware)){
+        foreach ($middlewares as $middleware) {
+            if (!class_exists($middleware)) {
                 throw new \RuntimeException("Middleware class {$middleware} not exists");
             }
         }
@@ -35,16 +35,16 @@ 
 
     public static function middleware($middlewares): RouterInterface
     {
-        $middlewares = (is_array($middlewares)) ? $middlewares : [ $middlewares ];
+        $middlewares = (is_array($middlewares)) ? $middlewares : [$middlewares];
         $route = self::getInstance()->inSave();
-        $route['middlewares'] = (is_array($route['middlewares'])) ? array_merge($route['middlewares'],$middlewares) : $middlewares;
-        self::getInstance()->updateRoute($route,array_key_last(self::getInstance()->getRoutes()));
+        $route['middlewares'] = (is_array($route['middlewares'])) ? array_merge($route['middlewares'], $middlewares) : $middlewares;
+        self::getInstance()->updateRoute($route, array_key_last(self::getInstance()->getRoutes()));
         return self::getInstance();
     }
 
     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");
         }
     }
@@ -53,9 +53,9 @@ 
     {
         $factory = new Factory();
 
-        $this->serverRequest = (!isset($this->serverRequest)) ? $factory->createServerRequest($_SERVER['REQUEST_METHOD'], $this->current()['uri'],['route' => $this->current()]) : $this->serverRequest;
+        $this->serverRequest = (!isset($this->serverRequest)) ? $factory->createServerRequest($_SERVER['REQUEST_METHOD'], $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]();
         }
 

src/WhereTrait.php

Spacing +14 added lines, -14 removed lines

@@ -30,30 +30,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);
             }
 
@@ -64,25 +64,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');
             }
         }

examples/Middleware/Auth.php

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

examples/Middleware/Lasted.php

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/Routes/default.php

Indentation +1 added lines, -1 removed lines

@@ -34,7 +34,7 @@
 
 
 Router::get('/6my-accounttttt/{param1}/{param2}','HnrAzevedo\Router\Example\Controllers\User@requireLogin')
-      ->middleware([HnrAzevedo\Router\Example\Middleware\Auth::class,'Lasted']);
+        ->middleware([HnrAzevedo\Router\Example\Middleware\Auth::class,'Lasted']);
 
 Router::get('/7my-account/{:teste}','Controller\\User:my_account')->where([
     'teste'=>'[a-zA-Z]{1,10}'

Spacing +11 added lines, -11 removed lines

@@ -4,28 +4,28 @@ 
 
 
 
-Router::beforeAll(function(){
+Router::beforeAll(function() {
     echo '<br><b>beforeAll</b><br>';
 },['testes']);
 
-Router::afterAll(function(){
+Router::afterAll(function() {
     echo '<br><b>afterAll</b><br>';
 },['testes']);
 
 
-Router::match('GET|POST|AJAX','/{1parameter}/{otherparameter}', function($parameter, $otherparameter){
+Router::match('GET|POST|AJAX', '/{1parameter}/{otherparameter}', function($parameter, $otherparameter) {
     echo "Parameter 1:{$parameter}, Parameter 2:{$otherparameter}.";
 });
 
-Router::get('/{2controller}/{method}','{controller}:{method}');
+Router::get('/{2controller}/{method}', '{controller}:{method}');
 
-Router::get('/3my-account','Controller\\User:my_account')->before(function(){
+Router::get('/3my-account', 'Controller\\User:my_account')->before(function() {
     echo '1';
 });
 
-Router::get('/4my-account/teste/teste','Controller\\User:my_account')->name('2');
+Router::get('/4my-account/teste/teste', 'Controller\\User:my_account')->name('2');
 
-Router::get('/5my-account/{:teste}/{teste2}',function($teste, $teste2){
+Router::get('/5my-account/{:teste}/{teste2}', function($teste, $teste2) {
     echo $teste.'-'.$teste2;
 })->where([
     'teste'=>'[a-zA-Z]{1,10}',
@@ -33,14 +33,14 @@ 
 ]);
 
 
-Router::get('/6my-accounttttt/{param1}/{param2}','HnrAzevedo\Router\Example\Controllers\User@requireLogin')
-      ->middleware([HnrAzevedo\Router\Example\Middleware\Auth::class,'Lasted']);
+Router::get('/6my-accounttttt/{param1}/{param2}', 'HnrAzevedo\Router\Example\Controllers\User@requireLogin')
+      ->middleware([HnrAzevedo\Router\Example\Middleware\Auth::class, 'Lasted']);
 
-Router::get('/7my-account/{:teste}','Controller\\User:my_account')->where([
+Router::get('/7my-account/{:teste}', 'Controller\\User:my_account')->where([
     'teste'=>'[a-zA-Z]{1,10}'
 ]);
 
 
-Router::any('/8',function(){
+Router::any('/8', function() {
     //
 })->name('index');