@@ -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, DefinitionsTrait, ExtraJobsTrait; |
9 | 9 | |
10 | 10 | private static $instance = null; |
@@ -25,7 +25,7 @@ discard block |
||
25 | 25 | |
26 | 26 | public static function create(): Router |
27 | 27 | { |
28 | - if(!self::getInstance()->instanced){ |
|
28 | + if (!self::getInstance()->instanced) { |
|
29 | 29 | self::getInstance()->checkConfig(); |
30 | 30 | self::getInstance()->import(ROUTER_CONFIG['path']); |
31 | 31 | self::getInstance()->instanced = true; |
@@ -40,14 +40,14 @@ discard block |
||
40 | 40 | return self::$instance; |
41 | 41 | } |
42 | 42 | |
43 | - public function set($url ,$walking , string $protocol): Router |
|
43 | + public function set($url, $walking, string $protocol): Router |
|
44 | 44 | { |
45 | 45 | $this->lastReturn = null; |
46 | 46 | |
47 | - $url = (substr($url,0,1) !=='/' and strlen($url) > 0) ? "/{$url}" : $url; |
|
47 | + $url = (substr($url, 0, 1) !== '/' and strlen($url) > 0) ? "/{$url}" : $url; |
|
48 | 48 | |
49 | - foreach($this->routers as $key => $value){ |
|
50 | - if( md5($this->prefix . $value['url'] . $value['protocol'] ) === md5( $url . $protocol ) ){ |
|
49 | + foreach ($this->routers as $key => $value) { |
|
50 | + if (md5($this->prefix.$value['url'].$value['protocol']) === md5($url.$protocol)) { |
|
51 | 51 | throw new Exception("There is already a route with the url {$url} and with the {$protocol} protocol configured."); |
52 | 52 | } |
53 | 53 | } |
@@ -72,9 +72,9 @@ discard block |
||
72 | 72 | return self::getInstance(); |
73 | 73 | } |
74 | 74 | |
75 | - public static function group(string $prefix,$callback): Router |
|
75 | + public static function group(string $prefix, $callback): Router |
|
76 | 76 | { |
77 | - self::getInstance()->prefix = (substr($prefix,0,1) !== '/') ? "/{$prefix}" : $prefix; |
|
77 | + self::getInstance()->prefix = (substr($prefix, 0, 1) !== '/') ? "/{$prefix}" : $prefix; |
|
78 | 78 | self::getInstance()->group = sha1(date('d/m/Y h:m:i')); |
79 | 79 | $callback(); |
80 | 80 | self::getInstance()->group = null; |
@@ -85,7 +85,7 @@ discard block |
||
85 | 85 | |
86 | 86 | public static function where(): Router |
87 | 87 | { |
88 | - if(self::getInstance()->lastReturn){ |
|
88 | + if (self::getInstance()->lastReturn) { |
|
89 | 89 | throw new Exception("It is not possible to define parameter tests for groups of routes."); |
90 | 90 | } |
91 | 91 | |
@@ -96,7 +96,7 @@ discard block |
||
96 | 96 | |
97 | 97 | public static function name(string $name): Router |
98 | 98 | { |
99 | - if(self::getInstance()->lastReturn){ |
|
99 | + if (self::getInstance()->lastReturn) { |
|
100 | 100 | throw new Exception("There is no reason to call a {$name} route group."); |
101 | 101 | } |
102 | 102 | |
@@ -104,11 +104,11 @@ discard block |
||
104 | 104 | |
105 | 105 | self::getInstance()->hasRouteName($name); |
106 | 106 | |
107 | - if(in_array($name,self::getInstance()->beforeExcepts)){ |
|
107 | + if (in_array($name, self::getInstance()->beforeExcepts)) { |
|
108 | 108 | $currentRoute['beforeAll'] = null; |
109 | 109 | } |
110 | 110 | |
111 | - if(in_array($name,self::getInstance()->afterExcepts)){ |
|
111 | + if (in_array($name, self::getInstance()->afterExcepts)) { |
|
112 | 112 | $currentRoute['afterAll'] = null; |
113 | 113 | } |
114 | 114 | |
@@ -121,15 +121,15 @@ discard block |
||
121 | 121 | |
122 | 122 | private function byName(?string $routName) |
123 | 123 | { |
124 | - if(!is_null($routName)){ |
|
124 | + if (!is_null($routName)) { |
|
125 | 125 | $currentProtocol = $this->getProtocol(); |
126 | 126 | |
127 | 127 | $this->checkName($routName); |
128 | 128 | |
129 | 129 | $route = $this->routers[$routName]; |
130 | 130 | |
131 | - if(!$this->checkProtocol($route['protocol'], $currentProtocol)){ |
|
132 | - throw new Exception('Page not found.',404); |
|
131 | + if (!$this->checkProtocol($route['protocol'], $currentProtocol)) { |
|
132 | + throw new Exception('Page not found.', 404); |
|
133 | 133 | } |
134 | 134 | |
135 | 135 | $this->checkFiltering($route); |
@@ -147,11 +147,11 @@ discard block |
||
147 | 147 | |
148 | 148 | $currentProtocol = $instance->getInstance()->getProtocol(); |
149 | 149 | |
150 | - foreach(array_reverse($instance->getInstance()->routers) as $r => $route){ |
|
150 | + foreach (array_reverse($instance->getInstance()->routers) as $r => $route) { |
|
151 | 151 | |
152 | 152 | $instance->getInstance()->currentRoute = $route; |
153 | 153 | |
154 | - if(!$instance->getInstance()->checkProtocol($route['protocol'], $currentProtocol)){ |
|
154 | + if (!$instance->getInstance()->checkProtocol($route['protocol'], $currentProtocol)) { |
|
155 | 155 | continue; |
156 | 156 | } |
157 | 157 | |
@@ -161,11 +161,11 @@ discard block |
||
161 | 161 | |
162 | 162 | |
163 | 163 | $routs = $instance->getInstance()->explodeRoutes( |
164 | - (substr($route['url'],strlen($route['url'])-1,1) === '/') , $route['url'], |
|
165 | - (substr($_SERVER['REQUEST_URI'],strlen($_SERVER['REQUEST_URI'])-1,1) === '/') , $_SERVER['REQUEST_URI'] |
|
164 | + (substr($route['url'], strlen($route['url'])-1, 1) === '/'), $route['url'], |
|
165 | + (substr($_SERVER['REQUEST_URI'], strlen($_SERVER['REQUEST_URI'])-1, 1) === '/'), $_SERVER['REQUEST_URI'] |
|
166 | 166 | ); |
167 | 167 | |
168 | - if(!$instance->getInstance()->checkToHiking($route, $routs['routeRequest'], $routs['routeLoop'])){ |
|
168 | + if (!$instance->getInstance()->checkToHiking($route, $routs['routeRequest'], $routs['routeLoop'])) { |
|
169 | 169 | continue; |
170 | 170 | } |
171 | 171 | |
@@ -178,18 +178,18 @@ discard block |
||
178 | 178 | |
179 | 179 | $instance->getInstance()->currentRoute = null; |
180 | 180 | |
181 | - throw new Exception('Page not found.',404); |
|
181 | + throw new Exception('Page not found.', 404); |
|
182 | 182 | } |
183 | 183 | |
184 | 184 | public function filter($filters): Router |
185 | 185 | { |
186 | - if($this->lastReturn !== null){ |
|
186 | + if ($this->lastReturn !== null) { |
|
187 | 187 | $currentGroup = end($this->routers)['group']; |
188 | 188 | |
189 | 189 | foreach ($this->routers as $key => $value) { |
190 | 190 | |
191 | - if($value['group'] === $currentGroup){ |
|
192 | - $currentRoute = $this->addFilter($this->routers[$key],$filters); |
|
191 | + if ($value['group'] === $currentGroup) { |
|
192 | + $currentRoute = $this->addFilter($this->routers[$key], $filters); |
|
193 | 193 | $this->routers[$key] = $currentRoute; |
194 | 194 | } |
195 | 195 | |
@@ -198,24 +198,24 @@ discard block |
||
198 | 198 | return $this; |
199 | 199 | } |
200 | 200 | |
201 | - $this->routers[count($this->routers)-1] = $this->addFilter(end($this->routers),$filters); |
|
201 | + $this->routers[count($this->routers)-1] = $this->addFilter(end($this->routers), $filters); |
|
202 | 202 | return $this; |
203 | 203 | } |
204 | 204 | |
205 | 205 | public static function addFilter(array $route, $filter): array |
206 | 206 | { |
207 | - if(is_null($route['filters'])){ |
|
207 | + if (is_null($route['filters'])) { |
|
208 | 208 | $route['filters'] = $filter; |
209 | 209 | return $route; |
210 | 210 | } |
211 | 211 | |
212 | 212 | $filters = (is_array($filter)) ? $filter : [0 => $filter]; |
213 | 213 | |
214 | - if(is_array($route['filters'])){ |
|
214 | + if (is_array($route['filters'])) { |
|
215 | 215 | foreach ($route['filters'] as $key => $value) { |
216 | 216 | $filters[] = $value; |
217 | 217 | } |
218 | - }else{ |
|
218 | + }else { |
|
219 | 219 | $filters[] = $route['filters']; |
220 | 220 | } |
221 | 221 |
@@ -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,30 +71,30 @@ 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 | - protected function explodeRoutes(bool $bar, string $url ,bool $bar_, string $url_): array |
|
87 | + protected function explodeRoutes(bool $bar, string $url, bool $bar_, string $url_): array |
|
88 | 88 | { |
89 | - $url = $bar ? substr($url, 0, -1) : $url ; |
|
90 | - $url = explode('/',$url); |
|
89 | + $url = $bar ? substr($url, 0, -1) : $url; |
|
90 | + $url = explode('/', $url); |
|
91 | 91 | |
92 | - $url_ = $bar_ ? substr($url_, 0, -1) : $url_ ; |
|
93 | - $url_ = explode('/',$url_); |
|
92 | + $url_ = $bar_ ? substr($url_, 0, -1) : $url_; |
|
93 | + $url_ = explode('/', $url_); |
|
94 | 94 | |
95 | - foreach($url as $ur => $u){ |
|
96 | - if(substr($u,0,2) === '{?'){ |
|
97 | - if(!array_key_exists($ur,$url_)){ |
|
95 | + foreach ($url as $ur => $u) { |
|
96 | + if (substr($u, 0, 2) === '{?') { |
|
97 | + if (!array_key_exists($ur, $url_)) { |
|
98 | 98 | $url_[$ur] = ''; |
99 | 99 | }; |
100 | 100 | } |
@@ -105,28 +105,28 @@ discard block |
||
105 | 105 | |
106 | 106 | protected function toHiking(array $route) |
107 | 107 | { |
108 | - $this->callOnRoute($route,'beforeAll'); |
|
109 | - $this->callOnRoute($route,'before'); |
|
108 | + $this->callOnRoute($route, 'beforeAll'); |
|
109 | + $this->callOnRoute($route, 'before'); |
|
110 | 110 | |
111 | - if(is_string($route['role'])){ |
|
111 | + if (is_string($route['role'])) { |
|
112 | 112 | $this->Controller($route['role']); |
113 | - $this->callOnRoute($route,'after'); |
|
114 | - $this->callOnRoute($route,'afterAll'); |
|
113 | + $this->callOnRoute($route, 'after'); |
|
114 | + $this->callOnRoute($route, 'afterAll'); |
|
115 | 115 | return true; |
116 | 116 | } |
117 | 117 | |
118 | - call_user_func_array($route['role'],$this->getData()['GET']); |
|
118 | + call_user_func_array($route['role'], $this->getData()['GET']); |
|
119 | 119 | |
120 | - $this->callOnRoute($route,'after'); |
|
121 | - $this->callOnRoute($route,'afterAll'); |
|
120 | + $this->callOnRoute($route, 'after'); |
|
121 | + $this->callOnRoute($route, 'afterAll'); |
|
122 | 122 | } |
123 | 123 | |
124 | - protected function callOnRoute(array $route,string $state) |
|
124 | + protected function callOnRoute(array $route, string $state) |
|
125 | 125 | { |
126 | - if($route[$state] !== null){ |
|
127 | - if(is_string($route[$state])){ |
|
126 | + if ($route[$state] !== null) { |
|
127 | + if (is_string($route[$state])) { |
|
128 | 128 | $this->Controller($route[$state]); |
129 | - }else{ |
|
129 | + }else { |
|
130 | 130 | $route[$state](); |
131 | 131 | } |
132 | 132 | } |
@@ -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): Router |
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): Router |
@@ -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): Router |
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): Router |
@@ -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): Router |
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): Router |
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 | } |