fix on routes
continuous-integration/drone/push Build is passing Details

pull/20/head
Vivien DUFOUR 1 year ago
parent 53584a518e
commit 14612226cd

@ -14,10 +14,12 @@ use Twig\Error\RuntimeError;
use Twig\Error\SyntaxError; use Twig\Error\SyntaxError;
use Twig\Loader\FilesystemLoader; use Twig\Loader\FilesystemLoader;
class FrontController { class FrontController
{
private AltoRouter $router; private AltoRouter $router;
public function __construct(string $basePath) { public function __construct(string $basePath)
{
$this->router = $this->createRouter($basePath); $this->router = $this->createRouter($basePath);
$this->initializeRouterMap(); $this->initializeRouterMap();
} }
@ -27,7 +29,8 @@ class FrontController {
* *
* @return void * @return void
*/ */
public function run(): void { public function run(): void
{
$match = $this->router->match(); $match = $this->router->match();
if ($match != null) { if ($match != null) {
$this->handleMatch($match); $this->handleMatch($match);
@ -42,7 +45,8 @@ class FrontController {
* @param string $basePath * @param string $basePath
* @return AltoRouter * @return AltoRouter
*/ */
public function createRouter(string $basePath): AltoRouter { public function createRouter(string $basePath): AltoRouter
{
$router = new AltoRouter(); $router = new AltoRouter();
$router->setBasePath($basePath); $router->setBasePath($basePath);
return $router; return $router;
@ -53,17 +57,19 @@ class FrontController {
* *
* @return void * @return void
*/ */
private function initializeRouterMap(): void { private function initializeRouterMap(): void
{
$this->router->map("GET", "/", "UserController"); $this->router->map("GET", "/", "UserController");
$this->router->map("GET", "/[a:action]?", "UserController"); $this->router->map("GET|POST", "/[a:action]?", "UserController");
$this->router->map("GET", "/tactic/[a:action]/[i:idTactic]?", "UserController"); $this->router->map("GET|POST", "/tactic/[a:action]/[i:idTactic]?", "UserController");
} }
/** /**
* @param array<string, mixed> $match * @param array<string, mixed> $match
* @return void * @return void
*/ */
private function handleMatch(array $match): void { private function handleMatch(array $match): void
{
$tag = $match['target']; $tag = $match['target'];
$action = $this->getAction($match); $action = $this->getAction($match);
@ -78,17 +84,14 @@ class FrontController {
* @param array<int, mixed> $params * @param array<int, mixed> $params
* @return HttpResponse * @return HttpResponse
*/ */
private function tryToCall(string $controller, string $action, array $params): HttpResponse { private function tryToCall(string $controller, string $action, array $params): HttpResponse
{
$controller = $this->getController($controller); $controller = $this->getController($controller);
try {
if (is_callable([$controller, $action])) { if (is_callable([$controller, $action])) {
return call_user_func_array([$controller, $action], $params); return call_user_func_array([$controller, $action], $params);
} else { } else {
return ViewHttpResponse::twig("error.html.twig", [], HttpCodes::NOT_FOUND); return ViewHttpResponse::twig("error.html.twig", [], HttpCodes::NOT_FOUND);
} }
} catch (Exception $e) {
return ViewHttpResponse::twig("error.html.twig", [], HttpCodes::NOT_FOUND);
}
} }
/** /**
@ -97,7 +100,8 @@ class FrontController {
* @param array<string, mixed> $match * @param array<string, mixed> $match
* @return string * @return string
*/ */
private function getAction(array $match): string { private function getAction(array $match): string
{
if (isset($match["params"]["action"])) { if (isset($match["params"]["action"])) {
return $match["params"]["action"]; return $match["params"]["action"];
} }
@ -110,7 +114,8 @@ class FrontController {
* @param string $controller * @param string $controller
* @return mixed * @return mixed
*/ */
private function getController(string $controller) { private function getController(string $controller)
{
$namespace = "\\App\\Controller\\"; $namespace = "\\App\\Controller\\";
$controller = $namespace . $controller; $controller = $namespace . $controller;
return new $controller(); return new $controller();
@ -122,7 +127,8 @@ class FrontController {
* @param HttpResponse $response * @param HttpResponse $response
* @return void * @return void
*/ */
private function handleResponseByType(HttpResponse $response): void { private function handleResponseByType(HttpResponse $response): void
{
http_response_code($response->getCode()); http_response_code($response->getCode());
if ($response instanceof ViewHttpResponse) { if ($response instanceof ViewHttpResponse) {
$this->displayViewByKind($response); $this->displayViewByKind($response);
@ -138,7 +144,8 @@ class FrontController {
* @param ViewHttpResponse $response * @param ViewHttpResponse $response
* @return void * @return void
*/ */
private function displayViewByKind(ViewHttpResponse $response): void { private function displayViewByKind(ViewHttpResponse $response): void
{
$file = $response->getFile(); $file = $response->getFile();
$args = $response->getArguments(); $args = $response->getArguments();

@ -14,8 +14,8 @@ use App\Model\TacticModel;
class EditorController { class EditorController {
private TacticModel $model; private TacticModel $model;
public function __construct() { public function __construct(TacticModel $model) {
$this->model = new TacticModel(new TacticInfoGateway(new Connexion(get_database()))); $this->model = $model;
} }
private function openEditor(TacticInfo $tactic): HttpResponse { private function openEditor(TacticInfo $tactic): HttpResponse {

Loading…
Cancel
Save