Skip to content

Commit 41bf34a

Browse files
committed
Update and code fixed Router class.
1 parent 98be7eb commit 41bf34a

File tree

1 file changed

+13
-13
lines changed

1 file changed

+13
-13
lines changed

src/Router.php

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
* @ Class: Router
66
* @ Author: izni burak demirtas / @izniburak <info@burakdemirtas.org>
77
* @ Web: http://burakdemirtas.org
8-
* @ URL: https://github.com/izniburak/router
8+
* @ URL: https://github.com/izniburak/php-router
99
* @ Licence: The MIT License (MIT) - Copyright (c) - http://opensource.org/licenses/MIT
1010
*
1111
*/
@@ -35,9 +35,9 @@ function __construct($params = [])
3535
if(is_null($params) || !is_array($params))
3636
return;
3737

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);
4141
}
4242

4343
public function __call($method, $params)
@@ -150,10 +150,10 @@ private function beforeAfterCommand($command)
150150
$this->message('Oppps! Error :(', '<b>'. $segments[0] .'</b> filter file is not found. Please, check file.');
151151

152152
require_once($filterFile);
153-
$controller = new $segments[0]();
153+
$filter = new $segments[0]();
154154

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]();
157157
else
158158
$this->message('Oppps! Error :(', '<b>' . $segments[1] . '</b> method is not found in <b>' . $segments[0] . '</b> filter. Please, check file.');
159159
}
@@ -365,12 +365,12 @@ private function addRoute($uri, $method, $callback, $settings)
365365
$route = str_replace(['///', '//'], '/', $route);
366366

367367
$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)
374374
];
375375
array_push($this->routes, $data);
376376
}

0 commit comments

Comments
 (0)