@@ -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; |
9 | 9 | |
10 | 10 | protected function checkProtocol(string $expected, string $current): bool |
@@ -12,21 +12,21 @@ discard block |
||
12 | 12 | return (strtoupper($expected) === strtoupper($current)); |
13 | 13 | } |
14 | 14 | |
15 | - protected function checkName(string $routeName){ |
|
16 | - if(!array_key_exists($routeName,$this->routers)){ |
|
15 | + protected function checkName(string $routeName) { |
|
16 | + if (!array_key_exists($routeName, $this->routers)) { |
|
17 | 17 | throw new Exception('Page not found.', 404); |
18 | 18 | } |
19 | 19 | } |
20 | 20 | |
21 | - protected function checkTypeRole($role){ |
|
22 | - if(!is_string($role) && @get_class($role) !== 'Closure' ){ |
|
21 | + protected function checkTypeRole($role) { |
|
22 | + if (!is_string($role) && @get_class($role) !== 'Closure') { |
|
23 | 23 | throw new Exception("Improperly defined route track."); |
24 | 24 | } |
25 | 25 | } |
26 | 26 | |
27 | 27 | protected function checkConfig() |
28 | 28 | { |
29 | - if(!defined('ROUTER_CONFIG')){ |
|
29 | + if (!defined('ROUTER_CONFIG')) { |
|
30 | 30 | throw new Exception("Information for loading routes has not been defined."); |
31 | 31 | } |
32 | 32 | } |
@@ -38,12 +38,12 @@ discard block |
||
38 | 38 | |
39 | 39 | protected function checkParameters(array $routeLoop, array $routeRequest): bool |
40 | 40 | { |
41 | - foreach($routeLoop as $rr => $param){ |
|
42 | - if( (substr($param,0,1) === '{') ){ |
|
43 | - $_GET[ substr($param,1,strlen($param)-2) ] = $routeRequest[$rr]; |
|
41 | + foreach ($routeLoop as $rr => $param) { |
|
42 | + if ((substr($param, 0, 1) === '{')) { |
|
43 | + $_GET[substr($param, 1, strlen($param)-2)] = $routeRequest[$rr]; |
|
44 | 44 | } |
45 | 45 | |
46 | - if($this->checkParameter($param, $routeRequest[$rr])){ |
|
46 | + if ($this->checkParameter($param, $routeRequest[$rr])) { |
|
47 | 47 | return false; |
48 | 48 | } |
49 | 49 | } |
@@ -52,22 +52,22 @@ discard block |
||
52 | 52 | |
53 | 53 | protected function checkParameter(string $routeLoop, string $routeRequest) |
54 | 54 | { |
55 | - return !( substr($routeLoop,0,1) === '{' ) and $routeLoop !== $routeRequest; |
|
55 | + return !(substr($routeLoop, 0, 1) === '{') and $routeLoop !== $routeRequest; |
|
56 | 56 | } |
57 | 57 | |
58 | 58 | protected function checkRole() |
59 | 59 | { |
60 | - if(!array_key_exists('role', $this->getData()['POST'])){ |
|
60 | + if (!array_key_exists('role', $this->getData()['POST'])) { |
|
61 | 61 | throw new Exception('O servidor não conseguiu identificar a finalidade deste formulário.'); |
62 | 62 | } |
63 | 63 | } |
64 | 64 | |
65 | 65 | protected function hasProtocol(array $route, string $currentProtocol) |
66 | 66 | { |
67 | - $protocols = ( is_array($route['protocol']) ) ? $route['protocol'] : [ $route['protocol'] ]; |
|
67 | + $protocols = (is_array($route['protocol'])) ? $route['protocol'] : [$route['protocol']]; |
|
68 | 68 | |
69 | - foreach($protocols as $protocol){ |
|
70 | - if(strtoupper($protocol) !== strtoupper($currentProtocol)){ |
|
69 | + foreach ($protocols as $protocol) { |
|
70 | + if (strtoupper($protocol) !== strtoupper($currentProtocol)) { |
|
71 | 71 | continue; |
72 | 72 | } |
73 | 73 | } |
@@ -75,9 +75,9 @@ discard block |
||
75 | 75 | |
76 | 76 | protected function checkToHiking($route, $routeRequest, $routeLoop): bool |
77 | 77 | { |
78 | - if($this->checkNumparams($routeLoop, $routeRequest) || |
|
78 | + if ($this->checkNumparams($routeLoop, $routeRequest) || |
|
79 | 79 | !$this->checkParameters($routeLoop, $routeRequest) || |
80 | - !$this->checkWhere($route, $routeRequest)){ |
|
80 | + !$this->checkWhere($route, $routeRequest)) { |
|
81 | 81 | return false; |
82 | 82 | } |
83 | 83 | return true; |
@@ -85,7 +85,7 @@ discard block |
||
85 | 85 | |
86 | 86 | protected function hasRouteName(string $name): void |
87 | 87 | { |
88 | - if(array_key_exists($name, $this->routers)){ |
|
88 | + if (array_key_exists($name, $this->routers)) { |
|
89 | 89 | throw new Exception("There is already a route with the name {$name} configured."); |
90 | 90 | } |
91 | 91 | } |
@@ -2,11 +2,11 @@ discard block |
||
2 | 2 | |
3 | 3 | namespace HnrAzevedo\Router; |
4 | 4 | |
5 | -trait ExtraJobsTrait{ |
|
5 | +trait ExtraJobsTrait { |
|
6 | 6 | |
7 | 7 | public function before($walking): Router |
8 | 8 | { |
9 | - return $this->setOnRoute($walking,'before'); |
|
9 | + return $this->setOnRoute($walking, 'before'); |
|
10 | 10 | } |
11 | 11 | |
12 | 12 | public static function beforeAll($walking, $except = null): Router |
@@ -14,12 +14,12 @@ discard block |
||
14 | 14 | $excepts = is_array($except) ? $except : [$except]; |
15 | 15 | self::getInstance()->beforeExcepts = $excepts; |
16 | 16 | self::getInstance()->beforeAll = $walking; |
17 | - return self::getInstance()->setOnRoutes($walking,'beforeAll',$excepts); |
|
17 | + return self::getInstance()->setOnRoutes($walking, 'beforeAll', $excepts); |
|
18 | 18 | } |
19 | 19 | |
20 | 20 | public function after($walking): Router |
21 | 21 | { |
22 | - return $this->setOnRoute($walking,'after'); |
|
22 | + return $this->setOnRoute($walking, 'after'); |
|
23 | 23 | } |
24 | 24 | |
25 | 25 | public static function afterAll($walking, $except = null): Router |
@@ -27,17 +27,17 @@ discard block |
||
27 | 27 | $excepts = is_array($except) ? $except : [$except]; |
28 | 28 | self::getInstance()->afterExcepts = $excepts; |
29 | 29 | self::getInstance()->afterAll = $walking; |
30 | - return self::getInstance()->setOnRoutes($walking,'afterAll',$excepts); |
|
30 | + return self::getInstance()->setOnRoutes($walking, 'afterAll', $excepts); |
|
31 | 31 | } |
32 | 32 | |
33 | 33 | private function setOnRoute($walking, string $state): Router |
34 | 34 | { |
35 | - if($this->lastReturn !== null){ |
|
35 | + if ($this->lastReturn !== null) { |
|
36 | 36 | $currentGroup = end($this->routers)['group']; |
37 | 37 | |
38 | 38 | foreach ($this->routers as $key => $value) { |
39 | 39 | |
40 | - if($value['group'] === $currentGroup){ |
|
40 | + if ($value['group'] === $currentGroup) { |
|
41 | 41 | $this->routers[$key][$state] = $walking; |
42 | 42 | } |
43 | 43 | |
@@ -51,8 +51,8 @@ discard block |
||
51 | 51 | |
52 | 52 | private function setOnRoutes($walking, string $state, array $excepts): Router |
53 | 53 | { |
54 | - foreach($this->routers as $r => $route){ |
|
55 | - if(!in_array($this->routers,$excepts)){ |
|
54 | + foreach ($this->routers as $r => $route) { |
|
55 | + if (!in_array($this->routers, $excepts)) { |
|
56 | 56 | $this->routers[$r][$state] = $walking; |
57 | 57 | } |
58 | 58 | } |
@@ -4,18 +4,18 @@ discard block |
||
4 | 4 | |
5 | 5 | use Exception; |
6 | 6 | |
7 | -trait CheckWhere{ |
|
7 | +trait CheckWhere { |
|
8 | 8 | |
9 | 9 | protected function checkWhereParam($data) |
10 | 10 | { |
11 | - if(count($data) === 0){ |
|
11 | + if (count($data) === 0) { |
|
12 | 12 | throw new Exception('It is necessary to define a condition to be tested.'); |
13 | 13 | } |
14 | 14 | } |
15 | 15 | |
16 | 16 | protected function checkWhereParams($params) |
17 | 17 | { |
18 | - if(count($params) === 0){ |
|
18 | + if (count($params) === 0) { |
|
19 | 19 | throw new Exception('The route in question has no parameters to be tested.'); |
20 | 20 | } |
21 | 21 | } |
@@ -24,24 +24,24 @@ discard block |
||
24 | 24 | { |
25 | 25 | $pass = true; |
26 | 26 | |
27 | - if(!is_array($route['where'])){ |
|
27 | + if (!is_array($route['where'])) { |
|
28 | 28 | return $pass; |
29 | 29 | } |
30 | 30 | |
31 | - $routeURI = explode('/',$route['url']); |
|
31 | + $routeURI = explode('/', $route['url']); |
|
32 | 32 | $params = []; |
33 | - foreach($routeURI as $p => $part){ |
|
34 | - if(!$this->isWhered($part,$request[$p])){ |
|
33 | + foreach ($routeURI as $p => $part) { |
|
34 | + if (!$this->isWhered($part, $request[$p])) { |
|
35 | 35 | continue; |
36 | 36 | } |
37 | 37 | |
38 | - $param = substr(str_replace('?','',$part),1,-1); |
|
38 | + $param = substr(str_replace('?', '', $part), 1, -1); |
|
39 | 39 | |
40 | - if(array_key_exists($param,$route['where'])){ |
|
40 | + if (array_key_exists($param, $route['where'])) { |
|
41 | 41 | |
42 | 42 | $params[$param] = $route['where'][$param]; |
43 | 43 | |
44 | - if(!preg_match("/^{$params[$param]}$/",$request[$p])){ |
|
44 | + if (!preg_match("/^{$params[$param]}$/", $request[$p])) { |
|
45 | 45 | $pass = false; |
46 | 46 | } |
47 | 47 | } |
@@ -52,17 +52,17 @@ discard block |
||
52 | 52 | |
53 | 53 | private function isWhered(string $part, string $value): bool |
54 | 54 | { |
55 | - return !$this->isParameter($part) && $this->checkParameterOptional($part,$value); |
|
55 | + return !$this->isParameter($part) && $this->checkParameterOptional($part, $value); |
|
56 | 56 | } |
57 | 57 | |
58 | 58 | private function checkParameterOptional(string $part, string $value): bool |
59 | 59 | { |
60 | - return (strpos($part,'{?') && empty($value)); |
|
60 | + return (strpos($part, '{?') && empty($value)); |
|
61 | 61 | } |
62 | 62 | |
63 | 63 | protected function isParameter(string $part): bool |
64 | 64 | { |
65 | - return (substr($part,0,1) === '{' && substr($part,-1) === '}'); |
|
65 | + return (substr($part, 0, 1) === '{' && substr($part, -1) === '}'); |
|
66 | 66 | } |
67 | 67 | |
68 | 68 | protected function callWhereAdd($data) |
@@ -72,16 +72,16 @@ discard block |
||
72 | 72 | $data = (count($data) > 1) ? [$data[0] => $data[1]] : $data[0]; |
73 | 73 | |
74 | 74 | $route = end($this->routers); |
75 | - $routeURI = explode('/',$route['url']); |
|
75 | + $routeURI = explode('/', $route['url']); |
|
76 | 76 | $params = []; |
77 | - foreach($routeURI as $part){ |
|
78 | - if(!$this->isParameter($part)){ |
|
77 | + foreach ($routeURI as $part) { |
|
78 | + if (!$this->isParameter($part)) { |
|
79 | 79 | continue; |
80 | 80 | } |
81 | 81 | |
82 | - $param = substr(str_replace('?','',$part),1,-1); |
|
82 | + $param = substr(str_replace('?', '', $part), 1, -1); |
|
83 | 83 | |
84 | - if(array_key_exists($param,$data)){ |
|
84 | + if (array_key_exists($param, $data)) { |
|
85 | 85 | $params[$param] = $data[$param]; |
86 | 86 | } |
87 | 87 | |
@@ -89,7 +89,7 @@ discard block |
||
89 | 89 | |
90 | 90 | $this->checkWhereParams($params); |
91 | 91 | |
92 | - $route['where'] = (is_array($route['where'])) ? array_merge($route['where'],$params) : $params; |
|
92 | + $route['where'] = (is_array($route['where'])) ? array_merge($route['where'], $params) : $params; |
|
93 | 93 | |
94 | 94 | $this->routers[count($this->routers)-1] = $route; |
95 | 95 | } |