@@ -8,23 +8,23 @@ |
||
8 | 8 | use Psr\Http\Server\MiddlewareInterface; |
9 | 9 | use Psr\Http\Server\RequestHandlerInterface; |
10 | 10 | |
11 | -class Middleware implements MiddlewareInterface{ |
|
11 | +class Middleware implements MiddlewareInterface { |
|
12 | 12 | protected static array $data = []; |
13 | 13 | protected static Response $response; |
14 | 14 | |
15 | 15 | public function __get($key) |
16 | 16 | { |
17 | - return (array_key_exists($key,self::$data)) ? self::$data[$key] : null; |
|
17 | + return (array_key_exists($key, self::$data)) ? self::$data[$key] : null; |
|
18 | 18 | } |
19 | 19 | |
20 | - public function __set($key,$value) |
|
20 | + public function __set($key, $value) |
|
21 | 21 | { |
22 | 22 | self::$data[$key] = $value; |
23 | 23 | } |
24 | 24 | |
25 | 25 | public function process(ServerRequestInterface $request, RequestHandlerInterface $handler): ResponseInterface |
26 | 26 | { |
27 | - if(!isset(self::$response)){ |
|
27 | + if (!isset(self::$response)) { |
|
28 | 28 | self::$response = new Response(); |
29 | 29 | } |
30 | 30 | return self::$response; |
@@ -8,8 +8,8 @@ |
||
8 | 8 | use Psr\Http\Server\RequestHandlerInterface; |
9 | 9 | |
10 | 10 | /** |
11 | - * @property string $error |
|
12 | - */ |
|
11 | + * @property string $error |
|
12 | + */ |
|
13 | 13 | class Lasted extends Middleware{ |
14 | 14 | |
15 | 15 | public function process(ServerRequestInterface $request, RequestHandlerInterface $handler): ResponseInterface |
@@ -10,11 +10,11 @@ |
||
10 | 10 | /** |
11 | 11 | * @property string $error |
12 | 12 | */ |
13 | -class Lasted extends Middleware{ |
|
13 | +class Lasted extends Middleware { |
|
14 | 14 | |
15 | 15 | public function process(ServerRequestInterface $request, RequestHandlerInterface $handler): ResponseInterface |
16 | 16 | { |
17 | - if(!isset($this->error)){ |
|
17 | + if (!isset($this->error)) { |
|
18 | 18 | throw new Exception("Access not belonged: {$this->error}"); |
19 | 19 | } |
20 | 20 |
@@ -7,8 +7,8 @@ |
||
7 | 7 | use Psr\Http\Server\RequestHandlerInterface; |
8 | 8 | |
9 | 9 | /** |
10 | - * @property string $error |
|
11 | - */ |
|
10 | + * @property string $error |
|
11 | + */ |
|
12 | 12 | class Auth extends Middleware{ |
13 | 13 | |
14 | 14 | public function process(ServerRequestInterface $request, RequestHandlerInterface $handler): ResponseInterface |
@@ -9,11 +9,11 @@ |
||
9 | 9 | /** |
10 | 10 | * @property string $error |
11 | 11 | */ |
12 | -class Auth extends Middleware{ |
|
12 | +class Auth extends Middleware { |
|
13 | 13 | |
14 | 14 | public function process(ServerRequestInterface $request, RequestHandlerInterface $handler): ResponseInterface |
15 | 15 | { |
16 | - if(!array_key_exists('user',$_SESSION)){ |
|
16 | + if (!array_key_exists('user', $_SESSION)) { |
|
17 | 17 | $this->error = 'The user must be logged in to the system'; |
18 | 18 | } |
19 | 19 |
@@ -77,7 +77,7 @@ |
||
77 | 77 | |
78 | 78 | runMiddlewares($serverRequest); |
79 | 79 | |
80 | -}catch(Exception $er){ |
|
80 | +} catch(Exception $er){ |
|
81 | 81 | |
82 | 82 | die("Code Error: {$er->getCode()}<br>Line: {$er->getLine()}<br>File: {$er->getFile()}<br>Message: {$er->getMessage()}."); |
83 | 83 |
@@ -14,15 +14,15 @@ discard block |
||
14 | 14 | use HnrAzevedo\Router\Router; |
15 | 15 | use Psr\Http\Server\MiddlewareInterface; |
16 | 16 | |
17 | -try{ |
|
17 | +try { |
|
18 | 18 | $requestMethod = (isset($_REQUEST['REQUEST_METHOD'])) ? $_REQUEST['REQUEST_METHOD'] : $_SERVER['REQUEST_METHOD']; |
19 | 19 | |
20 | 20 | $serverRequest = (new Factory())->createServerRequest($requestMethod, new Uri($_SERVER['REQUEST_URI'])); |
21 | 21 | |
22 | - class App implements MiddlewareInterface{ |
|
22 | + class App implements MiddlewareInterface { |
|
23 | 23 | public function process(ServerRequestInterface $request, RequestHandlerInterface $handler): ResponseInterface |
24 | 24 | { |
25 | - if(empty($request->getAttribute('route'))) |
|
25 | + if (empty($request->getAttribute('route'))) |
|
26 | 26 | { |
27 | 27 | throw new Exception('Page not found', 404); |
28 | 28 | } |
@@ -33,7 +33,7 @@ discard block |
||
33 | 33 | } |
34 | 34 | } |
35 | 35 | |
36 | - define('GLOBAL_MIDDLEWARES',[ |
|
36 | + define('GLOBAL_MIDDLEWARES', [ |
|
37 | 37 | Router::class, |
38 | 38 | App::class |
39 | 39 | ]); |
@@ -69,7 +69,7 @@ discard block |
||
69 | 69 | |
70 | 70 | function runMiddlewares($serverRequest) |
71 | 71 | { |
72 | - nextExample(new class implements RequestHandlerInterface{ |
|
72 | + nextExample(new class implements RequestHandlerInterface { |
|
73 | 73 | public function handle(ServerRequestInterface $request): ResponseInterface |
74 | 74 | { |
75 | 75 | return (new Factory())->createResponse(200); |
@@ -79,7 +79,7 @@ discard block |
||
79 | 79 | |
80 | 80 | runMiddlewares($serverRequest); |
81 | 81 | |
82 | -}catch(Exception $er){ |
|
82 | +}catch (Exception $er) { |
|
83 | 83 | |
84 | 84 | die("Code Error: {$er->getCode()}<br>Line: {$er->getLine()}<br>File: {$er->getFile()}<br>Message: {$er->getMessage()}."); |
85 | 85 |
@@ -7,7 +7,7 @@ discard block |
||
7 | 7 | |
8 | 8 | use HnrAzevedo\Router\Router; |
9 | 9 | |
10 | -try{ |
|
10 | +try { |
|
11 | 11 | |
12 | 12 | Router::defineHost('https://localhost'); |
13 | 13 | |
@@ -28,7 +28,7 @@ discard block |
||
28 | 28 | */ |
29 | 29 | $action = Router::currentAction(); |
30 | 30 | |
31 | -}catch(Exception $er){ |
|
31 | +}catch (Exception $er) { |
|
32 | 32 | |
33 | 33 | die("Code Error: {$er->getCode()}<br>Line: {$er->getLine()}<br>File: {$er->getFile()}<br>Message: {$er->getMessage()}."); |
34 | 34 |
@@ -28,7 +28,7 @@ |
||
28 | 28 | */ |
29 | 29 | $action = Router::currentAction(); |
30 | 30 | |
31 | -}catch(Exception $er){ |
|
31 | +} catch(Exception $er){ |
|
32 | 32 | |
33 | 33 | die("Code Error: {$er->getCode()}<br>Line: {$er->getLine()}<br>File: {$er->getFile()}<br>Message: {$er->getMessage()}."); |
34 | 34 |
@@ -1,6 +1,6 @@ discard block |
||
1 | 1 | <?php |
2 | 2 | |
3 | -declare(strict_types = 1); |
|
3 | +declare(strict_types=1); |
|
4 | 4 | |
5 | 5 | namespace HnrAzevedo\Router; |
6 | 6 | |
@@ -54,7 +54,7 @@ discard block |
||
54 | 54 | |
55 | 55 | protected function setRoutes(array $routes): void |
56 | 56 | { |
57 | - $this->routes = $routes; |
|
57 | + $this->routes = $routes; |
|
58 | 58 | } |
59 | 59 | |
60 | 60 | protected function getGroup(): ?string |
@@ -1,6 +1,6 @@ |
||
1 | 1 | <?php |
2 | 2 | |
3 | -declare(strict_types = 1); |
|
3 | +declare(strict_types=1); |
|
4 | 4 | |
5 | 5 | namespace HnrAzevedo\Router; |
6 | 6 |
@@ -1,6 +1,6 @@ discard block |
||
1 | 1 | <?php |
2 | 2 | |
3 | -declare(strict_types = 1); |
|
3 | +declare(strict_types=1); |
|
4 | 4 | |
5 | 5 | namespace HnrAzevedo\Router; |
6 | 6 | |
@@ -19,7 +19,7 @@ discard block |
||
19 | 19 | { |
20 | 20 | $this->hasRouteName($name); |
21 | 21 | |
22 | - if(!$this->loaded()){ |
|
22 | + if (!$this->loaded()) { |
|
23 | 23 | $this->loadIn($name); |
24 | 24 | } |
25 | 25 | |
@@ -28,7 +28,7 @@ discard block |
||
28 | 28 | |
29 | 29 | public function hasCurrentRoute(): void |
30 | 30 | { |
31 | - if(!isset($this->currentRoute)){ |
|
31 | + if (!isset($this->currentRoute)) { |
|
32 | 32 | throw new \RuntimeException('Route not yet loaded'); |
33 | 33 | } |
34 | 34 | } |
@@ -1,6 +1,6 @@ discard block |
||
1 | 1 | <?php |
2 | 2 | |
3 | -declare(strict_types = 1); |
|
3 | +declare(strict_types=1); |
|
4 | 4 | |
5 | 5 | namespace HnrAzevedo\Router; |
6 | 6 | |
@@ -12,7 +12,7 @@ discard block |
||
12 | 12 | |
13 | 13 | protected function sorted(?bool $sorted = null): bool |
14 | 14 | { |
15 | - if(null !== $sorted){ |
|
15 | + if (null !== $sorted) { |
|
16 | 16 | $this->sorted = $sorted; |
17 | 17 | } |
18 | 18 | return $this->sorted; |
@@ -20,35 +20,35 @@ discard block |
||
20 | 20 | |
21 | 21 | protected function sortRoutes(): bool |
22 | 22 | { |
23 | - if($this->sorted()){ |
|
23 | + if ($this->sorted()) { |
|
24 | 24 | return true; |
25 | 25 | } |
26 | 26 | |
27 | 27 | $staticRoutes = []; |
28 | 28 | $paramRoutes = []; |
29 | 29 | |
30 | - foreach($this->getRoutes() as $r => $route){ |
|
30 | + foreach ($this->getRoutes() as $r => $route) { |
|
31 | 31 | |
32 | 32 | $path = urldecode(unserialize($route['uri'])->getPath()); |
33 | 33 | |
34 | - if(strstr($path,'{')){ |
|
35 | - $paramRoutes[$this->getKeyArray(substr_count($path,'/') + substr_count($path,'{'),$paramRoutes)] = $route; |
|
34 | + if (strstr($path, '{')) { |
|
35 | + $paramRoutes[$this->getKeyArray(substr_count($path, '/')+substr_count($path, '{'), $paramRoutes)] = $route; |
|
36 | 36 | continue; |
37 | 37 | } |
38 | 38 | |
39 | - $staticRoutes[$this->getKeyArray(substr_count($path,'/'),$staticRoutes)] = $route; |
|
39 | + $staticRoutes[$this->getKeyArray(substr_count($path, '/'), $staticRoutes)] = $route; |
|
40 | 40 | } |
41 | 41 | |
42 | 42 | rsort($paramRoutes); |
43 | 43 | rsort($staticRoutes); |
44 | 44 | |
45 | - $this->orderRoutes(array_merge($staticRoutes,$paramRoutes)); |
|
45 | + $this->orderRoutes(array_merge($staticRoutes, $paramRoutes)); |
|
46 | 46 | return $this->sorted(true); |
47 | 47 | } |
48 | 48 | |
49 | 49 | private function getKeyArray(int $index, array $array): int |
50 | 50 | { |
51 | - while(array_key_exists($index,$array)){ |
|
51 | + while (array_key_exists($index, $array)) { |
|
52 | 52 | $index++; |
53 | 53 | } |
54 | 54 | return $index; |
@@ -57,8 +57,8 @@ discard block |
||
57 | 57 | private function orderRoutes(array $routes):void |
58 | 58 | { |
59 | 59 | $kRoutes = $routes; |
60 | - foreach($routes as $r => $route){ |
|
61 | - if(array_key_exists('name',$route)){ |
|
60 | + foreach ($routes as $r => $route) { |
|
61 | + if (array_key_exists('name', $route)) { |
|
62 | 62 | unset($kRoutes[$r]); |
63 | 63 | $kRoutes["'{$route['name']}'"] = $route; |
64 | 64 | } |