@@ -217,7 +217,7 @@ |
||
217 | 217 | foreach ($route['filters'] as $key => $value) { |
218 | 218 | $filters[] = $value; |
219 | 219 | } |
220 | - }else{ |
|
220 | + } else{ |
|
221 | 221 | $filters[] = $route['filters']; |
222 | 222 | } |
223 | 223 |
@@ -71,26 +71,26 @@ discard block |
||
71 | 71 | |
72 | 72 | public function set($url ,$walking , string $protocol): Router |
73 | 73 | { |
74 | - $url = (substr($url,0,1) !=='/' and strlen($url) > 0) ? "/{$url}" : $url; |
|
74 | + $url = (substr($url,0,1) !=='/' and strlen($url) > 0) ? "/{$url}" : $url; |
|
75 | 75 | |
76 | - foreach($this->routers as $key => $value){ |
|
77 | - if( md5($this->prefix . $value['url'] . $value['protocol'] ) === md5( $url . $protocol ) ){ |
|
76 | + foreach($this->routers as $key => $value){ |
|
77 | + if( md5($this->prefix . $value['url'] . $value['protocol'] ) === md5( $url . $protocol ) ){ |
|
78 | 78 | throw new Exception("There is already a route with the url {$url} and with the {$protocol} protocol configured."); |
79 | 79 | } |
80 | 80 | } |
81 | 81 | |
82 | 82 | $this->checkTypeRole($walking); |
83 | 83 | |
84 | - $route = [ |
|
85 | - 'url' => $this->prefix.$url, |
|
86 | - 'role' => $walking, |
|
87 | - 'protocol' => $protocol, |
|
84 | + $route = [ |
|
85 | + 'url' => $this->prefix.$url, |
|
86 | + 'role' => $walking, |
|
87 | + 'protocol' => $protocol, |
|
88 | 88 | 'filters' => null, |
89 | 89 | 'where' => null, |
90 | 90 | 'group' => self::getInstance()->group |
91 | - ]; |
|
91 | + ]; |
|
92 | 92 | |
93 | - $this->routers[] = $route; |
|
93 | + $this->routers[] = $route; |
|
94 | 94 | |
95 | 95 | return self::getInstance(); |
96 | 96 | } |
@@ -189,7 +189,7 @@ discard block |
||
189 | 189 | |
190 | 190 | $instance->getInstance()->byName($routeName); |
191 | 191 | |
192 | - $currentProtocol = $instance->getInstance()->getProtocol(); |
|
192 | + $currentProtocol = $instance->getInstance()->getProtocol(); |
|
193 | 193 | |
194 | 194 | foreach(array_reverse($instance->getInstance()->routers) as $r => $route){ |
195 | 195 | |
@@ -207,7 +207,7 @@ discard block |
||
207 | 207 | |
208 | 208 | $routeRequest = $instance->getInstance()->explodeRoute((substr($_SERVER['REQUEST_URI'],strlen($_SERVER['REQUEST_URI'])-1,1) === '/') , $_SERVER['REQUEST_URI']); |
209 | 209 | |
210 | - if($instance->getInstance()->checkNumparams($routeLoop, $routeRequest) || !$instance->getInstance()->checkParameters($routeLoop, $routeRequest)){ |
|
210 | + if($instance->getInstance()->checkNumparams($routeLoop, $routeRequest) || !$instance->getInstance()->checkParameters($routeLoop, $routeRequest)){ |
|
211 | 211 | continue; |
212 | 212 | } |
213 | 213 | |
@@ -223,7 +223,7 @@ discard block |
||
223 | 223 | |
224 | 224 | $instance->getInstance()->currentRoute = null; |
225 | 225 | |
226 | - throw new Exception('Page not found.',404); |
|
226 | + throw new Exception('Page not found.',404); |
|
227 | 227 | } |
228 | 228 | |
229 | 229 | public static function filter($filters): Router |
@@ -4,7 +4,7 @@ discard block |
||
4 | 4 | |
5 | 5 | use Exception; |
6 | 6 | |
7 | -class Router{ |
|
7 | +class Router { |
|
8 | 8 | use Helper, CheckTrait, CheckWhere; |
9 | 9 | |
10 | 10 | private static $instance = null; |
@@ -21,7 +21,7 @@ discard block |
||
21 | 21 | |
22 | 22 | public static function create(): Router |
23 | 23 | { |
24 | - if(!self::getInstance()->instanced){ |
|
24 | + if (!self::getInstance()->instanced) { |
|
25 | 25 | self::getInstance()->checkConfig(); |
26 | 26 | self::getInstance()->import(ROUTER_CONFIG['path']); |
27 | 27 | self::getInstance()->instanced = true; |
@@ -69,12 +69,12 @@ discard block |
||
69 | 69 | return self::getInstance()->set($uri, $walking, $protocol); |
70 | 70 | } |
71 | 71 | |
72 | - public function set($url ,$walking , string $protocol): Router |
|
72 | + public function set($url, $walking, string $protocol): Router |
|
73 | 73 | { |
74 | - $url = (substr($url,0,1) !=='/' and strlen($url) > 0) ? "/{$url}" : $url; |
|
74 | + $url = (substr($url, 0, 1) !== '/' and strlen($url) > 0) ? "/{$url}" : $url; |
|
75 | 75 | |
76 | - foreach($this->routers as $key => $value){ |
|
77 | - if( md5($this->prefix . $value['url'] . $value['protocol'] ) === md5( $url . $protocol ) ){ |
|
76 | + foreach ($this->routers as $key => $value) { |
|
77 | + if (md5($this->prefix.$value['url'].$value['protocol']) === md5($url.$protocol)) { |
|
78 | 78 | throw new Exception("There is already a route with the url {$url} and with the {$protocol} protocol configured."); |
79 | 79 | } |
80 | 80 | } |
@@ -95,9 +95,9 @@ discard block |
||
95 | 95 | return self::getInstance(); |
96 | 96 | } |
97 | 97 | |
98 | - public static function group(string $prefix,$callback): Router |
|
98 | + public static function group(string $prefix, $callback): Router |
|
99 | 99 | { |
100 | - self::getInstance()->prefix = (substr($prefix,0,1) !== '/') ? "/{$prefix}" : $prefix; |
|
100 | + self::getInstance()->prefix = (substr($prefix, 0, 1) !== '/') ? "/{$prefix}" : $prefix; |
|
101 | 101 | self::getInstance()->group = sha1(date('d/m/Y h:m:i')); |
102 | 102 | $callback(); |
103 | 103 | self::getInstance()->group = null; |
@@ -108,7 +108,7 @@ discard block |
||
108 | 108 | |
109 | 109 | public static function where(): Router |
110 | 110 | { |
111 | - if(self::getInstance()->lastReturn){ |
|
111 | + if (self::getInstance()->lastReturn) { |
|
112 | 112 | throw new Exception("It is not possible to define parameter tests for groups of routes."); |
113 | 113 | } |
114 | 114 | |
@@ -119,13 +119,13 @@ discard block |
||
119 | 119 | $data = (count($data) > 1) ? [$data[0] => $data[1]] : $data[0]; |
120 | 120 | |
121 | 121 | $route = end(self::getInstance()->routers); |
122 | - $routeURI = explode('/',$route['url']); |
|
122 | + $routeURI = explode('/', $route['url']); |
|
123 | 123 | $params = []; |
124 | - foreach($routeURI as $part){ |
|
125 | - if(substr($part,0,1) === '{' && substr($part,-1) === '}'){ |
|
126 | - $param = substr($part,1,-1); |
|
124 | + foreach ($routeURI as $part) { |
|
125 | + if (substr($part, 0, 1) === '{' && substr($part, -1) === '}') { |
|
126 | + $param = substr($part, 1, -1); |
|
127 | 127 | |
128 | - self::getInstance()->checkExistParam($param,$data); |
|
128 | + self::getInstance()->checkExistParam($param, $data); |
|
129 | 129 | |
130 | 130 | $params[$param] = $data[$param]; |
131 | 131 | } |
@@ -133,7 +133,7 @@ discard block |
||
133 | 133 | |
134 | 134 | self::getInstance()->checkWhereParams($params); |
135 | 135 | |
136 | - $route['where'] = (is_array($route['where'])) ? array_merge($route['where'],$params) : $params; |
|
136 | + $route['where'] = (is_array($route['where'])) ? array_merge($route['where'], $params) : $params; |
|
137 | 137 | |
138 | 138 | self::getInstance()->routers[count(self::getInstance()->routers)-1] = $route; |
139 | 139 | |
@@ -142,14 +142,14 @@ discard block |
||
142 | 142 | |
143 | 143 | public static function name(string $name): Router |
144 | 144 | { |
145 | - if(self::getInstance()->lastReturn){ |
|
145 | + if (self::getInstance()->lastReturn) { |
|
146 | 146 | throw new Exception("There is no reason to call a {$name} route group."); |
147 | 147 | } |
148 | 148 | |
149 | 149 | $currentRoute = end(self::getInstance()->routers); |
150 | 150 | |
151 | - foreach(self::getInstance()->routers as $key => $value){ |
|
152 | - if(array_key_exists($name, self::getInstance()->routers)){ |
|
151 | + foreach (self::getInstance()->routers as $key => $value) { |
|
152 | + if (array_key_exists($name, self::getInstance()->routers)) { |
|
153 | 153 | throw new Exception("There is already a route with the name {$name} configured."); |
154 | 154 | } |
155 | 155 | } |
@@ -165,15 +165,15 @@ discard block |
||
165 | 165 | |
166 | 166 | private function byName(?string $routName) |
167 | 167 | { |
168 | - if(!is_null($routName)){ |
|
168 | + if (!is_null($routName)) { |
|
169 | 169 | $currentProtocol = $this->getProtocol(); |
170 | 170 | |
171 | 171 | $this->checkName($routName); |
172 | 172 | |
173 | 173 | $route = $this->routers[$routName]; |
174 | 174 | |
175 | - if(!$this->checkProtocol($route['protocol'], $currentProtocol)){ |
|
176 | - throw new Exception('Page not found.',404); |
|
175 | + if (!$this->checkProtocol($route['protocol'], $currentProtocol)) { |
|
176 | + throw new Exception('Page not found.', 404); |
|
177 | 177 | } |
178 | 178 | |
179 | 179 | $this->checkFiltering($route); |
@@ -191,27 +191,27 @@ discard block |
||
191 | 191 | |
192 | 192 | $currentProtocol = $instance->getInstance()->getProtocol(); |
193 | 193 | |
194 | - foreach(array_reverse($instance->getInstance()->routers) as $r => $route){ |
|
194 | + foreach (array_reverse($instance->getInstance()->routers) as $r => $route) { |
|
195 | 195 | |
196 | 196 | $instance->getInstance()->currentRoute = $route; |
197 | 197 | |
198 | - if(!$instance->getInstance()->checkProtocol($route['protocol'], $currentProtocol)){ |
|
198 | + if (!$instance->getInstance()->checkProtocol($route['protocol'], $currentProtocol)) { |
|
199 | 199 | continue; |
200 | 200 | } |
201 | 201 | |
202 | 202 | $instance->getInstance()->hasProtocol($route, $currentProtocol); |
203 | 203 | |
204 | - $routeLoop = $instance->getInstance()->explodeRoute( (substr($route['url'],strlen($route['url'])-1,1) === '/') , $route['url']); |
|
204 | + $routeLoop = $instance->getInstance()->explodeRoute((substr($route['url'], strlen($route['url'])-1, 1) === '/'), $route['url']); |
|
205 | 205 | |
206 | 206 | $_SERVER['REQUEST_URI'] = (array_key_exists('REQUEST_URI', $_SERVER)) ? $_SERVER['REQUEST_URI'] : ''; |
207 | 207 | |
208 | - $routeRequest = $instance->getInstance()->explodeRoute((substr($_SERVER['REQUEST_URI'],strlen($_SERVER['REQUEST_URI'])-1,1) === '/') , $_SERVER['REQUEST_URI']); |
|
208 | + $routeRequest = $instance->getInstance()->explodeRoute((substr($_SERVER['REQUEST_URI'], strlen($_SERVER['REQUEST_URI'])-1, 1) === '/'), $_SERVER['REQUEST_URI']); |
|
209 | 209 | |
210 | - if($instance->getInstance()->checkNumparams($routeLoop, $routeRequest) || !$instance->getInstance()->checkParameters($routeLoop, $routeRequest)){ |
|
210 | + if ($instance->getInstance()->checkNumparams($routeLoop, $routeRequest) || !$instance->getInstance()->checkParameters($routeLoop, $routeRequest)) { |
|
211 | 211 | continue; |
212 | 212 | } |
213 | 213 | |
214 | - if($instance->getInstance()->checkWhere($route, $routeRequest)){ |
|
214 | + if ($instance->getInstance()->checkWhere($route, $routeRequest)) { |
|
215 | 215 | |
216 | 216 | $instance->getInstance()->checkFiltering($route); |
217 | 217 | |
@@ -223,18 +223,18 @@ discard block |
||
223 | 223 | |
224 | 224 | $instance->getInstance()->currentRoute = null; |
225 | 225 | |
226 | - throw new Exception('Page not found.',404); |
|
226 | + throw new Exception('Page not found.', 404); |
|
227 | 227 | } |
228 | 228 | |
229 | 229 | public static function filter($filters): Router |
230 | 230 | { |
231 | - if(self::getInstance()->lastReturn !== null){ |
|
231 | + if (self::getInstance()->lastReturn !== null) { |
|
232 | 232 | $currentGroup = end(self::getInstance()->routers)['group']; |
233 | 233 | |
234 | 234 | foreach (self::getInstance()->routers as $key => $value) { |
235 | 235 | |
236 | - if($value['group'] === $currentGroup){ |
|
237 | - $currentRoute = self::getInstance()->addFilter(self::getInstance()->routers[$key],$filters); |
|
236 | + if ($value['group'] === $currentGroup) { |
|
237 | + $currentRoute = self::getInstance()->addFilter(self::getInstance()->routers[$key], $filters); |
|
238 | 238 | self::getInstance()->routers[$key] = $currentRoute; |
239 | 239 | } |
240 | 240 | |
@@ -245,24 +245,24 @@ discard block |
||
245 | 245 | return self::getInstance(); |
246 | 246 | } |
247 | 247 | |
248 | - self::getInstance()->routers[count(self::getInstance()->routers)-1] = self::getInstance()->addFilter(end(self::getInstance()->routers),$filters); |
|
248 | + self::getInstance()->routers[count(self::getInstance()->routers)-1] = self::getInstance()->addFilter(end(self::getInstance()->routers), $filters); |
|
249 | 249 | return self::getInstance(); |
250 | 250 | } |
251 | 251 | |
252 | 252 | public static function addFilter(array $route, $filter): array |
253 | 253 | { |
254 | - if(is_null($route['filters'])){ |
|
254 | + if (is_null($route['filters'])) { |
|
255 | 255 | $route['filters'] = $filter; |
256 | 256 | return $route; |
257 | 257 | } |
258 | 258 | |
259 | 259 | $filters = (is_array($filter)) ? $filter : [0 => $filter]; |
260 | 260 | |
261 | - if(is_array($route['filters'])){ |
|
261 | + if (is_array($route['filters'])) { |
|
262 | 262 | foreach ($route['filters'] as $key => $value) { |
263 | 263 | $filters[] = $value; |
264 | 264 | } |
265 | - }else{ |
|
265 | + }else { |
|
266 | 266 | $filters[] = $route['filters']; |
267 | 267 | } |
268 | 268 |
@@ -9,7 +9,7 @@ discard block |
||
9 | 9 | |
10 | 10 | /* NOTE: in case of error an exception is thrown */ |
11 | 11 | |
12 | -try{ |
|
12 | +try { |
|
13 | 13 | |
14 | 14 | Router::dispatch(); |
15 | 15 | |
@@ -20,7 +20,7 @@ discard block |
||
20 | 20 | /* Return current action route */ |
21 | 21 | $action = Router::currentRouteAction(); |
22 | 22 | |
23 | -}catch(Exception $er){ |
|
23 | +}catch (Exception $er) { |
|
24 | 24 | |
25 | 25 | die("Code Error: {$er->getCode()}, Line: {$er->getLine()}, File: {$er->getFile()}, Message: {$er->getMessage()}."); |
26 | 26 |
@@ -20,7 +20,7 @@ |
||
20 | 20 | /* Return current action route */ |
21 | 21 | $action = Router::currentRouteAction(); |
22 | 22 | |
23 | -}catch(Exception $er){ |
|
23 | +} catch(Exception $er){ |
|
24 | 24 | |
25 | 25 | die("Code Error: {$er->getCode()}, Line: {$er->getLine()}, File: {$er->getFile()}, Message: {$er->getMessage()}."); |
26 | 26 |
@@ -4,7 +4,7 @@ |
||
4 | 4 | |
5 | 5 | use HnrAzevedo\Router\Controller; |
6 | 6 | |
7 | -class User extends Controller{ |
|
7 | +class User extends Controller { |
|
8 | 8 | |
9 | 9 | public function requereLogin($username, $password): void |
10 | 10 | { |
@@ -4,15 +4,15 @@ |
||
4 | 4 | |
5 | 5 | use HnrAzevedo\Filter\Filter as HnrFilter; |
6 | 6 | |
7 | -class User extends HnrFilter{ |
|
7 | +class User extends HnrFilter { |
|
8 | 8 | |
9 | 9 | public function user_in(): bool |
10 | 10 | { |
11 | - $this->addMessage('user_in','User required to be logged in.'); |
|
11 | + $this->addMessage('user_in', 'User required to be logged in.'); |
|
12 | 12 | |
13 | - $this->addTreat('user_in','report_notLogged'); |
|
13 | + $this->addTreat('user_in', 'report_notLogged'); |
|
14 | 14 | |
15 | - return (array_key_exists('user',$_SESSION)); |
|
15 | + return (array_key_exists('user', $_SESSION)); |
|
16 | 16 | } |
17 | 17 | |
18 | 18 | public function report_notLogged(): void |
@@ -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}','User:my_account'); |
|
15 | +Router::get('/my-account/{teste}', 'User:my_account'); |
|
16 | 16 | |
17 | 17 | /* Filter example */ |
18 | -Router::get('/my-account','User:my_account')->filter('User:user_in'); |
|
18 | +Router::get('/my-account', 'User:my_account')->filter('User:user_in'); |
|
19 | 19 | |
20 | 20 | /* Accessed by all protocols */ |
21 | -Router::any('/',function(){ |
|
21 | +Router::any('/', function() { |
|
22 | 22 | // |
23 | 23 | }); |
@@ -60,7 +60,7 @@ |
||
60 | 60 | |
61 | 61 | if( ($this->getProtocol() == 'form') ){ |
62 | 62 | $this->ControllerForm($controller, $method, $data['POST']); |
63 | - }else { |
|
63 | + } else { |
|
64 | 64 | $data = (array_key_exists('data',$data['POST'])) ? json_decode($data['POST']['data'], true) : $data['GET']; |
65 | 65 | call_user_func_array([$controller,$method], $data); |
66 | 66 | } |
@@ -50,7 +50,7 @@ |
||
50 | 50 | } |
51 | 51 | |
52 | 52 | protected function ControllerForm($controller, string $method, array $values){ |
53 | - $this->checkRole(); |
|
53 | + $this->checkRole(); |
|
54 | 54 | $method = ($method !== 'method') ? $method : $this->getData()['POST']['role']; |
55 | 55 | $data = (array_key_exists('data',$values)) ? json_decode($values['data'], true) : null; |
56 | 56 |
@@ -2,7 +2,7 @@ discard block |
||
2 | 2 | |
3 | 3 | namespace HnrAzevedo\Router; |
4 | 4 | |
5 | -trait Helper{ |
|
5 | +trait Helper { |
|
6 | 6 | use CheckTrait, ControllerTrait; |
7 | 7 | |
8 | 8 | private $currentRoute = null; |
@@ -25,7 +25,7 @@ discard block |
||
25 | 25 | protected function getProtocol(): string |
26 | 26 | { |
27 | 27 | $protocol = ((isset($_SERVER['HTTP_X_REQUESTED_WITH']) && strtolower($_SERVER['HTTP_X_REQUESTED_WITH']) == 'xmlhttprequest')) ? 'ajax' : 'get'; |
28 | - $protocol = (array_key_existS('HTTP_REQUESTED_METHOD',$_SERVER)) ? strtolower($_SERVER['HTTP_REQUESTED_METHOD']) : $protocol; |
|
28 | + $protocol = (array_key_existS('HTTP_REQUESTED_METHOD', $_SERVER)) ? strtolower($_SERVER['HTTP_REQUESTED_METHOD']) : $protocol; |
|
29 | 29 | |
30 | 30 | return $protocol; |
31 | 31 | } |
@@ -43,18 +43,18 @@ discard block |
||
43 | 43 | protected function import(string $path) |
44 | 44 | { |
45 | 45 | foreach (scandir($path) as $routeFile) { |
46 | - if(pathinfo($path.DIRECTORY_SEPARATOR.$routeFile, PATHINFO_EXTENSION) === 'php'){ |
|
47 | - require_once($path. DIRECTORY_SEPARATOR .$routeFile); |
|
46 | + if (pathinfo($path.DIRECTORY_SEPARATOR.$routeFile, PATHINFO_EXTENSION) === 'php') { |
|
47 | + require_once($path.DIRECTORY_SEPARATOR.$routeFile); |
|
48 | 48 | } |
49 | 49 | } |
50 | 50 | } |
51 | 51 | |
52 | - protected function ControllerForm($controller, string $method, array $values){ |
|
52 | + protected function ControllerForm($controller, string $method, array $values) { |
|
53 | 53 | $this->checkRole(); |
54 | 54 | $method = ($method !== 'method') ? $method : $this->getData()['POST']['role']; |
55 | - $data = (array_key_exists('data',$values)) ? json_decode($values['data'], true) : null; |
|
55 | + $data = (array_key_exists('data', $values)) ? json_decode($values['data'], true) : null; |
|
56 | 56 | |
57 | - call_user_func_array([$controller,$method], $data); |
|
57 | + call_user_func_array([$controller, $method], $data); |
|
58 | 58 | } |
59 | 59 | |
60 | 60 | protected function Controller(string $controll): void |
@@ -62,7 +62,7 @@ discard block |
||
62 | 62 | $data = $this->getData(); |
63 | 63 | |
64 | 64 | foreach ($data['GET'] as $name => $value) { |
65 | - $controll = str_replace('{'.$name.'}',$value,$controll); |
|
65 | + $controll = str_replace('{'.$name.'}', $value, $controll); |
|
66 | 66 | } |
67 | 67 | |
68 | 68 | $this->checkControllsettable($controll); |
@@ -71,32 +71,32 @@ discard block |
||
71 | 71 | |
72 | 72 | $this->checkControllmethod($controll); |
73 | 73 | |
74 | - $controller = ROUTER_CONFIG['controller.namespace'].'\\'. ucfirst(explode(':',$controll)[0]); |
|
74 | + $controller = ROUTER_CONFIG['controller.namespace'].'\\'.ucfirst(explode(':', $controll)[0]); |
|
75 | 75 | $controller = new $controller(); |
76 | - $method = explode(':',$controll)[1]; |
|
76 | + $method = explode(':', $controll)[1]; |
|
77 | 77 | |
78 | - if( ($this->getProtocol() == 'form') ){ |
|
78 | + if (($this->getProtocol() == 'form')) { |
|
79 | 79 | $this->ControllerForm($controller, $method, $data['POST']); |
80 | 80 | }else { |
81 | - $data = (array_key_exists('data',$data['POST'])) ? json_decode($data['POST']['data'], true) : $data['GET']; |
|
82 | - call_user_func_array([$controller,$method], $data); |
|
81 | + $data = (array_key_exists('data', $data['POST'])) ? json_decode($data['POST']['data'], true) : $data['GET']; |
|
82 | + call_user_func_array([$controller, $method], $data); |
|
83 | 83 | } |
84 | 84 | |
85 | 85 | } |
86 | 86 | |
87 | 87 | protected function explodeRoute(bool $bar, string $url): array |
88 | 88 | { |
89 | - return explode( '/', $bar ? substr($url, 0, -1) : $url ); |
|
89 | + return explode('/', $bar ? substr($url, 0, -1) : $url); |
|
90 | 90 | } |
91 | 91 | |
92 | 92 | protected function toHiking($walking) |
93 | 93 | { |
94 | - if(is_string($walking)){ |
|
94 | + if (is_string($walking)) { |
|
95 | 95 | $this->Controller($walking); |
96 | 96 | return true; |
97 | 97 | } |
98 | 98 | |
99 | - call_user_func_array($walking,$this->getData()['GET']); |
|
99 | + call_user_func_array($walking, $this->getData()['GET']); |
|
100 | 100 | } |
101 | 101 | |
102 | 102 | } |
@@ -4,28 +4,28 @@ |
||
4 | 4 | |
5 | 5 | use Exception; |
6 | 6 | |
7 | -trait ControllerTrait{ |
|
7 | +trait ControllerTrait { |
|
8 | 8 | |
9 | 9 | protected function checkControllsettable(string $controll) |
10 | 10 | { |
11 | - if(count(explode(':',$controll)) != 2){ |
|
11 | + if (count(explode(':', $controll)) != 2) { |
|
12 | 12 | throw new Exception("Controller {$controll} badly set."); |
13 | 13 | } |
14 | 14 | } |
15 | 15 | |
16 | 16 | protected function checkControllexist(string $controll) |
17 | 17 | { |
18 | - $controllname = ROUTER_CONFIG['controller.namespace'].'\\'.ucfirst(explode(':',$controll)[0]); |
|
19 | - if(!class_exists($controllname)){ |
|
18 | + $controllname = ROUTER_CONFIG['controller.namespace'].'\\'.ucfirst(explode(':', $controll)[0]); |
|
19 | + if (!class_exists($controllname)) { |
|
20 | 20 | throw new Exception("No controller {$controllname} found."); |
21 | 21 | } |
22 | 22 | } |
23 | 23 | |
24 | 24 | protected function checkControllmethod(string $controll) |
25 | 25 | { |
26 | - $controllname = ROUTER_CONFIG['controller.namespace'].'\\'.ucfirst(explode(':',$controll)[0]); |
|
27 | - $method = explode(':',$controll)[1]; |
|
28 | - if(!method_exists($controllname, $method)){ |
|
26 | + $controllname = ROUTER_CONFIG['controller.namespace'].'\\'.ucfirst(explode(':', $controll)[0]); |
|
27 | + $method = explode(':', $controll)[1]; |
|
28 | + if (!method_exists($controllname, $method)) { |
|
29 | 29 | throw new Exception("No method {$method} found for {$controllname}."); |
30 | 30 | } |
31 | 31 | } |
@@ -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(ROUTER_CONFIG['filter.namespace']."\\{$class}")){ |
|
35 | + if (class_exists(ROUTER_CONFIG['filter.namespace']."\\{$class}")) { |
|
36 | 36 | $filter = ROUTER_CONFIG['filter.namespace']."\\{$class}"; |
37 | 37 | return new $filter(); |
38 | 38 | } |
@@ -4,7 +4,7 @@ discard block |
||
4 | 4 | |
5 | 5 | use Exception; |
6 | 6 | |
7 | -trait CheckTrait{ |
|
7 | +trait CheckTrait { |
|
8 | 8 | use FilterTrait; |
9 | 9 | |
10 | 10 | protected function checkProtocol(string $expected, string $current): bool |
@@ -12,21 +12,21 @@ discard block |
||
12 | 12 | return ($expected === $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($protocol !== $currentProtocol){ |
|
69 | + foreach ($protocols as $protocol) { |
|
70 | + if ($protocol !== $currentProtocol) { |
|
71 | 71 | continue; |
72 | 72 | } |
73 | 73 | } |