@@ -95,7 +95,7 @@ |
||
95 | 95 | protected function checkExistence(string $url, string $protocol) |
96 | 96 | { |
97 | 97 | foreach($this->routers as $key => $value){ |
98 | - if( md5($this->prefix . $value['url'] . $value['protocol'] ) === md5( $url . $protocol ) ){ |
|
98 | + if( md5($this->prefix . $value['url'] . $value['protocol'] ) === md5( $url . $protocol ) ){ |
|
99 | 99 | throw new Exception("There is already a route with the url {$url} and with the {$protocol} protocol configured."); |
100 | 100 | } |
101 | 101 | } |
@@ -4,7 +4,7 @@ discard block |
||
4 | 4 | |
5 | 5 | use Exception; |
6 | 6 | |
7 | -trait CheckTrait{ |
|
7 | +trait CheckTrait { |
|
8 | 8 | use FilterTrait, CheckWhere, Helper; |
9 | 9 | |
10 | 10 | protected function checkProtocol(string $expected, string $current): bool |
@@ -14,7 +14,7 @@ discard block |
||
14 | 14 | |
15 | 15 | protected function checkName(string $routeName) |
16 | 16 | { |
17 | - if(!array_key_exists($routeName,$this->routers)){ |
|
17 | + if (!array_key_exists($routeName, $this->routers)) { |
|
18 | 18 | throw new Exception('Page not found.', 404); |
19 | 19 | } |
20 | 20 | return $this; |
@@ -22,7 +22,7 @@ discard block |
||
22 | 22 | |
23 | 23 | protected function checkTypeRole($role) |
24 | 24 | { |
25 | - if(!is_string($role) && @get_class($role) !== 'Closure' ){ |
|
25 | + if (!is_string($role) && @get_class($role) !== 'Closure') { |
|
26 | 26 | throw new Exception("Improperly defined route track."); |
27 | 27 | } |
28 | 28 | return $this; |
@@ -35,12 +35,12 @@ discard block |
||
35 | 35 | |
36 | 36 | protected function checkParameters(array $routeLoop, array $routeRequest): bool |
37 | 37 | { |
38 | - foreach($routeLoop as $rr => $param){ |
|
39 | - if( (substr($param,0,1) === '{') ){ |
|
40 | - $_GET[ substr($param,1,strlen($param)-2) ] = $routeRequest[$rr]; |
|
38 | + foreach ($routeLoop as $rr => $param) { |
|
39 | + if ((substr($param, 0, 1) === '{')) { |
|
40 | + $_GET[substr($param, 1, strlen($param)-2)] = $routeRequest[$rr]; |
|
41 | 41 | } |
42 | 42 | |
43 | - if($this->checkParameter($param, $routeRequest[$rr])){ |
|
43 | + if ($this->checkParameter($param, $routeRequest[$rr])) { |
|
44 | 44 | return false; |
45 | 45 | } |
46 | 46 | } |
@@ -50,12 +50,12 @@ discard block |
||
50 | 50 | |
51 | 51 | protected function checkParameter(string $routeLoop, string $routeRequest): bool |
52 | 52 | { |
53 | - return !( substr($routeLoop,0,1) === '{' ) and $routeLoop !== $routeRequest; |
|
53 | + return !(substr($routeLoop, 0, 1) === '{') and $routeLoop !== $routeRequest; |
|
54 | 54 | } |
55 | 55 | |
56 | 56 | protected function checkRole() |
57 | 57 | { |
58 | - if(!array_key_exists('role', $this->getData()['POST'])){ |
|
58 | + if (!array_key_exists('role', $this->getData()['POST'])) { |
|
59 | 59 | throw new Exception('O servidor não conseguiu identificar a finalidade deste formulário.'); |
60 | 60 | } |
61 | 61 | return $this; |
@@ -63,10 +63,10 @@ discard block |
||
63 | 63 | |
64 | 64 | protected function hasProtocol(array $route, string $currentProtocol) |
65 | 65 | { |
66 | - $protocols = ( is_array($route['protocol']) ) ? $route['protocol'] : [ $route['protocol'] ]; |
|
66 | + $protocols = (is_array($route['protocol'])) ? $route['protocol'] : [$route['protocol']]; |
|
67 | 67 | |
68 | - foreach($protocols as $protocol){ |
|
69 | - if(strtoupper($protocol) !== strtoupper($currentProtocol)){ |
|
68 | + foreach ($protocols as $protocol) { |
|
69 | + if (strtoupper($protocol) !== strtoupper($currentProtocol)) { |
|
70 | 70 | continue; |
71 | 71 | } |
72 | 72 | } |
@@ -76,9 +76,9 @@ discard block |
||
76 | 76 | |
77 | 77 | protected function checkToHiking($route, $routeRequest, $routeLoop): bool |
78 | 78 | { |
79 | - if($this->checkNumparams($routeLoop, $routeRequest) || |
|
79 | + if ($this->checkNumparams($routeLoop, $routeRequest) || |
|
80 | 80 | !$this->checkParameters($routeLoop, $routeRequest) || |
81 | - !$this->checkWhere($route, $routeRequest)){ |
|
81 | + !$this->checkWhere($route, $routeRequest)) { |
|
82 | 82 | return false; |
83 | 83 | } |
84 | 84 | return true; |
@@ -86,7 +86,7 @@ discard block |
||
86 | 86 | |
87 | 87 | protected function hasRouteName(string $name) |
88 | 88 | { |
89 | - if(array_key_exists($name, $this->routers)){ |
|
89 | + if (array_key_exists($name, $this->routers)) { |
|
90 | 90 | throw new Exception("There is already a route with the name {$name} configured."); |
91 | 91 | } |
92 | 92 | return $this; |
@@ -94,8 +94,8 @@ discard block |
||
94 | 94 | |
95 | 95 | protected function checkExistence(string $url, string $protocol) |
96 | 96 | { |
97 | - foreach($this->routers as $key => $value){ |
|
98 | - if( md5($this->prefix . $value['url'] . $value['protocol'] ) === md5( $url . $protocol ) ){ |
|
97 | + foreach ($this->routers as $key => $value) { |
|
98 | + if (md5($this->prefix.$value['url'].$value['protocol']) === md5($url.$protocol)) { |
|
99 | 99 | throw new Exception("There is already a route with the url {$url} and with the {$protocol} protocol configured."); |
100 | 100 | } |
101 | 101 | } |
@@ -104,7 +104,7 @@ discard block |
||
104 | 104 | |
105 | 105 | protected function checkInGroup() |
106 | 106 | { |
107 | - if($this->lastReturn){ |
|
107 | + if ($this->lastReturn) { |
|
108 | 108 | throw new Exception("At the moment it is not allowed to assign names or tests of parameters in groups.."); |
109 | 109 | } |
110 | 110 | return $this; |
@@ -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 | }); |
@@ -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 | } |