From 8cb4bd47128f836255687a635f76c0e6fd3dc643 Mon Sep 17 00:00:00 2001 From: filippo.bertilotti <filippobertilotti@gmail.com> Date: Wed, 15 May 2024 12:06:40 +0200 Subject: [PATCH] refactor, utilizzo di exception al posto di exit per maggiori informazioni sull'errore (parte 94) --- src/Framework/Dispatcher.php | 32 ++++++++++++++++++++++++++------ 1 files changed, 26 insertions(+), 6 deletions(-) diff --git a/src/Framework/Dispatcher.php b/src/Framework/Dispatcher.php index e1b6cfd..7278e80 100644 --- a/src/Framework/Dispatcher.php +++ b/src/Framework/Dispatcher.php @@ -5,7 +5,8 @@ use ReflectionMethod; class Dispatcher { - public function __construct(private Router $router) { } + public function __construct(private Router $router, + private Container $container) { } public function handle(string $path) { $params = $this->router->match($path); @@ -17,18 +18,37 @@ $controller = "App\Controllers\\" . ucwords($params["controller"]); $action = $params["action"]; - $controller_object = new $controller; + $controller = $this->getControllerName($params); - $this->getActionArguments($controller, $action, $params); + $controller_object = $this->container->get($controller); - $controller_object->$action(); + $args = $this->getActionArguments($controller, $action, $params); + + $controller_object->$action(...$args); } - private function getActionArguments(string $controller, string $action, array $params = []) { + private function getActionArguments(string $controller, string $action, array $params = []): array { + $args = []; $method = new ReflectionMethod($controller, $action); foreach($method->getParameters() as $parameter) { + $name = $parameter->getName(); - echo $name, " = ", $params[$name], " "; + $args[$name] = $params[$name]; } + + return($args); + } + + private function getControllerName(array $params): string { + $controller = $params["controller"]; + $controller = str_replace("-", "", ucwords(strtolower($controller), "-")); + $namespace = "App\Controllers"; + + if(array_key_exists("namespace", $params)) { + $namespace .= "\\" . $params["namespace"]; + } + + return $namespace . "\\" . $controller; + } } \ No newline at end of file -- Gitblit v1.8.0