@@ -3,21 +3,21 @@ |
||
3 | 3 | use HnrAzevedo\Router\Router; |
4 | 4 | |
5 | 5 | /* Returning parameters passed via URL in anonymous functions */ |
6 | -Router::get('/{parameter}/{otherparameter}', function($parameter, $otherparameter){ |
|
6 | +Router::get('/{parameter}/{otherparameter}', function($parameter, $otherparameter) { |
|
7 | 7 | echo "Parameter 1:{$parameter}, Parameter 2:{$otherparameter}."; |
8 | 8 | }); |
9 | 9 | |
10 | 10 | /* Passing controller and/or method via parameter in URL */ |
11 | -Router::get('/{controller}/{method}','{controller}:{method}'); |
|
12 | -Router::get('/{controller}/{method}','{controller}:method'); |
|
11 | +Router::get('/{controller}/{method}', '{controller}:{method}'); |
|
12 | +Router::get('/{controller}/{method}', '{controller}:method'); |
|
13 | 13 | |
14 | 14 | /* Passing value via parameter */ |
15 | -Router::get('/my-account/{teste}','Controller\\User:my_account'); |
|
15 | +Router::get('/my-account/{teste}', 'Controller\\User:my_account'); |
|
16 | 16 | |
17 | 17 | /* Filter example */ |
18 | -Router::get('/my-account','Controller\\User:my_account')->middleware('Filter\\User:user_in'); |
|
18 | +Router::get('/my-account', 'Controller\\User:my_account')->middleware('Filter\\User:user_in'); |
|
19 | 19 | |
20 | 20 | /* Accessed by all protocols */ |
21 | -Router::any('/',function(){ |
|
21 | +Router::any('/', function() { |
|
22 | 22 | // |
23 | 23 | }); |
@@ -4,12 +4,12 @@ discard block |
||
4 | 4 | |
5 | 5 | use Exception; |
6 | 6 | |
7 | -trait CheckWhere{ |
|
7 | +trait CheckWhere { |
|
8 | 8 | protected array $routers = []; |
9 | 9 | |
10 | 10 | protected function checkWhereParam($data) |
11 | 11 | { |
12 | - if(count($data) === 0){ |
|
12 | + if (count($data) === 0) { |
|
13 | 13 | throw new Exception('It is necessary to define a condition to be tested.'); |
14 | 14 | } |
15 | 15 | return $this; |
@@ -17,7 +17,7 @@ discard block |
||
17 | 17 | |
18 | 18 | protected function checkWhereParams($params) |
19 | 19 | { |
20 | - if(count($params) === 0){ |
|
20 | + if (count($params) === 0) { |
|
21 | 21 | throw new Exception('The route in question has no parameters to be tested.'); |
22 | 22 | } |
23 | 23 | return $this; |
@@ -27,24 +27,24 @@ discard block |
||
27 | 27 | { |
28 | 28 | $pass = true; |
29 | 29 | |
30 | - if(!is_array($route['where'])){ |
|
30 | + if (!is_array($route['where'])) { |
|
31 | 31 | return $pass; |
32 | 32 | } |
33 | 33 | |
34 | - $routeURI = explode('/',$route['url']); |
|
34 | + $routeURI = explode('/', $route['url']); |
|
35 | 35 | $params = []; |
36 | - foreach($routeURI as $p => $part){ |
|
37 | - if(!$this->isWhered($part,$request[$p])){ |
|
36 | + foreach ($routeURI as $p => $part) { |
|
37 | + if (!$this->isWhered($part, $request[$p])) { |
|
38 | 38 | continue; |
39 | 39 | } |
40 | 40 | |
41 | - $param = substr(str_replace('?','',$part),1,-1); |
|
41 | + $param = substr(str_replace('?', '', $part), 1, -1); |
|
42 | 42 | |
43 | - if(array_key_exists($param,$route['where'])){ |
|
43 | + if (array_key_exists($param, $route['where'])) { |
|
44 | 44 | |
45 | 45 | $params[$param] = $route['where'][$param]; |
46 | 46 | |
47 | - if(!preg_match("/^{$params[$param]}$/",$request[$p])){ |
|
47 | + if (!preg_match("/^{$params[$param]}$/", $request[$p])) { |
|
48 | 48 | $pass = false; |
49 | 49 | } |
50 | 50 | } |
@@ -55,17 +55,17 @@ discard block |
||
55 | 55 | |
56 | 56 | private function isWhered(string $part, string $value): bool |
57 | 57 | { |
58 | - return $this->isParameter($part) && !$this->checkParameterOptional($part,$value); |
|
58 | + return $this->isParameter($part) && !$this->checkParameterOptional($part, $value); |
|
59 | 59 | } |
60 | 60 | |
61 | 61 | private function checkParameterOptional(string $part, string $value): bool |
62 | 62 | { |
63 | - return substr($part,0,2) === '{?' && empty($value); |
|
63 | + return substr($part, 0, 2) === '{?' && empty($value); |
|
64 | 64 | } |
65 | 65 | |
66 | 66 | protected function isParameter(string $part): bool |
67 | 67 | { |
68 | - return (substr($part,0,1) === '{' && substr($part,-1) === '}'); |
|
68 | + return (substr($part, 0, 1) === '{' && substr($part, -1) === '}'); |
|
69 | 69 | } |
70 | 70 | |
71 | 71 | protected function callWhereAdd($data) |
@@ -75,16 +75,16 @@ discard block |
||
75 | 75 | $data = (count($data) > 1) ? [$data[0] => $data[1]] : $data[0]; |
76 | 76 | |
77 | 77 | $route = end($this->routers); |
78 | - $routeURI = explode('/',$route['url']); |
|
78 | + $routeURI = explode('/', $route['url']); |
|
79 | 79 | $params = []; |
80 | - foreach($routeURI as $part){ |
|
81 | - if(!$this->isParameter($part)){ |
|
80 | + foreach ($routeURI as $part) { |
|
81 | + if (!$this->isParameter($part)) { |
|
82 | 82 | continue; |
83 | 83 | } |
84 | 84 | |
85 | - $param = substr(str_replace('?','',$part),1,-1); |
|
85 | + $param = substr(str_replace('?', '', $part), 1, -1); |
|
86 | 86 | |
87 | - if(array_key_exists($param,$data)){ |
|
87 | + if (array_key_exists($param, $data)) { |
|
88 | 88 | $params[$param] = $data[$param]; |
89 | 89 | } |
90 | 90 | |
@@ -92,7 +92,7 @@ discard block |
||
92 | 92 | |
93 | 93 | $this->checkWhereParams($params); |
94 | 94 | |
95 | - $route['where'] = (is_array($route['where'])) ? array_merge($route['where'],$params) : $params; |
|
95 | + $route['where'] = (is_array($route['where'])) ? array_merge($route['where'], $params) : $params; |
|
96 | 96 | |
97 | 97 | $this->routers[count($this->routers)-1] = $route; |
98 | 98 |
@@ -2,12 +2,12 @@ discard block |
||
2 | 2 | |
3 | 3 | namespace HnrAzevedo\Router; |
4 | 4 | |
5 | -trait ExtraJobsTrait{ |
|
5 | +trait ExtraJobsTrait { |
|
6 | 6 | protected array $routers = []; |
7 | 7 | |
8 | 8 | public function before($walking) |
9 | 9 | { |
10 | - return $this->setOnRoute($walking,'before'); |
|
10 | + return $this->setOnRoute($walking, 'before'); |
|
11 | 11 | } |
12 | 12 | |
13 | 13 | public static function beforeAll($walking, $except = null) |
@@ -15,12 +15,12 @@ discard block |
||
15 | 15 | $excepts = is_array($except) ? $except : [$except]; |
16 | 16 | self::getInstance()->beforeExcepts = $excepts; |
17 | 17 | self::getInstance()->beforeAll = $walking; |
18 | - return self::getInstance()->setOnRoutes($walking,'beforeAll',$excepts); |
|
18 | + return self::getInstance()->setOnRoutes($walking, 'beforeAll', $excepts); |
|
19 | 19 | } |
20 | 20 | |
21 | 21 | public function after($walking) |
22 | 22 | { |
23 | - return $this->setOnRoute($walking,'after'); |
|
23 | + return $this->setOnRoute($walking, 'after'); |
|
24 | 24 | } |
25 | 25 | |
26 | 26 | public static function afterAll($walking, $except = null) |
@@ -28,17 +28,17 @@ discard block |
||
28 | 28 | $excepts = is_array($except) ? $except : [$except]; |
29 | 29 | self::getInstance()->afterExcepts = $excepts; |
30 | 30 | self::getInstance()->afterAll = $walking; |
31 | - return self::getInstance()->setOnRoutes($walking,'afterAll',$excepts); |
|
31 | + return self::getInstance()->setOnRoutes($walking, 'afterAll', $excepts); |
|
32 | 32 | } |
33 | 33 | |
34 | 34 | private function setOnRoute($walking, string $state) |
35 | 35 | { |
36 | - if($this->lastReturn !== null){ |
|
36 | + if ($this->lastReturn !== null) { |
|
37 | 37 | $currentGroup = end($this->routers)['group']; |
38 | 38 | |
39 | 39 | foreach ($this->routers as $key => $value) { |
40 | 40 | |
41 | - if($value['group'] === $currentGroup){ |
|
41 | + if ($value['group'] === $currentGroup) { |
|
42 | 42 | $this->routers[$key][$state] = $walking; |
43 | 43 | } |
44 | 44 | |
@@ -52,8 +52,8 @@ discard block |
||
52 | 52 | |
53 | 53 | private function setOnRoutes($walking, string $state, array $excepts) |
54 | 54 | { |
55 | - foreach($this->routers as $r => $route){ |
|
56 | - if(!in_array($this->routers,$excepts)){ |
|
55 | + foreach ($this->routers as $r => $route) { |
|
56 | + if (!in_array($this->routers, $excepts)) { |
|
57 | 57 | $this->routers[$r][$state] = $walking; |
58 | 58 | } |
59 | 59 | } |