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\Loader\FilesystemLoader;
class FrontController {
class FrontController
{
private AltoRouter $router;
public function __construct(string $basePath) {
public function __construct(string $basePath)
{
$this->router = $this->createRouter($basePath);
$this->initializeRouterMap();
}
@ -27,7 +29,8 @@ class FrontController {
*
* @return void
*/
public function run(): void {
public function run(): void
{
$match = $this->router->match();
if ($match != null) {
$this->handleMatch($match);
@ -42,7 +45,8 @@ class FrontController {
* @param string $basePath
* @return AltoRouter
*/
public function createRouter(string $basePath): AltoRouter {
public function createRouter(string $basePath): AltoRouter
{
$router = new AltoRouter();
$router->setBasePath($basePath);
return $router;
@ -53,17 +57,19 @@ class FrontController {
*
* @return void
*/
private function initializeRouterMap(): void {
private function initializeRouterMap(): void
{
$this->router->map("GET", "/", "UserController");
$this->router->map("GET", "/[a:action]?", "UserController");
$this->router->map("GET", "/tactic/[a:action]/[i:idTactic]?", "UserController");
$this->router->map("GET|POST", "/[a:action]?", "UserController");
$this->router->map("GET|POST", "/tactic/[a:action]/[i:idTactic]?", "UserController");
}
/**
* @param array<string, mixed> $match
* @return void
*/
private function handleMatch(array $match): void {
private function handleMatch(array $match): void
{
$tag = $match['target'];
$action = $this->getAction($match);
@ -78,15 +84,12 @@ class FrontController {
* @param array<int, mixed> $params
* @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);
try {
if (is_callable([$controller, $action])) {
return call_user_func_array([$controller, $action], $params);
} else {
return ViewHttpResponse::twig("error.html.twig", [], HttpCodes::NOT_FOUND);
}
} catch (Exception $e) {
if (is_callable([$controller, $action])) {
return call_user_func_array([$controller, $action], $params);
} else {
return ViewHttpResponse::twig("error.html.twig", [], HttpCodes::NOT_FOUND);
}
}
@ -97,7 +100,8 @@ class FrontController {
* @param array<string, mixed> $match
* @return string
*/
private function getAction(array $match): string {
private function getAction(array $match): string
{
if (isset($match["params"]["action"])) {
return $match["params"]["action"];
}
@ -110,7 +114,8 @@ class FrontController {
* @param string $controller
* @return mixed
*/
private function getController(string $controller) {
private function getController(string $controller)
{
$namespace = "\\App\\Controller\\";
$controller = $namespace . $controller;
return new $controller();
@ -122,7 +127,8 @@ class FrontController {
* @param HttpResponse $response
* @return void
*/
private function handleResponseByType(HttpResponse $response): void {
private function handleResponseByType(HttpResponse $response): void
{
http_response_code($response->getCode());
if ($response instanceof ViewHttpResponse) {
$this->displayViewByKind($response);
@ -138,7 +144,8 @@ class FrontController {
* @param ViewHttpResponse $response
* @return void
*/
private function displayViewByKind(ViewHttpResponse $response): void {
private function displayViewByKind(ViewHttpResponse $response): void
{
$file = $response->getFile();
$args = $response->getArguments();
@ -151,7 +158,7 @@ class FrontController {
$loader = new FilesystemLoader('../src/Views/');
$twig = new Environment($loader);
$twig->display($file, $args);
} catch (RuntimeError|SyntaxError|LoaderError $e) {
} catch (RuntimeError | SyntaxError | LoaderError $e) {
http_response_code(500);
echo "There was an error rendering your view, please refer to an administrator.\nlogs date: " . date("YYYD, d M Y H:i:s");
throw $e;

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

Loading…
Cancel
Save