@@ -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 | |
@@ -44,20 +44,20 @@ discard block |
||
| 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 | } |
| 54 | 54 | |
| 55 | 55 | $this->checkTypeRole($walking); |
| 56 | 56 | |
| 57 | - $route = [ |
|
| 58 | - 'url' => $this->prefix.$url, |
|
| 59 | - 'role' => $walking, |
|
| 60 | - 'protocol' => $protocol, |
|
| 57 | + $route = [ |
|
| 58 | + 'url' => $this->prefix.$url, |
|
| 59 | + 'role' => $walking, |
|
| 60 | + 'protocol' => $protocol, |
|
| 61 | 61 | 'filters' => null, |
| 62 | 62 | 'where' => null, |
| 63 | 63 | 'before' => null, |
@@ -65,9 +65,9 @@ discard block |
||
| 65 | 65 | 'after' => null, |
| 66 | 66 | 'afterAll' => $this->afterAll, |
| 67 | 67 | 'group' => self::getInstance()->group |
| 68 | - ]; |
|
| 68 | + ]; |
|
| 69 | 69 | |
| 70 | - $this->routers[] = $route; |
|
| 70 | + $this->routers[] = $route; |
|
| 71 | 71 | |
| 72 | 72 | return self::getInstance(); |
| 73 | 73 | } |
@@ -145,7 +145,7 @@ discard block |
||
| 145 | 145 | |
| 146 | 146 | $instance->getInstance()->byName($routeName); |
| 147 | 147 | |
| 148 | - $currentProtocol = $instance->getInstance()->getProtocol(); |
|
| 148 | + $currentProtocol = $instance->getInstance()->getProtocol(); |
|
| 149 | 149 | |
| 150 | 150 | foreach(array_reverse($instance->getInstance()->routers) as $r => $route){ |
| 151 | 151 | |
@@ -178,7 +178,7 @@ 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 |