Merge pull request #50 from tbreuss/develop

Develop

Author: tbreuss

src/Zack.php

@@ -97,7 +97,8 @@ public function initContainer(): void
             ->addMethodCall('addExtension', [new MarkdownExtension()])
             ->addMethodCall('addGlobal', ['config', $this->config])
             ->addMethodCall('addRuntimeLoader', [new class implements RuntimeLoaderInterface {
-                public function load($class) {
+                public function load($class)
+                {
                     if (MarkdownRuntime::class === $class) {
                         return new MarkdownRuntime(new DefaultMarkdown());
                     }

src/funcs/main.php

@@ -16,6 +16,22 @@ function file_read(string $path): string
     return $contents;
 }
 
+function html_contains_full_html(string $html): bool
+{
+    return stripos($html, '<html') !== false || stripos($html, '<!doctype') !== false;
+}
+
+function html_extract_layout(string $html): string
+{
+    $status = preg_match('/<!--\s*layout:\s*(.+?)\s*-->/', $html, $matches);
+
+    if ($status !== false && isset($matches[1])) {
+        return trim($matches[1]);
+    }
+
+    return 'default.html.twig';
+}
+
 function html_extract_title(string $html, string $default): string
 {
     if ($html === '') {

src/routing/HtmlRouteHandler.php

@@ -6,6 +6,7 @@
 use Symfony\Component\HttpFoundation\Response;
 
 use function tebe\zack\file_read;
+use function tebe\zack\html_extract_layout;
 use function tebe\zack\html_extract_title;
 
 class HtmlRouteHandler
@@ -20,9 +21,10 @@ public function __invoke(Request $request): Response
         }
 
         $html = file_read($path);
+        $layout = html_extract_layout($html);
         $title = html_extract_title($html, basename($path));
 
-        $content = $container->get('twig')->render('route-handler.html.twig', [
+        $content = $container->get('twig')->render($layout, [
             'title' => $title,
             'html' => $html,
         ]);

src/routing/MarkdownRouteHandler.php

@@ -12,6 +12,7 @@
 use Twig\Extra\Markdown\ErusevMarkdown;
 
 use function tebe\zack\file_read;
+use function tebe\zack\html_extract_layout;
 use function tebe\zack\html_extract_title;
 
 class MarkdownRouteHandler
@@ -34,10 +35,10 @@ public function __invoke(Request $request): Response
         }
 
         $html = (string) $converter->convert($markdown);
-
+        $layout = html_extract_layout($html);
         $title = html_extract_title($html, basename($path));
 
-        $content = $container->get('twig')->render('route-handler.html.twig', [
+        $content = $container->get('twig')->render($layout, [
             'title' => $title,
             'html' => $html,
         ]);

src/routing/PhpRouteHandler.php

@@ -7,6 +7,8 @@
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
 
+use function tebe\zack\html_contains_full_html;
+use function tebe\zack\html_extract_layout;
 use function tebe\zack\html_extract_title;
 
 class PhpRouteHandler
@@ -31,8 +33,13 @@ public function __invoke(Request $request): Response
         $outputValue = ob_get_clean();
 
         if ($returnValue === 1 && is_string($outputValue)) {
-            $title = html_extract_title($outputValue, basename($path));
-            return $this->html('route-handler.html.twig', ['title' => $title, 'html' => $outputValue]);
+            if (html_contains_full_html($outputValue)) {
+                return new Response($outputValue, 200);
+            } else {
+                $layout = html_extract_layout($outputValue);
+                $title = html_extract_title($outputValue, basename($path));
+                return $this->html($layout, ['title' => $title, 'html' => $outputValue]);
+            }
         } elseif (is_string($returnValue)) {
             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);
@@ -68,6 +75,7 @@ public function redirect(string $url, int $status = 302): Response
 
     public function render(string $template, array $context = []): string
     {
+        /** @var \Twig\Environment $twig */
         $twig = $this->container->get('twig');
         return $twig->render($template, $context);
     }

src/views/route-handler.html.twig src/views/default.html.twigsrc/views/route-handler.html.twig renamed to src/views/default.html.twig

@@ -0,0 +1,2 @@
+<!doctype html>
+<h2><?= pathinfo(__FILE__, PATHINFO_FILENAME) ?></h2>

tests/_data/routes/route-handler/php/echo-string-doctype.get.php

@@ -0,0 +1,5 @@
+<html lang="en">
+  <body>
+    <h2><?= pathinfo(__FILE__, PATHINFO_FILENAME) ?></h2>
+  </body>
+</html>

tests/_data/routes/route-handler/php/echo-string-html-tag.get.php

@@ -0,0 +1 @@
+<h2><?= pathinfo(__FILE__, PATHINFO_FILENAME) ?></h2>

tests/_data/routes/route-handler/php/echo-string-layout-default.get.php

@@ -0,0 +1,2 @@
+<!-- layout: test.html.twig -->
+<h2><?= pathinfo(__FILE__, PATHINFO_FILENAME) ?></h2>