@@ -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; |
@@ -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 | }); |
@@ -4,7 +4,7 @@ discard block |
||
4 | 4 | |
5 | 5 | use Exception; |
6 | 6 | |
7 | -trait Helper{ |
|
7 | +trait Helper { |
|
8 | 8 | use CheckTrait, ControllerTrait; |
9 | 9 | |
10 | 10 | private $currentRoute = null; |
@@ -28,7 +28,7 @@ discard block |
||
28 | 28 | protected function getProtocol(): string |
29 | 29 | { |
30 | 30 | $protocol = ((isset($_SERVER['HTTP_X_REQUESTED_WITH']) && strtolower($_SERVER['HTTP_X_REQUESTED_WITH']) == 'xmlhttprequest')) ? 'ajax' : 'get'; |
31 | - $protocol = (array_key_existS('HTTP_REQUESTED_METHOD',$_SERVER)) ? strtolower($_SERVER['HTTP_REQUESTED_METHOD']) : $protocol; |
|
31 | + $protocol = (array_key_existS('HTTP_REQUESTED_METHOD', $_SERVER)) ? strtolower($_SERVER['HTTP_REQUESTED_METHOD']) : $protocol; |
|
32 | 32 | |
33 | 33 | return $protocol; |
34 | 34 | } |
@@ -47,9 +47,9 @@ discard block |
||
47 | 47 | { |
48 | 48 | $this->checkRole(); |
49 | 49 | $method = ($method !== 'method') ? $method : $this->getData()['POST']['role']; |
50 | - $data = (array_key_exists('data',$values)) ? json_decode($values['data'], true) : []; |
|
50 | + $data = (array_key_exists('data', $values)) ? json_decode($values['data'], true) : []; |
|
51 | 51 | |
52 | - call_user_func_array([$controller,$method], $data); |
|
52 | + call_user_func_array([$controller, $method], $data); |
|
53 | 53 | } |
54 | 54 | |
55 | 55 | protected function Controller(string $controll) |
@@ -57,36 +57,36 @@ discard block |
||
57 | 57 | $data = $this->getData(); |
58 | 58 | |
59 | 59 | foreach ($data['GET'] as $name => $value) { |
60 | - $controll = str_replace('{'.$name.'}',$value,$controll); |
|
60 | + $controll = str_replace('{'.$name.'}', $value, $controll); |
|
61 | 61 | } |
62 | 62 | |
63 | 63 | $this->checkControllSettable($controll)->checkControllExist($controll)->checkControllMethod($controll); |
64 | 64 | |
65 | - $controller = ucfirst(explode(':',$controll)[0]); |
|
65 | + $controller = ucfirst(explode(':', $controll)[0]); |
|
66 | 66 | $controller = new $controller(); |
67 | - $method = explode(':',$controll)[1]; |
|
67 | + $method = explode(':', $controll)[1]; |
|
68 | 68 | |
69 | - if( ($this->getProtocol() == 'form') ){ |
|
69 | + if (($this->getProtocol() == 'form')) { |
|
70 | 70 | $this->ControllerForm($controller, $method, $data['POST']); |
71 | 71 | }else { |
72 | - $data = (array_key_exists('data',$data['POST'])) ? json_decode($data['POST']['data'], true) : $data['GET']; |
|
73 | - call_user_func_array([$controller,$method], $data); |
|
72 | + $data = (array_key_exists('data', $data['POST'])) ? json_decode($data['POST']['data'], true) : $data['GET']; |
|
73 | + call_user_func_array([$controller, $method], $data); |
|
74 | 74 | } |
75 | 75 | |
76 | 76 | return $this; |
77 | 77 | } |
78 | 78 | |
79 | - protected function explodeRoutes(bool $bar, string $url ,bool $bar_, string $url_): array |
|
79 | + protected function explodeRoutes(bool $bar, string $url, bool $bar_, string $url_): array |
|
80 | 80 | { |
81 | - $url = $bar ? substr($url, 0, -1) : $url ; |
|
82 | - $url = explode('/',$url); |
|
81 | + $url = $bar ? substr($url, 0, -1) : $url; |
|
82 | + $url = explode('/', $url); |
|
83 | 83 | |
84 | - $url_ = $bar_ ? substr($url_, 0, -1) : $url_ ; |
|
85 | - $url_ = explode('/',$url_); |
|
84 | + $url_ = $bar_ ? substr($url_, 0, -1) : $url_; |
|
85 | + $url_ = explode('/', $url_); |
|
86 | 86 | |
87 | - foreach($url as $ur => $u){ |
|
88 | - if(substr($u,0,2) === '{?'){ |
|
89 | - if(!array_key_exists($ur,$url_)){ |
|
87 | + foreach ($url as $ur => $u) { |
|
88 | + if (substr($u, 0, 2) === '{?') { |
|
89 | + if (!array_key_exists($ur, $url_)) { |
|
90 | 90 | $url_[$ur] = ''; |
91 | 91 | }; |
92 | 92 | } |
@@ -97,25 +97,25 @@ discard block |
||
97 | 97 | |
98 | 98 | protected function toHiking(array $route): bool |
99 | 99 | { |
100 | - $this->callOnRoute($route,'beforeAll')->callOnRoute($route,'before'); |
|
100 | + $this->callOnRoute($route, 'beforeAll')->callOnRoute($route, 'before'); |
|
101 | 101 | |
102 | - if(is_string($route['role'])){ |
|
103 | - $this->Controller($route['role'])->callOnRoute($route,'after')->callOnRoute($route,'afterAll'); |
|
102 | + if (is_string($route['role'])) { |
|
103 | + $this->Controller($route['role'])->callOnRoute($route, 'after')->callOnRoute($route, 'afterAll'); |
|
104 | 104 | return true; |
105 | 105 | } |
106 | 106 | |
107 | - call_user_func_array($route['role'],$this->getData()['GET']); |
|
107 | + call_user_func_array($route['role'], $this->getData()['GET']); |
|
108 | 108 | |
109 | - $this->callOnRoute($route,'after')->callOnRoute($route,'afterAll'); |
|
109 | + $this->callOnRoute($route, 'after')->callOnRoute($route, 'afterAll'); |
|
110 | 110 | return true; |
111 | 111 | } |
112 | 112 | |
113 | - protected function callOnRoute(array $route,string $state) |
|
113 | + protected function callOnRoute(array $route, string $state) |
|
114 | 114 | { |
115 | - if($route[$state] !== null){ |
|
116 | - if(is_string($route[$state])){ |
|
115 | + if ($route[$state] !== null) { |
|
116 | + if (is_string($route[$state])) { |
|
117 | 117 | $this->Controller($route[$state]); |
118 | - }else{ |
|
118 | + }else { |
|
119 | 119 | $route[$state](); |
120 | 120 | } |
121 | 121 | } |
@@ -126,12 +126,12 @@ discard block |
||
126 | 126 | { |
127 | 127 | $currentProtocol = $this->getProtocol(); |
128 | 128 | |
129 | - foreach(array_reverse($this->routers) as $r => $route){ |
|
129 | + foreach (array_reverse($this->routers) as $r => $route) { |
|
130 | 130 | |
131 | 131 | $this->currentRoute = $route; |
132 | 132 | $this->currentRoute['name'] = $r; |
133 | 133 | |
134 | - if(!$this->checkProtocol($route['protocol'], $currentProtocol)){ |
|
134 | + if (!$this->checkProtocol($route['protocol'], $currentProtocol)) { |
|
135 | 135 | continue; |
136 | 136 | } |
137 | 137 | |
@@ -141,11 +141,11 @@ discard block |
||
141 | 141 | |
142 | 142 | |
143 | 143 | $routs = $this->explodeRoutes( |
144 | - (substr($route['url'],strlen($route['url'])-1,1) === '/') , $route['url'], |
|
145 | - (substr($_SERVER['REQUEST_URI'],strlen($_SERVER['REQUEST_URI'])-1,1) === '/') , $_SERVER['REQUEST_URI'] |
|
144 | + (substr($route['url'], strlen($route['url'])-1, 1) === '/'), $route['url'], |
|
145 | + (substr($_SERVER['REQUEST_URI'], strlen($_SERVER['REQUEST_URI'])-1, 1) === '/'), $_SERVER['REQUEST_URI'] |
|
146 | 146 | ); |
147 | 147 | |
148 | - if(!$this->checkToHiking($route, $routs['routeRequest'], $routs['routeLoop'])){ |
|
148 | + if (!$this->checkToHiking($route, $routs['routeRequest'], $routs['routeLoop'])) { |
|
149 | 149 | continue; |
150 | 150 | } |
151 | 151 | |
@@ -154,7 +154,7 @@ discard block |
||
154 | 154 | } |
155 | 155 | |
156 | 156 | $this->currentRoute = null; |
157 | - throw new Exception('Page not found.',404); |
|
157 | + throw new Exception('Page not found.', 404); |
|
158 | 158 | } |
159 | 159 | |
160 | 160 | protected function loadByName(string $routName) |
@@ -163,8 +163,8 @@ discard block |
||
163 | 163 | $this->checkName($routName); |
164 | 164 | $route = $this->routers[$routName]; |
165 | 165 | |
166 | - if(!$this->checkProtocol($route['protocol'], $currentProtocol)){ |
|
167 | - throw new Exception('Page not found.',404); |
|
166 | + if (!$this->checkProtocol($route['protocol'], $currentProtocol)) { |
|
167 | + throw new Exception('Page not found.', 404); |
|
168 | 168 | } |
169 | 169 | |
170 | 170 | $this->currentRoute = $route; |