@@ -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 |
@@ -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 |
@@ -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 checkMethod(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->checkFailData()){ |
|
24 | + if ($this->checkFailData()) { |
|
25 | 25 | return false; |
26 | 26 | } |
27 | 27 | |
@@ -29,7 +29,7 @@ discard block |
||
29 | 29 | |
30 | 30 | $this->checkMethod($method); |
31 | 31 | |
32 | - call_user_func_array([$this,$method], func_get_args()); |
|
32 | + call_user_func_array([$this, $method], func_get_args()); |
|
33 | 33 | |
34 | 34 | return true; |
35 | 35 | } |
@@ -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 checkFailData(): 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 |
@@ -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 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 | return $this; |
@@ -16,8 +16,8 @@ discard block |
||
16 | 16 | |
17 | 17 | protected function checkControllExist(string $controll) |
18 | 18 | { |
19 | - $controllname = ucfirst(explode(':',$controll)[0]); |
|
20 | - if(!class_exists($controllname)){ |
|
19 | + $controllname = ucfirst(explode(':', $controll)[0]); |
|
20 | + if (!class_exists($controllname)) { |
|
21 | 21 | throw new Exception("No controller {$controllname} found."); |
22 | 22 | } |
23 | 23 | return $this; |
@@ -25,9 +25,9 @@ discard block |
||
25 | 25 | |
26 | 26 | protected function checkControllMethod(string $controll) |
27 | 27 | { |
28 | - $controllname = ucfirst(explode(':',$controll)[0]); |
|
29 | - $method = explode(':',$controll)[1]; |
|
30 | - if(!method_exists($controllname, $method)){ |
|
28 | + $controllname = ucfirst(explode(':', $controll)[0]); |
|
29 | + $method = explode(':', $controll)[1]; |
|
30 | + if (!method_exists($controllname, $method)) { |
|
31 | 31 | throw new Exception("No method {$method} found for {$controllname}."); |
32 | 32 | } |
33 | 33 | return $this; |
@@ -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; |
@@ -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 | }); |