@@ -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 |
@@ -2,7 +2,7 @@ |
||
2 | 2 | |
3 | 3 | namespace HnrAzevedo\Router\Example\Controllers; |
4 | 4 | |
5 | -class User{ |
|
5 | +class User { |
|
6 | 6 | |
7 | 7 | public function requireLogin($param, $param2): void |
8 | 8 | { |
@@ -14,13 +14,13 @@ discard block |
||
14 | 14 | use HnrAzevedo\Router\Router; |
15 | 15 | use Psr\Http\Server\MiddlewareInterface; |
16 | 16 | |
17 | -try{ |
|
17 | +try { |
|
18 | 18 | $serverRequest = (new Factory())->createServerRequest($_SERVER['REQUEST_METHOD'], new Uri($_SERVER['REQUEST_URI'])); |
19 | 19 | |
20 | - class App implements MiddlewareInterface{ |
|
20 | + class App implements MiddlewareInterface { |
|
21 | 21 | public function process(ServerRequestInterface $request, RequestHandlerInterface $handler): ResponseInterface |
22 | 22 | { |
23 | - if(empty($request->getAttribute('route'))) |
|
23 | + if (empty($request->getAttribute('route'))) |
|
24 | 24 | { |
25 | 25 | throw new Exception('Page not found', 404); |
26 | 26 | } |
@@ -31,7 +31,7 @@ discard block |
||
31 | 31 | } |
32 | 32 | } |
33 | 33 | |
34 | - define('GLOBAL_MIDDLEWARES',[ |
|
34 | + define('GLOBAL_MIDDLEWARES', [ |
|
35 | 35 | Router::class, |
36 | 36 | App::class |
37 | 37 | ]); |
@@ -67,7 +67,7 @@ discard block |
||
67 | 67 | |
68 | 68 | function runMiddlewares($serverRequest) |
69 | 69 | { |
70 | - nextExample(new class implements RequestHandlerInterface{ |
|
70 | + nextExample(new class implements RequestHandlerInterface { |
|
71 | 71 | public function handle(ServerRequestInterface $request): ResponseInterface |
72 | 72 | { |
73 | 73 | return (new Factory())->createResponse(200); |
@@ -77,7 +77,7 @@ discard block |
||
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 |
@@ -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 |
@@ -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 |
@@ -7,26 +7,26 @@ discard block |
||
7 | 7 | /** |
8 | 8 | * Defines a route for the GET method |
9 | 9 | */ |
10 | -Router::get('/foo','\HnrAzevedo\Router\Examples\Controller@method'); |
|
10 | +Router::get('/foo', '\HnrAzevedo\Router\Examples\Controller@method'); |
|
11 | 11 | |
12 | 12 | /** |
13 | 13 | * Defines a route to the GET method with an anonymous function |
14 | 14 | */ |
15 | -Router::get('/bar', function(){ |
|
15 | +Router::get('/bar', function() { |
|
16 | 16 | // |
17 | 17 | }); |
18 | 18 | |
19 | 19 | /** |
20 | 20 | * Defines a route to the POST method with an anonymous function |
21 | 21 | */ |
22 | -Router::post('/bar', function(){ |
|
22 | +Router::post('/bar', function() { |
|
23 | 23 | // |
24 | 24 | }); |
25 | 25 | |
26 | 26 | /** |
27 | 27 | * Defining route for any method |
28 | 28 | */ |
29 | -Router::any('/any', function(){ |
|
29 | +Router::any('/any', function() { |
|
30 | 30 | // |
31 | 31 | }); |
32 | 32 | |
@@ -36,14 +36,14 @@ discard block |
||
36 | 36 | * @param string $route |
37 | 37 | * @param \Closure|string $action |
38 | 38 | */ |
39 | -Router::match('GET|post', '/get_post', function(){ |
|
39 | +Router::match('GET|post', '/get_post', function() { |
|
40 | 40 | // |
41 | 41 | }); |
42 | 42 | |
43 | 43 | /** |
44 | 44 | * Defines the route name |
45 | 45 | */ |
46 | -Router::get('/named', function(){ |
|
46 | +Router::get('/named', function() { |
|
47 | 47 | // |
48 | 48 | })->name('baz'); |
49 | 49 | |
@@ -55,32 +55,32 @@ discard block |
||
55 | 55 | /** |
56 | 56 | * Run before all requests, regardless of error occurrences |
57 | 57 | */ |
58 | -Router::beforeAll(function(){ |
|
58 | +Router::beforeAll(function() { |
|
59 | 59 | // |
60 | 60 | }, null); |
61 | 61 | |
62 | 62 | /** |
63 | 63 | * Run after all requests, regardless of error occurrences |
64 | 64 | */ |
65 | -Router::afterAll(function(){ |
|
65 | +Router::afterAll(function() { |
|
66 | 66 | // |
67 | 67 | }, null); |
68 | 68 | |
69 | 69 | /** |
70 | 70 | * Executes after executing the triggered route action |
71 | 71 | */ |
72 | -Router::get('/after', function(){ |
|
72 | +Router::get('/after', function() { |
|
73 | 73 | // |
74 | -})->after(function(){ |
|
74 | +})->after(function() { |
|
75 | 75 | // |
76 | 76 | }); |
77 | 77 | |
78 | 78 | /** |
79 | 79 | * Executes before executing the triggered route action |
80 | 80 | */ |
81 | -Router::get('/before', function(){ |
|
81 | +Router::get('/before', function() { |
|
82 | 82 | // |
83 | -})->before(function(){ |
|
83 | +})->before(function() { |
|
84 | 84 | // |
85 | 85 | }); |
86 | 86 | /** |
@@ -101,21 +101,21 @@ discard block |
||
101 | 101 | /** |
102 | 102 | * Example of route definition with parameters |
103 | 103 | */ |
104 | -Router::get('/passingParameters/{param}', function($param){ |
|
104 | +Router::get('/passingParameters/{param}', function($param) { |
|
105 | 105 | echo $param; |
106 | 106 | }); |
107 | 107 | |
108 | 108 | /** |
109 | 109 | * Example of setting an optional parameter |
110 | 110 | */ |
111 | -Router::get('/passingParameters/{:optionalParam}', function($optionalParam){ |
|
111 | +Router::get('/passingParameters/{:optionalParam}', function($optionalParam) { |
|
112 | 112 | echo $optionalParam; |
113 | 113 | }); |
114 | 114 | |
115 | 115 | /** |
116 | 116 | * Example of regular expression test for parameters |
117 | 117 | */ |
118 | -Router::get('/testingParameters/{param}', function($param){ |
|
118 | +Router::get('/testingParameters/{param}', function($param) { |
|
119 | 119 | echo $param; |
120 | 120 | })->where([ |
121 | 121 | 'param'=>'[0-9]{1,11}' |
@@ -131,8 +131,8 @@ discard block |
||
131 | 131 | * @param string $prefix |
132 | 132 | * @param \Closure $routeDefinitions |
133 | 133 | */ |
134 | -Router::group('/admin', function(){ |
|
135 | - Router::get('/users/{teste}', function($teste){ |
|
134 | +Router::group('/admin', function() { |
|
135 | + Router::get('/users/{teste}', function($teste) { |
|
136 | 136 | echo $teste; |
137 | 137 | })->where([ |
138 | 138 | 'teste'=>'[a-zA-Z]*' |
@@ -140,13 +140,13 @@ discard block |
||
140 | 140 | }); |
141 | 141 | |
142 | 142 | |
143 | -Router::group('/admin2', function(){ |
|
144 | - Router::get('/users/{teste}', function($teste){ |
|
143 | +Router::group('/admin2', function() { |
|
144 | + Router::get('/users/{teste}', function($teste) { |
|
145 | 145 | echo $teste; |
146 | 146 | })->name('teste'); |
147 | 147 | })->groupWhere([ |
148 | 148 | 'teste'=>'[a-zA-Z]*' |
149 | -],[]); |
|
149 | +], []); |
|
150 | 150 | |
151 | 151 | |
152 | 152 | |
@@ -163,7 +163,7 @@ discard block |
||
163 | 163 | /** |
164 | 164 | * Defining route middleware - implements Psr\Http\Server\MiddlewareInterface |
165 | 165 | */ |
166 | -Router::get('/passingParameters/{:optionalParam}', function($optionalParam = null){ |
|
166 | +Router::get('/passingParameters/{:optionalParam}', function($optionalParam = null) { |
|
167 | 167 | echo $optionalParam; |
168 | 168 | })->middleware([ |
169 | 169 | HnrAzevedo\Router\Example\Middleware\Auth::class |
@@ -172,7 +172,7 @@ discard block |
||
172 | 172 | /** |
173 | 173 | * Defining middleware by nickname |
174 | 174 | */ |
175 | -Router::get('/lasted', function(){ |
|
175 | +Router::get('/lasted', function() { |
|
176 | 176 | // |
177 | 177 | })->middleware([ |
178 | 178 | 'Lasted' |
@@ -182,7 +182,7 @@ discard block |
||
182 | 182 | * Defining multiple middlewares |
183 | 183 | * NOTE: Importantly, the execution follows the same order of definition |
184 | 184 | */ |
185 | -Router::get('/middlewares', function(){ |
|
185 | +Router::get('/middlewares', function() { |
|
186 | 186 | // |
187 | 187 | })->middleware([ |
188 | 188 | HnrAzevedo\Router\Example\Middleware\Auth::class, |
@@ -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,28 +12,28 @@ discard block |
||
12 | 12 | |
13 | 13 | protected function hasRouteName(string $name): void |
14 | 14 | { |
15 | - if(!isset($this->routesName[$name])){ |
|
15 | + if (!isset($this->routesName[$name])) { |
|
16 | 16 | throw new \RuntimeException("There is no route named with {$name}"); |
17 | 17 | } |
18 | 18 | } |
19 | 19 | |
20 | 20 | protected function isInNameGroup(): void |
21 | 21 | { |
22 | - if(!is_null($this->getGroup())){ |
|
22 | + if (!is_null($this->getGroup())) { |
|
23 | 23 | throw new \RuntimeException("It is not allowed to assign names to groups"); |
24 | 24 | } |
25 | 25 | } |
26 | 26 | |
27 | 27 | protected function isInPseudGroup(): void |
28 | 28 | { |
29 | - if(!is_null($this->getGroup())){ |
|
29 | + if (!is_null($this->getGroup())) { |
|
30 | 30 | throw new \RuntimeException("To assign actions before or after the execution of the route, use beforeGroup or afterGroup"); |
31 | 31 | } |
32 | 32 | } |
33 | 33 | |
34 | 34 | protected function existRouteName(string $name): void |
35 | 35 | { |
36 | - if(isset($this->routesName[$name])){ |
|
36 | + if (isset($this->routesName[$name])) { |
|
37 | 37 | throw new \RuntimeException("There is already a route named with {$name}"); |
38 | 38 | } |
39 | 39 | } |
@@ -41,12 +41,12 @@ discard block |
||
41 | 41 | protected function checkMethod(array $route, $method): void |
42 | 42 | { |
43 | 43 | $hasMethod = false; |
44 | - foreach(explode('|',$route['method']) as $routeMethod){ |
|
45 | - if(@preg_match("/{$routeMethod}/",$method) !== 0 || $method === '*'){ |
|
44 | + foreach (explode('|', $route['method']) as $routeMethod) { |
|
45 | + if (@preg_match("/{$routeMethod}/", $method) !== 0 || $method === '*') { |
|
46 | 46 | $hasMethod = true; |
47 | 47 | } |
48 | 48 | } |
49 | - if(!$hasMethod){ |
|
49 | + if (!$hasMethod) { |
|
50 | 50 | throw new \Exception('This route is not released for the accessed method'); |
51 | 51 | } |
52 | 52 |
@@ -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 | |
@@ -13,27 +13,27 @@ discard block |
||
13 | 13 | $staticRoutes = []; |
14 | 14 | $paramRoutes = []; |
15 | 15 | |
16 | - foreach($this->getRoutes() as $r => $route){ |
|
16 | + foreach ($this->getRoutes() as $r => $route) { |
|
17 | 17 | |
18 | 18 | $path = urldecode($route['uri']->getPath()); |
19 | 19 | |
20 | - if(strstr($path,'{')){ |
|
21 | - $paramRoutes[$this->getKeyArray(substr_count($path,'/') + substr_count($path,'{'),$paramRoutes)] = $route; |
|
20 | + if (strstr($path, '{')) { |
|
21 | + $paramRoutes[$this->getKeyArray(substr_count($path, '/')+substr_count($path, '{'), $paramRoutes)] = $route; |
|
22 | 22 | continue; |
23 | 23 | } |
24 | 24 | |
25 | - $staticRoutes[$this->getKeyArray(substr_count($path,'/'),$staticRoutes)] = $route; |
|
25 | + $staticRoutes[$this->getKeyArray(substr_count($path, '/'), $staticRoutes)] = $route; |
|
26 | 26 | } |
27 | 27 | |
28 | 28 | rsort($paramRoutes); |
29 | 29 | rsort($staticRoutes); |
30 | 30 | |
31 | - $this->orderRoutes(array_merge($staticRoutes,$paramRoutes)); |
|
31 | + $this->orderRoutes(array_merge($staticRoutes, $paramRoutes)); |
|
32 | 32 | } |
33 | 33 | |
34 | 34 | private function getKeyArray(int $index, array $array): int |
35 | 35 | { |
36 | - while(array_key_exists($index,$array)){ |
|
36 | + while (array_key_exists($index, $array)) { |
|
37 | 37 | $index++; |
38 | 38 | } |
39 | 39 | return $index; |
@@ -42,8 +42,8 @@ discard block |
||
42 | 42 | private function orderRoutes(array $routes):void |
43 | 43 | { |
44 | 44 | $kRoutes = $routes; |
45 | - foreach($routes as $r => $route){ |
|
46 | - if(array_key_exists('name',$route)){ |
|
45 | + foreach ($routes as $r => $route) { |
|
46 | + if (array_key_exists('name', $route)) { |
|
47 | 47 | unset($kRoutes[$r]); |
48 | 48 | $kRoutes["'{$route['name']}'"] = $route; |
49 | 49 | } |