@@ -7,11 +7,11 @@ |
||
7 | 7 | |
8 | 8 | /* NOTE: in case of error an exception is thrown */ |
9 | 9 | |
10 | -try{ |
|
10 | +try { |
|
11 | 11 | |
12 | 12 | Router::create()->dispatch(); |
13 | 13 | |
14 | -}catch(Exception $er){ |
|
14 | +}catch (Exception $er) { |
|
15 | 15 | |
16 | 16 | die("Code Error: {$er->getCode()}, Line: {$er->getLine()}, File: {$er->getFile()}, Message: {$er->getMessage()}."); |
17 | 17 |
@@ -4,31 +4,31 @@ 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 check_protocol(string $expected, string $current) |
11 | 11 | { |
12 | - if($expected !== $current){ |
|
13 | - throw new Exception('Page not found.',404); |
|
12 | + if ($expected !== $current) { |
|
13 | + throw new Exception('Page not found.', 404); |
|
14 | 14 | } |
15 | 15 | } |
16 | 16 | |
17 | - protected function check_name(string $route_name){ |
|
18 | - if(!array_key_exists($route_name,$this->routers)){ |
|
19 | - throw new Exception('Page not found.',404); |
|
17 | + protected function check_name(string $route_name) { |
|
18 | + if (!array_key_exists($route_name, $this->routers)) { |
|
19 | + throw new Exception('Page not found.', 404); |
|
20 | 20 | } |
21 | 21 | } |
22 | 22 | |
23 | - protected function check_typeRole($role){ |
|
24 | - if(!is_string($role) && @get_class($role) !== 'Closure' ){ |
|
23 | + protected function check_typeRole($role) { |
|
24 | + if (!is_string($role) && @get_class($role) !== 'Closure') { |
|
25 | 25 | throw new Exception("Improperly defined route track."); |
26 | 26 | } |
27 | 27 | } |
28 | 28 | |
29 | 29 | protected function check_config() |
30 | 30 | { |
31 | - if(!defined('ROUTER_CONFIG')){ |
|
31 | + if (!defined('ROUTER_CONFIG')) { |
|
32 | 32 | throw new Exception("Information for loading routes has not been defined."); |
33 | 33 | } |
34 | 34 | } |
@@ -40,12 +40,12 @@ discard block |
||
40 | 40 | |
41 | 41 | protected function check_parameters(array $route_loop, array $route_request): bool |
42 | 42 | { |
43 | - foreach($route_loop as $rr => $param){ |
|
44 | - if( (substr($param,0,1) === '{') ){ |
|
45 | - $_GET[ substr($param,1,strlen($param)-2) ] = $route_request[$rr]; |
|
43 | + foreach ($route_loop as $rr => $param) { |
|
44 | + if ((substr($param, 0, 1) === '{')) { |
|
45 | + $_GET[substr($param, 1, strlen($param)-2)] = $route_request[$rr]; |
|
46 | 46 | } |
47 | 47 | |
48 | - if($this->check_parameter($param, $route_request[$rr])){ |
|
48 | + if ($this->check_parameter($param, $route_request[$rr])) { |
|
49 | 49 | return false; |
50 | 50 | } |
51 | 51 | } |
@@ -54,22 +54,22 @@ discard block |
||
54 | 54 | |
55 | 55 | protected function check_parameter(string $route_loop, string $route_request) |
56 | 56 | { |
57 | - return !( substr($route_loop,0,1) === '{' ) and $route_loop !== $route_request; |
|
57 | + return !(substr($route_loop, 0, 1) === '{') and $route_loop !== $route_request; |
|
58 | 58 | } |
59 | 59 | |
60 | 60 | protected function check_role() |
61 | 61 | { |
62 | - if(!array_key_exists('role', $this->getData()['POST'])){ |
|
62 | + if (!array_key_exists('role', $this->getData()['POST'])) { |
|
63 | 63 | throw new Exception('O servidor não conseguiu identificar a finalidade deste formulário.'); |
64 | 64 | } |
65 | 65 | } |
66 | 66 | |
67 | 67 | protected function hasProtocol(array $route, string $currentProtocol) |
68 | 68 | { |
69 | - $protocols = ( is_array($route['protocol']) ) ? $route['protocol'] : [ $route['protocol'] ]; |
|
69 | + $protocols = (is_array($route['protocol'])) ? $route['protocol'] : [$route['protocol']]; |
|
70 | 70 | |
71 | - foreach($protocols as $protocol){ |
|
72 | - if($protocol !== $currentProtocol){ |
|
71 | + foreach ($protocols as $protocol) { |
|
72 | + if ($protocol !== $currentProtocol) { |
|
73 | 73 | continue; |
74 | 74 | } |
75 | 75 | } |
@@ -2,15 +2,15 @@ |
||
2 | 2 | |
3 | 3 | namespace HnrAzevedo\Filter; |
4 | 4 | |
5 | -class User extends Filter{ |
|
5 | +class User extends Filter { |
|
6 | 6 | |
7 | 7 | public function user_in(): bool |
8 | 8 | { |
9 | - $this->addMessage('user_in','User required to be logged in.'); |
|
9 | + $this->addMessage('user_in', 'User required to be logged in.'); |
|
10 | 10 | |
11 | - $this->addTreat('user_in','report_notLogged'); |
|
11 | + $this->addTreat('user_in', 'report_notLogged'); |
|
12 | 12 | |
13 | - return (array_key_exists('user',$_SESSION)); |
|
13 | + return (array_key_exists('user', $_SESSION)); |
|
14 | 14 | } |
15 | 15 | |
16 | 16 | public function report_notLogged(): void |
@@ -4,28 +4,28 @@ |
||
4 | 4 | |
5 | 5 | use Exception; |
6 | 6 | |
7 | -trait ControllerTrait{ |
|
7 | +trait ControllerTrait { |
|
8 | 8 | |
9 | 9 | protected function check_controllsettable(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 check_controllexist(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 check_controllmethod(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 | } |
@@ -3,30 +3,30 @@ |
||
3 | 3 | use HnrAzevedo\Router\Router; |
4 | 4 | |
5 | 5 | |
6 | -Router::get('/{teste}',function(){ |
|
6 | +Router::get('/{teste}', function() { |
|
7 | 7 | echo 'teste'; |
8 | 8 | }); |
9 | 9 | |
10 | -Router::get('/1',function(){ |
|
10 | +Router::get('/1', function() { |
|
11 | 11 | echo 1; |
12 | 12 | }); |
13 | 13 | |
14 | -Router::get('/3',function(){ |
|
14 | +Router::get('/3', function() { |
|
15 | 15 | echo 3; |
16 | 16 | }); |
17 | 17 | |
18 | 18 | /* Returning parameters passed via URL in anonymous functions */ |
19 | -Router::get('/{parameter}/{otherparameter}', function($data){ |
|
19 | +Router::get('/{parameter}/{otherparameter}', function($data) { |
|
20 | 20 | echo "Parameter 1:{$data['parameter']}, Parameter 2:{$data['otherparameter']}."; |
21 | 21 | }); |
22 | 22 | |
23 | 23 | /* Passing controller and/or method via parameter in URL */ |
24 | -Router::get('/{controller}/{method}','{controller}:{method}'); |
|
24 | +Router::get('/{controller}/{method}', '{controller}:{method}'); |
|
25 | 25 | |
26 | 26 | /* Passing value via parameter */ |
27 | -Router::get('/my-account/{teste}','User:my_account'); |
|
27 | +Router::get('/my-account/{teste}', 'User:my_account'); |
|
28 | 28 | |
29 | 29 | /* Filter example */ |
30 | -Router::get('/my-account','User:my_account')->filter('User:user_in'); |
|
30 | +Router::get('/my-account', 'User:my_account')->filter('User:user_in'); |
|
31 | 31 | |
32 | 32 |
@@ -2,16 +2,16 @@ 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 | protected function getProtocol(): string |
9 | 9 | { |
10 | - if((isset($_SERVER['HTTP_X_REQUESTED_WITH']) && strtolower($_SERVER['HTTP_X_REQUESTED_WITH']) == 'xmlhttprequest')){ |
|
10 | + if ((isset($_SERVER['HTTP_X_REQUESTED_WITH']) && strtolower($_SERVER['HTTP_X_REQUESTED_WITH']) == 'xmlhttprequest')) { |
|
11 | 11 | return 'ajax'; |
12 | 12 | } |
13 | 13 | |
14 | - return (array_key_existS('REQUEST_METHOD',$_SESSION)) ? strtolower($_SERVER['REQUEST_METHOD']) : 'get'; |
|
14 | + return (array_key_existS('REQUEST_METHOD', $_SESSION)) ? strtolower($_SERVER['REQUEST_METHOD']) : 'get'; |
|
15 | 15 | } |
16 | 16 | |
17 | 17 | protected function getData(): ?array |
@@ -27,13 +27,13 @@ discard block |
||
27 | 27 | protected function import(string $path) |
28 | 28 | { |
29 | 29 | foreach (scandir($path) as $routeFile) { |
30 | - if(pathinfo($path.DIRECTORY_SEPARATOR.$routeFile, PATHINFO_EXTENSION) === 'php'){ |
|
31 | - require_once($path. DIRECTORY_SEPARATOR .$routeFile); |
|
30 | + if (pathinfo($path.DIRECTORY_SEPARATOR.$routeFile, PATHINFO_EXTENSION) === 'php') { |
|
31 | + require_once($path.DIRECTORY_SEPARATOR.$routeFile); |
|
32 | 32 | } |
33 | 33 | } |
34 | 34 | } |
35 | 35 | |
36 | - protected function ControllerForm($controller, string $method, array $values){ |
|
36 | + protected function ControllerForm($controller, string $method, array $values) { |
|
37 | 37 | $this->check_role(); |
38 | 38 | $role = ($method !== 'method') ? $method : $this->getData()['POST']['role']; |
39 | 39 | $data = (!is_null($values)) ? json_decode($values['data']) : null; |
@@ -45,7 +45,7 @@ discard block |
||
45 | 45 | $data = $this->getData(); |
46 | 46 | |
47 | 47 | foreach ($data['GET'] as $name => $value) { |
48 | - $controll = str_replace('{'.$name.'}',$value,$controll); |
|
48 | + $controll = str_replace('{'.$name.'}', $value, $controll); |
|
49 | 49 | } |
50 | 50 | |
51 | 51 | $this->check_controllsettable($controll); |
@@ -54,11 +54,11 @@ discard block |
||
54 | 54 | |
55 | 55 | $this->check_controllmethod($controll); |
56 | 56 | |
57 | - $controller = ROUTER_CONFIG['controller.namespace'].'\\'. ucfirst(explode(':',$controll)[0]); |
|
57 | + $controller = ROUTER_CONFIG['controller.namespace'].'\\'.ucfirst(explode(':', $controll)[0]); |
|
58 | 58 | $controller = new $controller(); |
59 | - $method = explode(':',$controll)[1]; |
|
59 | + $method = explode(':', $controll)[1]; |
|
60 | 60 | |
61 | - if( ( $this->getProtocol() == 'form') ){ |
|
61 | + if (($this->getProtocol() == 'form')) { |
|
62 | 62 | $this->ControllerForm($controller, $method, $data['POST']); |
63 | 63 | }else { |
64 | 64 | $controller->$method($data); |
@@ -67,12 +67,12 @@ discard block |
||
67 | 67 | |
68 | 68 | protected function explodeRoute(bool $bar, string $url): array |
69 | 69 | { |
70 | - return explode( '/', $bar ? substr($url, 0, -1) : $url ); |
|
70 | + return explode('/', $bar ? substr($url, 0, -1) : $url); |
|
71 | 71 | } |
72 | 72 | |
73 | 73 | protected function toHiking($walking) |
74 | 74 | { |
75 | - if(is_string($walking)){ |
|
75 | + if (is_string($walking)) { |
|
76 | 76 | $this->Controller($walking); |
77 | 77 | return true; |
78 | 78 | } |
@@ -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 my_account(array $data): void |
10 | 10 | { |
@@ -4,13 +4,13 @@ discard block |
||
4 | 4 | |
5 | 5 | use Exception; |
6 | 6 | |
7 | -trait FilterTrait{ |
|
7 | +trait FilterTrait { |
|
8 | 8 | protected function check_filtering(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->check_filter($filter); |
@@ -19,24 +19,24 @@ discard block |
||
19 | 19 | |
20 | 20 | protected function check_filter(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->check_filClassExist(explode(':',$filtername)[0]); |
|
26 | + $filter = $this->check_filClassExist(explode(':', $filtername)[0]); |
|
27 | 27 | |
28 | - if(!$filter->check(explode(':',$filtername)[1])){ |
|
29 | - throw new Exception($filter->getMessage(explode(':',$filtername)[1])); |
|
28 | + if (!$filter->check(explode(':', $filtername)[1])) { |
|
29 | + throw new Exception($filter->getMessage(explode(':', $filtername)[1])); |
|
30 | 30 | } |
31 | 31 | } |
32 | 32 | |
33 | 33 | protected function check_filClassExist(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 | } |
39 | - if(file_exists(ROUTER_CONFIG['path.filters'].$class.'.php')){ |
|
39 | + if (file_exists(ROUTER_CONFIG['path.filters'].$class.'.php')) { |
|
40 | 40 | require_once(ROUTER_CONFIG['path.filters'].$class.'.php'); |
41 | 41 | $filter = ROUTER_CONFIG['filter.namespace']."\\{$class}"; |
42 | 42 | return new $filter(); |
@@ -5,14 +5,14 @@ discard block |
||
5 | 5 | use HnrAzevedo\Validator\Validator; |
6 | 6 | use Exception; |
7 | 7 | |
8 | -class Controller{ |
|
8 | +class Controller { |
|
9 | 9 | use Helper; |
10 | 10 | |
11 | 11 | protected array $fail = []; |
12 | 12 | |
13 | 13 | private function check_method(string $method): void |
14 | 14 | { |
15 | - if(!method_exists($this,$method)){ |
|
15 | + if (!method_exists($this, $method)) { |
|
16 | 16 | throw new Exception("{$method} not found in ".get_class($this)."."); |
17 | 17 | } |
18 | 18 | } |
@@ -21,7 +21,7 @@ discard block |
||
21 | 21 | { |
22 | 22 | $this->ValidateData(); |
23 | 23 | |
24 | - if($this->check_failData()){ |
|
24 | + if ($this->check_failData()) { |
|
25 | 25 | return false; |
26 | 26 | } |
27 | 27 | |
@@ -38,8 +38,8 @@ discard block |
||
38 | 38 | { |
39 | 39 | $valid = Validator::execute($this->getData()['POST']); |
40 | 40 | |
41 | - if(!$valid){ |
|
42 | - foreach(Validator::getErrors() as $err => $message){ |
|
41 | + if (!$valid) { |
|
42 | + foreach (Validator::getErrors() as $err => $message) { |
|
43 | 43 | $this->fail[] = [ |
44 | 44 | 'input' => array_keys($message)[0], |
45 | 45 | 'message' => $message[array_keys($message)[0]] |
@@ -50,12 +50,12 @@ discard block |
||
50 | 50 | |
51 | 51 | private function check_failData(): bool |
52 | 52 | { |
53 | - if(count($this->fail) > 0 ){ |
|
53 | + if (count($this->fail) > 0) { |
|
54 | 54 | echo json_encode([ |
55 | 55 | 'error'=> $this->fail |
56 | 56 | ]); |
57 | 57 | } |
58 | - return (count($this->fail) > 0 ); |
|
58 | + return (count($this->fail) > 0); |
|
59 | 59 | } |
60 | 60 | |
61 | 61 | } |
62 | 62 | \ No newline at end of file |