@@ -4,13 +4,13 @@ discard block |
||
4 | 4 | |
5 | 5 | use Exception; |
6 | 6 | |
7 | -trait FilterTrait{ |
|
7 | +trait FilterTrait { |
|
8 | 8 | protected function checkFiltering(array $route) |
9 | 9 | { |
10 | - $filters = (is_array($route['filters'])) ? $route['filters'] : [ $route['filters'] ]; |
|
10 | + $filters = (is_array($route['filters'])) ? $route['filters'] : [$route['filters']]; |
|
11 | 11 | |
12 | - foreach($filters as $filter){ |
|
13 | - if(is_null($filter)){ |
|
12 | + foreach ($filters as $filter) { |
|
13 | + if (is_null($filter)) { |
|
14 | 14 | continue; |
15 | 15 | } |
16 | 16 | $this->checkFilter($filter); |
@@ -19,20 +19,20 @@ discard block |
||
19 | 19 | |
20 | 20 | protected function checkFilter(string $filtername) |
21 | 21 | { |
22 | - if(count(explode(':',$filtername)) != 2){ |
|
22 | + if (count(explode(':', $filtername)) != 2) { |
|
23 | 23 | throw new Exception("Wrongly configured filter: {$filtername}."); |
24 | 24 | } |
25 | 25 | |
26 | - $filter = $this->checkFilClassExist(explode(':',$filtername)[0]); |
|
26 | + $filter = $this->checkFilClassExist(explode(':', $filtername)[0]); |
|
27 | 27 | |
28 | - if(!$filter->check(explode(':',$filtername)[1])){ |
|
29 | - throw new Exception($filter->getMessage(explode(':',$filtername)[1]),403); |
|
28 | + if (!$filter->check(explode(':', $filtername)[1])) { |
|
29 | + throw new Exception($filter->getMessage(explode(':', $filtername)[1]), 403); |
|
30 | 30 | } |
31 | 31 | } |
32 | 32 | |
33 | 33 | protected function checkFilClassExist(string $class) |
34 | 34 | { |
35 | - if(class_exists($class)){ |
|
35 | + if (class_exists($class)) { |
|
36 | 36 | return new $class(); |
37 | 37 | } |
38 | 38 | throw new Exception("Filter {$class} not found."); |
@@ -4,11 +4,11 @@ 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 | return $this; |
@@ -16,7 +16,7 @@ discard block |
||
16 | 16 | |
17 | 17 | protected function checkWhereParams($params) |
18 | 18 | { |
19 | - if(count($params) === 0){ |
|
19 | + if (count($params) === 0) { |
|
20 | 20 | throw new Exception('The route in question has no parameters to be tested.'); |
21 | 21 | } |
22 | 22 | return $this; |
@@ -26,24 +26,24 @@ discard block |
||
26 | 26 | { |
27 | 27 | $pass = true; |
28 | 28 | |
29 | - if(!is_array($route['where'])){ |
|
29 | + if (!is_array($route['where'])) { |
|
30 | 30 | return $pass; |
31 | 31 | } |
32 | 32 | |
33 | - $routeURI = explode('/',$route['url']); |
|
33 | + $routeURI = explode('/', $route['url']); |
|
34 | 34 | $params = []; |
35 | - foreach($routeURI as $p => $part){ |
|
36 | - if(!$this->isWhered($part,$request[$p])){ |
|
35 | + foreach ($routeURI as $p => $part) { |
|
36 | + if (!$this->isWhered($part, $request[$p])) { |
|
37 | 37 | continue; |
38 | 38 | } |
39 | 39 | |
40 | - $param = substr(str_replace('?','',$part),1,-1); |
|
40 | + $param = substr(str_replace('?', '', $part), 1, -1); |
|
41 | 41 | |
42 | - if(array_key_exists($param,$route['where'])){ |
|
42 | + if (array_key_exists($param, $route['where'])) { |
|
43 | 43 | |
44 | 44 | $params[$param] = $route['where'][$param]; |
45 | 45 | |
46 | - if(!preg_match("/^{$params[$param]}$/",$request[$p])){ |
|
46 | + if (!preg_match("/^{$params[$param]}$/", $request[$p])) { |
|
47 | 47 | $pass = false; |
48 | 48 | } |
49 | 49 | } |
@@ -54,17 +54,17 @@ discard block |
||
54 | 54 | |
55 | 55 | private function isWhered(string $part, string $value): bool |
56 | 56 | { |
57 | - return $this->isParameter($part) && !$this->checkParameterOptional($part,$value); |
|
57 | + return $this->isParameter($part) && !$this->checkParameterOptional($part, $value); |
|
58 | 58 | } |
59 | 59 | |
60 | 60 | private function checkParameterOptional(string $part, string $value): bool |
61 | 61 | { |
62 | - return substr($part,0,2) === '{?' && empty($value); |
|
62 | + return substr($part, 0, 2) === '{?' && empty($value); |
|
63 | 63 | } |
64 | 64 | |
65 | 65 | protected function isParameter(string $part): bool |
66 | 66 | { |
67 | - return (substr($part,0,1) === '{' && substr($part,-1) === '}'); |
|
67 | + return (substr($part, 0, 1) === '{' && substr($part, -1) === '}'); |
|
68 | 68 | } |
69 | 69 | |
70 | 70 | protected function callWhereAdd($data) |
@@ -74,16 +74,16 @@ discard block |
||
74 | 74 | $data = (count($data) > 1) ? [$data[0] => $data[1]] : $data[0]; |
75 | 75 | |
76 | 76 | $route = end($this->routers); |
77 | - $routeURI = explode('/',$route['url']); |
|
77 | + $routeURI = explode('/', $route['url']); |
|
78 | 78 | $params = []; |
79 | - foreach($routeURI as $part){ |
|
80 | - if(!$this->isParameter($part)){ |
|
79 | + foreach ($routeURI as $part) { |
|
80 | + if (!$this->isParameter($part)) { |
|
81 | 81 | continue; |
82 | 82 | } |
83 | 83 | |
84 | - $param = substr(str_replace('?','',$part),1,-1); |
|
84 | + $param = substr(str_replace('?', '', $part), 1, -1); |
|
85 | 85 | |
86 | - if(array_key_exists($param,$data)){ |
|
86 | + if (array_key_exists($param, $data)) { |
|
87 | 87 | $params[$param] = $data[$param]; |
88 | 88 | } |
89 | 89 | |
@@ -91,7 +91,7 @@ discard block |
||
91 | 91 | |
92 | 92 | $this->checkWhereParams($params); |
93 | 93 | |
94 | - $route['where'] = (is_array($route['where'])) ? array_merge($route['where'],$params) : $params; |
|
94 | + $route['where'] = (is_array($route['where'])) ? array_merge($route['where'], $params) : $params; |
|
95 | 95 | |
96 | 96 | $this->routers[count($this->routers)-1] = $route; |
97 | 97 |
@@ -2,12 +2,12 @@ |
||
2 | 2 | |
3 | 3 | namespace HnrAzevedo\Router; |
4 | 4 | |
5 | -trait DefinitionsTrait{ |
|
5 | +trait DefinitionsTrait { |
|
6 | 6 | private static $instance = null; |
7 | 7 | |
8 | 8 | public static function match(string $protocols, string $uri, $walking) |
9 | 9 | { |
10 | - foreach(explode('|',$protocols) as $protocol){ |
|
10 | + foreach (explode('|', $protocols) as $protocol) { |
|
11 | 11 | self::getInstance()->add($uri, $walking, $protocol); |
12 | 12 | } |
13 | 13 | return self::$instance; |
@@ -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; |
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; |
@@ -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) |
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) |
@@ -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) |
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) |
@@ -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) |
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) |
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 | } |