|
5 | 5 | * @ Class: Router |
6 | 6 | * @ Author: izni burak demirtas / @izniburak <info@burakdemirtas.org> |
7 | 7 | * @ Web: http://burakdemirtas.org |
8 | | -* @ URL: https://github.com/izniburak/router |
| 8 | +* @ URL: https://github.com/izniburak/php-router |
9 | 9 | * @ Licence: The MIT License (MIT) - Copyright (c) - http://opensource.org/licenses/MIT |
10 | 10 | * |
11 | 11 | */ |
@@ -35,9 +35,9 @@ function __construct($params = []) |
35 | 35 | if(is_null($params) || !is_array($params)) |
36 | 36 | return; |
37 | 37 |
|
38 | | - $this->baseFolder = (isset($params['base']) ? trim($params['base'], '/') : $this->baseFolder); |
39 | | - $this->controllersFolder = (isset($params['controllers']) ? $this->baseFolder . '/' . trim($params['controllers'], '/') : null); |
40 | | - $this->filtersFolder = (isset($params['filters']) ? $this->baseFolder . '/' . trim($params['filters']) : null); |
| 38 | + $this->baseFolder = (isset($params['base']) ? trim($params['base'], '/') : $this->baseFolder); |
| 39 | + $this->controllersFolder = (isset($params['controllers']) ? $this->baseFolder . '/' . trim($params['controllers'], '/') : null); |
| 40 | + $this->filtersFolder = (isset($params['filters']) ? $this->baseFolder . '/' . trim($params['filters']) : null); |
41 | 41 | } |
42 | 42 |
|
43 | 43 | public function __call($method, $params) |
@@ -150,10 +150,10 @@ private function beforeAfterCommand($command) |
150 | 150 | $this->message('Oppps! Error :(', '<b>'. $segments[0] .'</b> filter file is not found. Please, check file.'); |
151 | 151 |
|
152 | 152 | require_once($filterFile); |
153 | | - $controller = new $segments[0](); |
| 153 | + $filter = new $segments[0](); |
154 | 154 |
|
155 | | - if(in_array($segments[1], get_class_methods($controller))) |
156 | | - return $controller->$segments[1](); |
| 155 | + if(in_array($segments[1], get_class_methods($filter))) |
| 156 | + return $filter->$segments[1](); |
157 | 157 | else |
158 | 158 | $this->message('Oppps! Error :(', '<b>' . $segments[1] . '</b> method is not found in <b>' . $segments[0] . '</b> filter. Please, check file.'); |
159 | 159 | } |
@@ -365,12 +365,12 @@ private function addRoute($uri, $method, $callback, $settings) |
365 | 365 | $route = str_replace(['///', '//'], '/', $route); |
366 | 366 |
|
367 | 367 | $data = [ |
368 | | - 'route' => $route, |
369 | | - 'method' => strtoupper($method), |
370 | | - 'callback' => $callback, |
371 | | - 'alias' => (isset($settings['alias']) ? $settings['alias'] : (isset($settings['as']) ? $settings['as'] : null)), |
372 | | - 'before' => (isset($settings['before']) ? $settings['before'] : null), |
373 | | - 'after' => (isset($settings['after']) ? $settings['after'] : null) |
| 368 | + 'route' => $route, |
| 369 | + 'method' => strtoupper($method), |
| 370 | + 'callback' => $callback, |
| 371 | + 'alias' => (isset($settings['alias']) ? $settings['alias'] : (isset($settings['as']) ? $settings['as'] : null)), |
| 372 | + 'before' => (isset($settings['before']) ? $settings['before'] : null), |
| 373 | + 'after' => (isset($settings['after']) ? $settings['after'] : null) |
374 | 374 | ]; |
375 | 375 | array_push($this->routes, $data); |
376 | 376 | } |
|
0 commit comments