Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 22 additions & 2 deletions src/Router.php
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,7 @@ public function directCall(array $route, $params = null): void
$this->handleMiddleware($route['middleware']['before']);
}

$this->callAction($params, $action, $controller);
$this->callActionThroughReflection($params, $action, $controller);

if (isset($route['middleware']['after'])) {
$this->handleMiddleware($route['middleware']['after']);
Expand All @@ -192,7 +192,27 @@ public function directCall(array $route, $params = null): void
* @param $controller
* @return void
*/
protected function callAction($params, $action, $controller): void
protected function callActionThroughReflection(?array $params, string $action, object $controller): void
{
if ($params && in_array('', $params, true)) {
throw new RouterException("404");
}

$reflection = new \ReflectionClass($controller);
$method = $reflection->getMethod($action);

$arguments = $this->rudra()->getParamsIoC($method, $params);

$method->invokeArgs($controller, $arguments);
}

/**
* @param $params
* @param $action
* @param $controller
* @return void
*/
protected function callActionThroughException($params, $action, $controller): void
{
if (isset($params) && in_array('', $params)) { //Проверка на пустой элемент
throw new RouterException("404");
Expand Down
Loading