diff --git a/public/index.php b/public/index.php index e5fd097..3389671 100644 --- a/public/index.php +++ b/public/index.php @@ -16,4 +16,4 @@ $router->get('/^recent\/(?\d+)$/', [$user, 'index']); $router->get('/^news\/(?\d+)$/', [$user, 'viewPost']); $router->get('/^comments\/(?[\w-]+)$/', [$user, 'viewPostComments']); $router->match('/^login$/', [$security, 'login']); -$router->run(new \Silex\DI\DI($router))->render(__DIR__ . '/../' . VIEW_PATH); +$router->run(new \Silex\DI\DI($router))->render($router, __DIR__ . '/../' . VIEW_PATH); diff --git a/src/Silex/Controller/UserController.php b/src/Silex/Controller/UserController.php index 194a3bd..b774d59 100644 --- a/src/Silex/Controller/UserController.php +++ b/src/Silex/Controller/UserController.php @@ -20,7 +20,7 @@ class UserController $total = $gw->getCount(); $nbPages = Pagination::getNbPages($total, self::PER_PAGE); $news = $gw->getPaginatedRecentNews($page , self::PER_PAGE); - return new HttpResponse(200, 'home', ['news' => $news, 'page' => $page, 'nbPages' => $nbPages, 'router' => $di->getRouter()]); + return new HttpResponse(200, 'home', ['news' => $news, 'page' => $page, 'nbPages' => $nbPages]); } public function viewPost(DI $di, array $params): HttpResponse diff --git a/src/Silex/Http/HttpResponse.php b/src/Silex/Http/HttpResponse.php index 0342821..113d9cf 100644 --- a/src/Silex/Http/HttpResponse.php +++ b/src/Silex/Http/HttpResponse.php @@ -4,6 +4,8 @@ declare(strict_types=1); namespace Silex\Http; +use Silex\Router\Router; + class HttpResponse { private int $status; @@ -24,7 +26,7 @@ class HttpResponse return new HttpResponse(200, $viewPath, $viewParams); } - public function render(string $viewBasePath) + public function render(Router $router, string $viewBasePath) { $params = $this->viewParams; ob_start(); diff --git a/views/home.php b/views/home.php index 43bc521..2f146b1 100644 --- a/views/home.php +++ b/views/home.php @@ -16,15 +16,15 @@