Simplified code

Author: tbreuss

src/routing/PhpRouteHandler.php

@@ -3,9 +3,12 @@
 namespace tebe\zack\routing;
 
 use Symfony\Component\DependencyInjection\ContainerBuilder;
+use Symfony\Component\HttpFoundation\RedirectResponse;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
 
+use function tebe\zack\html_extract_title;
+
 class PhpRouteHandler
 {
     private ?ContainerBuilder $container;
@@ -28,11 +31,13 @@ public function __invoke(Request $request): Response
         $outputValue = ob_get_clean();
 
         if ($returnValue === 1 && is_string($outputValue)) {
-            return new Response($outputValue, 200);
-        } elseif (is_string($returnValue) && is_string($outputValue) && strlen($outputValue) > 0) {
-            throw new \Exception('In the PHP file the return value must be omitted if an output was made via echo: ' . $path);
+            $title = html_extract_title($outputValue, basename($path));
+            return $this->html('route-handler.html.twig', ['title' => $title, 'html' => $outputValue]);
         } elseif (is_string($returnValue)) {
-            return new Response($returnValue, 200);
+            if (is_string($outputValue) && strlen($outputValue) > 0) {
+                throw new \Exception('In the PHP file the return value must be omitted if an output was made via echo: ' . $path);
+            }
+            return new Response($returnValue, 200);            
         } elseif (is_array($returnValue)) {
             return $this->json($returnValue);
         } elseif ($returnValue instanceof Response) {
@@ -56,6 +61,11 @@ public function json(array $context = []): Response
         ]);
     }
 
+    public function redirect(string $url, int $status = 302): Response
+    {
+        return new RedirectResponse($url, $status);
+    }
+
     public function render(string $template, array $context = []): string
     {
         $twig = $this->container->get('twig');

tests/_data/routes/articles/[id]/comments.post.php

@@ -1,5 +1,5 @@
 <?php declare(strict_types=1);
 
-return new Symfony\Component\HttpFoundation\Response(
-    '<h1>POST: Articles.[id].Comments.Php</h1>',
-);
+return $this->render('articles/comments.html.twig', [
+    'title' => 'POST: Articles.[id].Comments.Php',
+]);

tests/_data/routes/doc-examples/api/ping.php

@@ -1,7 +1,3 @@
 <?php declare(strict_types=1);
 
-use Symfony\Component\HttpFoundation\Response;
-
-return new Response('{"ping": "pong"}', 200, [
-    'Content-Type' => 'application/json',
-]);
+return ['ping' => 'pong'];

tests/_data/routes/doc-examples/htm-page.htm

@@ -1 +1 @@
-<h1>htm-page</h1>
+<h2>htm-page</h2>

tests/_data/routes/doc-examples/html-page.htm

@@ -1 +1 @@
-<h1>html-page</h1>
+<h2>html-page</h2>

tests/_data/routes/doc-examples/index.get.html

@@ -1 +1 @@
-<h1>Hello World!</h1>
+<h2>Hello World!</h2>

tests/_data/routes/doc-examples/markdown-page.markdown

@@ -1,3 +1 @@
-<?php declare(strict_types=1);
-
-echo "<h1>php-page</h1>";
+<h2>php-page</h2>

tests/_data/routes/doc-examples/md-page.md

@@ -1 +1 @@
-<h1>delete.delete.htm</h1>
+<h2>delete.delete.htm</h2>