Added RenderContext::getContent() + More tests

Author: designcise

src/RenderContext.php

@@ -34,14 +34,18 @@ class RenderContext
 
     private array $parentData = [];
 
+    private string $childContent;
+
     public function __construct(
         callable $fetchTpl,
         array $data = [],
-        ?Sections $sections = null
+        ?Sections $sections = null,
+        string $childContent = ''
     ) {
         $this->fetchTpl = $fetchTpl;
         $this->data = $data;
         $this->sections = $sections;
+        $this->childContent = $childContent;
     }
 
     public function parent(string $name, array $data = []): void
@@ -91,6 +95,11 @@ public function section(string $name, ?string $default = null): ?string
         return $this->sections->get($name) ?? $default;
     }
 
+    public function getContent(): string
+    {
+        return $this->childContent;
+    }
+
     public function getData(): array
     {
         return $this->data;

src/Template.php

@@ -36,9 +36,6 @@ class Template
     /** @var string */
     private const NAME_SEPARATOR = '::';
 
-    /** @var string */
-    private const CONTENT_SECTION_KEY = 'content';
-
     protected Renderer $engine;
 
     protected string $filePath;
@@ -47,6 +44,8 @@ class Template
 
     private Sections $sections;
 
+    private string $childContent = '';
+
     public function __construct(
         string $name,
         Renderer $engine,
@@ -75,7 +74,12 @@ public function render(array $data = []): string
         $this->withData($data);
         $data = $this->data;
         $file = $this->getPath();
-        $context = new RenderContext([$this, 'fetch'], $data, $this->sections);
+        $context = new RenderContext(
+            [$this, 'fetch'],
+            $data,
+            $this->sections,
+            $this->childContent
+        );
         $content = $this->buffer((
             fn () => extract($data, EXTR_SKIP) & include $file
         )->bindTo($context));
@@ -84,7 +88,7 @@ public function render(array $data = []): string
 
         if (! empty($parentTpl)) {
             $parent = $this->engine->createTemplate($parentTpl, $this->sections);
-            $parent->getSections()->add(self::CONTENT_SECTION_KEY, $content);
+            $parent->setChildContent($content);
             $content = $parent->render($context->getParentData());
         }
 
@@ -137,6 +141,13 @@ public function getSections(): Sections
         return $this->sections;
     }
 
+    public function setChildContent(string $content): self
+    {
+        $this->childContent = $content;
+
+        return $this;
+    }
+
     private function setFilePathFromName(string $name): self
     {
         $chunks = explode(self::NAME_SEPARATOR, $name);
@@ -160,6 +171,13 @@ private function setFilePathFromName(string $name): self
         return $this;
     }
 
+    /**
+     * @param callable $wrap
+     *
+     * @return false|string
+     *
+     * @throws Throwable
+     */
     private function buffer(callable $wrap)
     {
         $level = ob_get_level();

test/Asset/nested-0.tpl

@@ -0,0 +1,4 @@
+<h1>Parent:</h1>
+<ul>
+<?= $this->getContent() ?>
+</ul>

test/Asset/nested-1.tpl

@@ -0,0 +1,3 @@
+<?php $this->parent('assets::nested-0', $this->getData()); ?>
+<li>#1;</li>
+<?= $this->getContent() ?>

test/Asset/nested-2.tpl

@@ -0,0 +1,3 @@
+<?php $this->parent('assets::nested-1', $this->getData()); ?>
+<li>#2;</li>
+<?= $this->getContent() ?>

test/Asset/nested-3.tpl

@@ -0,0 +1,2 @@
+<?php $this->parent('assets::nested-2', $this->getData()); ?>
+<li>#3;</li>

test/Asset/parent.tpl

@@ -1,5 +1,5 @@
 <h1>Parent</h1>
 
-<?= $this->section('content') ?>
+<?= $this->getContent() ?>
 
 <p><?= $foo; ?></p>

test/RenderContextTest.php

@@ -139,6 +139,15 @@ public function testFetch(): void
         $this->assertSame('hello world', $output);
     }
 
+    public function testGetContent(): void
+    {
+        $callable = fn () => null;
+        $childContent = '<p>test</p>';
+        $context = new RenderContext($callable, [], null, $childContent);
+
+        $this->assertSame($childContent, $context->getContent());
+    }
+
     public function testApplyThrowsErrorWhenFunctionNotFound(): void
     {
         $this->expectException(RuntimeException::class);

test/TemplateTest.php

@@ -158,6 +158,29 @@ public function testCanLoadParentFromChild(): void
         $this->assertSame($expected, $output);
     }
 
+    /**
+     * @throws Throwable
+     */
+    public function testCanLoadNestedTemplates(): void
+    {
+        $renderer = new Renderer(['assets' => self::ASSETS_DIR]);
+
+        $tpl = new Template('assets::nested-3', $renderer);
+
+        $output = $tpl->render();
+
+        $expected =<<<EXP
+<h1>Parent:</h1>
+<ul>
+<li>#1;</li>
+<li>#2;</li>
+<li>#3;</li>
+</ul>
+EXP;
+
+        $this->assertSame($expected, $output);
+    }
+
     /**
      * @throws Throwable
      */