hnrazevedo / Router

examples/Middleware/Auth.php

Spacing +2 added lines, -2 removed lines

@@ -6,11 +6,11 @@
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Server\RequestHandlerInterface;
 
-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 = 'Usuário não logado.';
         }
 

examples/Middleware/Auth2.php

Spacing +2 added lines, -2 removed lines

@@ -6,11 +6,11 @@
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Server\RequestHandlerInterface;
 
-class Auth2 extends Middleware{
+class Auth2 extends Middleware {
 
     public function process(ServerRequestInterface $request, RequestHandlerInterface $handler): ResponseInterface
     {
-        if(!isset($this->error)){
+        if (!isset($this->error)) {
             
         }
 

examples/Routes/default.php

Spacing +2 added lines, -2 removed lines

@@ -5,11 +5,11 @@
 
 
 /* Filter example */
-Router::get('/my-account',function(array $data, Response $response){
+Router::get('/my-account', function(array $data, Response $response) {
     echo '<pre>';
     var_dump($response);
     echo 'Ok';
-})->middleware(['\Example\Middleware\Auth::class','Auth2']);
+})->middleware(['\Example\Middleware\Auth::class', 'Auth2']);
 
 /* Returning parameters passed via URL in anonymous functions 
 Router::get('/{parameter}/{otherparameter}', function($parameter, $otherparameter){

src/Helper.php

Spacing +37 added lines, -37 removed lines

@@ -8,7 +8,7 @@ 
 use Exception;
 use HnrAzevedo\Http\Response;
 
-trait Helper{
+trait Helper {
     use CheckTrait, ControllerTrait;
     
     private $currentRoute = null;
@@ -35,7 +35,7 @@ 
     protected function getProtocol(): string
     {
         $protocol = ((isset($_SERVER['HTTP_X_REQUESTED_WITH']) && strtolower($_SERVER['HTTP_X_REQUESTED_WITH']) == 'xmlhttprequest')) ? 'ajax' : 'get';
-        $protocol = (array_key_existS('HTTP_REQUESTED_METHOD',$_SERVER)) ? strtolower($_SERVER['HTTP_REQUESTED_METHOD']) : $protocol;
+        $protocol = (array_key_existS('HTTP_REQUESTED_METHOD', $_SERVER)) ? strtolower($_SERVER['HTTP_REQUESTED_METHOD']) : $protocol;
             
         return $protocol;
     }
@@ -54,9 +54,9 @@ 
     {
 		$this->checkRole();
         $method = ($method !== 'method') ? $method : $this->getData()['POST']['role'];
-        $data = (array_key_exists('data',$values)) ? json_decode($values['data'], true) : [];
+        $data = (array_key_exists('data', $values)) ? json_decode($values['data'], true) : [];
 
-        call_user_func_array([$controller,$method],  $data);
+        call_user_func_array([$controller, $method], $data);
     }
 
     protected function Controller(string $controll)
@@ -64,36 +64,36 @@ 
         $data = $this->getData();
 
         foreach ($data['GET'] as $name => $value) {
-            $controll = str_replace('{'.$name.'}',$value,$controll);
+            $controll = str_replace('{'.$name.'}', $value, $controll);
         }
 
         $this->checkControllSettable($controll)->checkControllExist($controll)->checkControllMethod($controll);
 
-        $controller = ucfirst(explode(':',$controll)[0]);
+        $controller = ucfirst(explode(':', $controll)[0]);
         $controller = new $controller();
-        $method = explode(':',$controll)[1];
+        $method = explode(':', $controll)[1];
 
-        if( ($this->getProtocol() == 'form') ){
+        if (($this->getProtocol() == 'form')) {
             $this->ControllerForm($controller, $method, $data['POST']);
         }else {
-            $data = (array_key_exists('data',$data['POST'])) ? json_decode($data['POST']['data'], true) : $data['GET'];
-            call_user_func_array([$controller,$method],  $data);
+            $data = (array_key_exists('data', $data['POST'])) ? json_decode($data['POST']['data'], true) : $data['GET'];
+            call_user_func_array([$controller, $method], $data);
         }
 
         return $this;
     }    
 
-    protected function explodeRoutes(bool $bar, string $url ,bool $bar_, string $url_): array
+    protected function explodeRoutes(bool $bar, string $url, bool $bar_, string $url_): array
     {   
-        $url = $bar ? substr($url, 0, -1) : $url ;
-        $url = explode('/',$url);
+        $url = $bar ? substr($url, 0, -1) : $url;
+        $url = explode('/', $url);
 
-        $url_ = $bar_ ? substr($url_, 0, -1) : $url_ ;
-        $url_ = explode('/',$url_);
+        $url_ = $bar_ ? substr($url_, 0, -1) : $url_;
+        $url_ = explode('/', $url_);
 
-        foreach($url as $ur => $u){
-            if(substr($u,0,2) === '{?'){
-                if(!array_key_exists($ur,$url_)){
+        foreach ($url as $ur => $u) {
+            if (substr($u, 0, 2) === '{?') {
+                if (!array_key_exists($ur, $url_)) {
                     $url_[$ur] = '';
                 };
             }
@@ -104,25 +104,25 @@ 
 
     protected function toHiking(array $route, Response $response): bool
     {
-        $this->callOnRoute($route,'beforeAll')->callOnRoute($route,'before');
+        $this->callOnRoute($route, 'beforeAll')->callOnRoute($route, 'before');
 
-        if(is_string($route['role'])){
-            $this->Controller($route['role'])->callOnRoute($route,'after')->callOnRoute($route,'afterAll');
+        if (is_string($route['role'])) {
+            $this->Controller($route['role'])->callOnRoute($route, 'after')->callOnRoute($route, 'afterAll');
             return true;
         }
 
-        call_user_func_array($route['role'],[$this->getData()['GET'],$response]);
+        call_user_func_array($route['role'], [$this->getData()['GET'], $response]);
 
-        $this->callOnRoute($route,'after')->callOnRoute($route,'afterAll');
+        $this->callOnRoute($route, 'after')->callOnRoute($route, 'afterAll');
         return true;
     }
 
-    protected function callOnRoute(array $route,string $state)
+    protected function callOnRoute(array $route, string $state)
     {
-        if($route[$state] !== null){
-            if(is_string($route[$state])){
+        if ($route[$state] !== null) {
+            if (is_string($route[$state])) {
                 $this->Controller($route[$state]);
-            }else{
+            }else {
                 $route[$state]();
             }
         }
@@ -133,12 +133,12 @@ 
     {
         $currentProtocol = $this->getProtocol();
 
-        foreach(array_reverse($this->routers) as $r => $route){
+        foreach (array_reverse($this->routers) as $r => $route) {
 
             $this->currentRoute = $route;
             $this->currentRoute['name'] = $r;
 
-            if(!$this->checkProtocol($route['protocol'], $currentProtocol)){
+            if (!$this->checkProtocol($route['protocol'], $currentProtocol)) {
                 continue;
             }
 
@@ -148,23 +148,23 @@ 
             $_SERVER['REQUEST_URI'] = (array_key_exists('REQUEST_URI', $_SERVER)) ? $_SERVER['REQUEST_URI'] : '';
 
             $routs = $this->explodeRoutes(
-                (substr($route['url'],strlen($route['url'])-1,1) === '/') , $route['url'],
-                (substr($_SERVER['REQUEST_URI'],strlen($_SERVER['REQUEST_URI'])-1,1) === '/') , $_SERVER['REQUEST_URI']
+                (substr($route['url'], strlen($route['url'])-1, 1) === '/'), $route['url'],
+                (substr($_SERVER['REQUEST_URI'], strlen($_SERVER['REQUEST_URI'])-1, 1) === '/'), $_SERVER['REQUEST_URI']
             );
 
-            if(!$this->checkToHiking($route, $routs['routeRequest'], $routs['routeLoop'])){
+            if (!$this->checkToHiking($route, $routs['routeRequest'], $routs['routeLoop'])) {
                 continue;
             }
             
-            $this->request = new RequestHandler($route['protocol'],new Uri($this->host.$route['url']));  
-            $this->serverRequest = (new Factory())->createServerRequest($route['protocol'],new Uri($this->host.$route['url']));          
+            $this->request = new RequestHandler($route['protocol'], new Uri($this->host.$route['url']));  
+            $this->serverRequest = (new Factory())->createServerRequest($route['protocol'], new Uri($this->host.$route['url']));          
             
             $this->loaded = true;
             return $this;
         }
         
         $this->currentRoute = null;
-	    throw new Exception('Page not found.',404);
+	    throw new Exception('Page not found.', 404);
     }
 
     protected function loadByName(string $routName)
@@ -173,8 +173,8 @@ 
         $this->checkName($routName);
         $route = $this->routers[$routName];
 
-        if(!$this->checkProtocol($route['protocol'], $currentProtocol)){
-            throw new Exception('Page not found.',404);
+        if (!$this->checkProtocol($route['protocol'], $currentProtocol)) {
+            throw new Exception('Page not found.', 404);
         }
 
         $this->currentRoute = $route;

src/Router.php

Spacing +17 added lines, -17 removed lines

@@ -4,7 +4,7 @@ 
 
 use HnrAzevedo\Http\ServerRequest;
 
-class Router{
+class Router {
     use Helper, DefinitionsTrait, ExtraJobsTrait;
 
     private static Router $instance;
@@ -25,7 +25,7 @@ 
 
     public static function create(): Router
     {
-        if(!self::getInstance()->instanced){
+        if (!self::getInstance()->instanced) {
             self::getInstance()->instanced = true;
         }
         
@@ -44,13 +44,13 @@ 
         return self::getInstance();
     }
 
-    public function set(string $url ,$walking , string $protocol): Router
+    public function set(string $url, $walking, string $protocol): Router
     {
         $this->lastReturn = null;
         
-		$url = (substr($url,0,1) !=='/' and strlen($url) > 0) ? "/{$url}" : $url;
+		$url = (substr($url, 0, 1) !== '/' and strlen($url) > 0) ? "/{$url}" : $url;
 
-    	$this->checkExistence($url,$protocol);
+    	$this->checkExistence($url, $protocol);
         $this->checkTypeRole($walking);
 
 		$route = [
@@ -73,7 +73,7 @@ 
 
     public static function group(string $prefix, callable $callback): Router
     {
-        self::getInstance()->prefix = (substr($prefix,0,1) !== '/') ? "/{$prefix}" : $prefix;
+        self::getInstance()->prefix = (substr($prefix, 0, 1) !== '/') ? "/{$prefix}" : $prefix;
         self::getInstance()->group = sha1(date('d/m/Y h:m:i'));
         $callback();
         self::getInstance()->group = null;
@@ -93,11 +93,11 @@ 
 
         $currentRoute = end(self::getInstance()->routers);
 
-        if(in_array($name,self::getInstance()->beforeExcepts)){
+        if (in_array($name, self::getInstance()->beforeExcepts)) {
             $currentRoute['beforeAll'] = null;
         }
 
-        if(in_array($name,self::getInstance()->afterExcepts)){
+        if (in_array($name, self::getInstance()->afterExcepts)) {
             $currentRoute['afterAll'] = null;
         }
 
@@ -117,46 +117,46 @@ 
     {
         $instance = self::create()->getInstance();
 
-        if(!$instance->loaded){
+        if (!$instance->loaded) {
             self::load($routeName);
         }
 
-        $instance->toHiking($instance->currentRoute,$instance->checkMiddleware($instance->currentRoute));
+        $instance->toHiking($instance->currentRoute, $instance->checkMiddleware($instance->currentRoute));
         
     }
 
     public function middleware($middlewares): Router
     {
-        if($this->lastReturn !== null){
+        if ($this->lastReturn !== null) {
             $currentGroup = end($this->routers)['group'];
 
             foreach ($this->routers as $key => $value) {
-                if($value['group'] === $currentGroup){
-                    $this->routers[$key] = $this->addMiddleware($this->routers[$key],$middlewares);
+                if ($value['group'] === $currentGroup) {
+                    $this->routers[$key] = $this->addMiddleware($this->routers[$key], $middlewares);
                 }
             }
             
             return $this;
         }
         
-        $this->routers[count($this->routers)-1] = $this->addMiddleware(end($this->routers),$middlewares);
+        $this->routers[count($this->routers)-1] = $this->addMiddleware(end($this->routers), $middlewares);
         return $this;
     }
 
     public static function addMiddleware(array $route, $filter): array
     {
-        if(is_null($route['middlewares'])){
+        if (is_null($route['middlewares'])) {
             $route['middlewares'] = $filter;
             return $route;
         }
 
         $middlewares = (is_array($filter)) ? $filter : [0 => $filter];
 
-        if(is_array($route['middlewares'])){
+        if (is_array($route['middlewares'])) {
             foreach ($route['middlewares'] as $key => $value) {
                 $middlewares[] = $value;
             }
-        }else{
+        }else {
             $middlewares[] = $route['middlewares'];
         }
 

src/MiddlewareTrait.php

Spacing +7 added lines, -7 removed lines

@@ -5,15 +5,15 @@ 
 use Exception;
 use HnrAzevedo\Http\Response;
 
-trait MiddlewareTrait{
+trait MiddlewareTrait {
     protected array $middlewares = [];
 
     protected function checkMiddleware(array $route)
     {
-        $middlewares = (is_array($route['middlewares'])) ? $route['middlewares'] : [ $route['middlewares'] ];
+        $middlewares = (is_array($route['middlewares'])) ? $route['middlewares'] : [$route['middlewares']];
 
-        foreach($middlewares as $middleware){
-            if(is_null($middleware)){
+        foreach ($middlewares as $middleware) {
+            if (is_null($middleware)) {
                 continue;
             }
 
@@ -31,12 +31,12 @@ 
 
     protected function middlewareExists(string $m)
     {
-        if(class_exists(str_replace('::class','',$m))){
-            $m = str_replace('::class','',$m);
+        if (class_exists(str_replace('::class', '', $m))) {
+            $m = str_replace('::class', '', $m);
             return new $m();
         }
 
-        if(array_key_exists($m,$this->middlewares)){
+        if (array_key_exists($m, $this->middlewares)) {
             return new $this->middlewares[$m]();
         }
 

src/RequestHandler.php

Spacing +1 added lines, -1 removed lines

@@ -13,7 +13,7 @@
 
     public function handle(ServerRequestInterface $request): ResponseInterface
     {
-        if(!isset(self::$response)){
+        if (!isset(self::$response)) {
             self::$response = new Response();
         }