Merge pull request #5006 from getkirby/release/3.9

Fix self-closing snippet with multiple slots

src/Template/Slots.php

@@ -2,6 +2,8 @@
 
 namespace Kirby\Template;
 
+use Countable;
+
 /**
  * The slots collection is simplifying
  * slot access. Slots can be accessed with
@@ -14,7 +16,7 @@
  * @copyright Bastian Allgeier
  * @license   https://getkirby.com/license
  */
-class Slots
+class Slots implements Countable
 {
 	/**
 	 * Creates a new slots collection
@@ -40,4 +42,12 @@ public function __call(string $name, array $args): Slot|null
 	{
 		return $this->__get($name);
 	}
+
+	/**
+	 * Counts the number of defined slots
+	 */
+	public function count(): int
+	{
+		return count($this->slots);
+	}
 }

src/Template/Template.php

@@ -163,15 +163,22 @@ public function render(array $data = []): string
 		// take the buffer output from the template as default slot
 		// and render the snippet as final template output
 		if (
-			Snippet::$current !== null &&
-			Snippet::$current->parent() === $snippet
+			Snippet::$current === null ||
+			Snippet::$current->parent() !== $snippet
 		) {
-			$template = Snippet::$current->render($data, [
+			return $template;
+		}
+
+		// no slots have been defined, but the template code
+		// should be used as default slot
+		if (Snippet::$current->slots()->count() === 0) {
+			return Snippet::$current->render($data, [
 				'default' => $template
 			]);
 		}
 
-		return $template;
+		// let the snippet close and render natively
+		return Snippet::$current->render($data);
 	}
 
 	/**

tests/Template/SlotsTest.php

@@ -25,5 +25,6 @@ public function testSlots()
 		$this->assertSame($header, $slots->header());
 		$this->assertSame($footer, $slots->footer);
 		$this->assertSame($footer, $slots->footer());
+		$this->assertCount(2, $slots);
 	}
 }

tests/Template/SnippetTest.php

@@ -223,6 +223,27 @@ public function testRenderWithoutClosing()
 		$this->assertSame("<h1>Layout</h1>\ncontent<footer>with other stuff</footer>\n", $snippet->render());
 	}
 
+	/**
+	 * @covers ::render
+	 */
+	public function testRenderWithoutClosingAndMultipleSlots()
+	{
+		// all output must be captured
+		$this->expectOutputString('');
+
+		$snippet = new Snippet(__DIR__ . '/fixtures/layout-with-multiple-slots.php');
+
+		$snippet->slot('header');
+		echo 'Header content';
+		$snippet->endslot();
+
+		$snippet->slot();
+		echo 'Body content';
+		$snippet->endslot();
+
+		$this->assertSame("<h1>Layout</h1>\n<header>Header content</header>\n<main>Body content</main>\n", $snippet->render());
+	}
+
 	/**
 	 * @covers ::render
 	 */

tests/Template/fixtures/layout-with-multiple-slots.php

@@ -0,0 +1,3 @@
+<h1>Layout</h1>
+<header><?= $slots->header() ?></header>
+<main><?= $slot ?></main>