fix page 404

markus621 · markus621 · commit 8955f4320cfe · 2019-11-24T05:34:06.000+03:00
diff --git a/app/Controllers/PageController.php b/app/Controllers/PageController.php
@@ -3,6 +3,8 @@
 namespace App\Controllers;
 
 use App\DI;
+use App\Models\Page;
+use Dewep\Exception\HttpException;
 use Dewep\Http\Request;
 
 /**
@@ -25,7 +27,8 @@ public function index(Request $request): string
         return DI::twig()->render(
             'page.html.twig',
             [
-                'name' => 'home',
+                'title' => 'Home',
+                'text'  => 'This is - Home',
             ]
         );
     }
@@ -35,16 +38,31 @@ public function index(Request $request): string
      * @param string  $id
      *
      * @return string
+     * @throws HttpException
      * @throws \Twig\Error\LoaderError
      * @throws \Twig\Error\RuntimeError
      * @throws \Twig\Error\SyntaxError
      */
     public function page(Request $request, string $id): string
     {
+        $query = <<<'SQL'
+    SELECT * FROM `page` WHERE `id`=:id;
+SQL;
+
+        /** @var Page|false $page */
+        $page = DI::db()->select($query, [':id' => (int)$id])
+            ->asClass(Page::class)
+            ->getOne();
+
+        if (!$page instanceof Page) {
+            throw new HttpException('Page not found', 404);
+        }
+
         return DI::twig()->render(
             'page.html.twig',
             [
-                'name' => $id,
+                'title' => $page->getTitle(),
+                'text'  => $page->getText(),
             ]
         );
     }
diff --git a/app/HttpCodes.php b/app/HttpCodes.php
@@ -2,6 +2,8 @@
 
 namespace App;
 
+use Dewep\Http\Response;
+
 /**
  * Class HttpCodes
  *
@@ -10,13 +12,20 @@
 class HttpCodes
 {
     /**
+     * @param array $error
+     *
      * @return string
      * @throws \Twig\Error\LoaderError
      * @throws \Twig\Error\RuntimeError
      * @throws \Twig\Error\SyntaxError
      */
-    public static function httpCode404(): string
+    public static function httpCode404(array $error): string
     {
-        return DI::twig()->render('404.html.twig', []);
+        return DI::twig()->render(
+            '404.html.twig',
+            [
+                'text' => $error['errorMessage'] ?? 'Error 404',
+            ]
+        );
     }
 }
diff --git a/resources/404.html.twig b/resources/404.html.twig
@@ -1 +1,9 @@
-Page not found
+<!DOCTYPE html>
+<html>
+<head>
+    <title>404</title>
+</head>
+<body>
+{{ text }}
+</body>
+</html>
diff --git a/resources/page.html.twig b/resources/page.html.twig
@@ -1 +1,9 @@
-{{ name }}
+<!DOCTYPE html>
+<html>
+<head>
+    <title>{{ title }}</title>
+</head>
+<body>
+{{ text }}
+</body>
+</html>

Original file line number	Diff line number	Diff line change
`@@ -2,6 +2,8 @@`
`2`	`2`
`3`	`3`	`namespace App;`
`4`	`4`
	`5`	`+use Dewep\Http\Response;`
	`6`	`+`
`5`	`7`	`/**`
`6`	`8`	`* Class HttpCodes`
`7`	`9`	`*`
`@@ -10,13 +12,20 @@`
`10`	`12`	`class HttpCodes`
`11`	`13`	`{`
`12`	`14`	`/**`
	`15`	`+ * @param array $error`
	`16`	`+ *`
`13`	`17`	`* @return string`
`14`	`18`	`* @throws \Twig\Error\LoaderError`
`15`	`19`	`* @throws \Twig\Error\RuntimeError`
`16`	`20`	`* @throws \Twig\Error\SyntaxError`
`17`	`21`	`*/`
`18`		`- public static function httpCode404(): string`
	`22`	`+ public static function httpCode404(array $error): string`
`19`	`23`	`{`
`20`		`- return DI::twig()->render('404.html.twig', []);`
	`24`	`+ return DI::twig()->render(`
	`25`	`+ '404.html.twig',`
	`26`	`+ [`
	`27`	`+ 'text' => $error['errorMessage'] ?? 'Error 404',`
	`28`	`+ ]`
	`29`	`+ );`
`21`	`30`	`}`
`22`	`31`	`}`