Wrap Tpl::load by overriding it as Snippet::load

Author: JojOatXGME

src/Template/Snippet.php

@@ -135,15 +135,30 @@ public static function end(): void
 	}
 
 	/**
-	 * Closes any potentially open layout snippet.
+	 * Renders the given template.
+	 * This method supports the use of layout snippets inside the template.
 	 *
-	 * @param Snippet|null $outsideSnippet The expected value for `Snippet::$current`.
-	 * @param string|null $template The content of the currently processed template or snippet.
-	 * @param array $data Additional data provided to any potential layout snippet.
-	 * @return string|null The new adjusted content of the template if `$template` was given.
+	 * @param string|null $file Path to the template file.
+	 * @param array $data Data available inside the template.
+	 * @param array $layoutData Data available inside any potential layout snippet.
+	 * @return string The rendered content of the given template file.
+	 * @throws Throwable
+	 *
+	 * @see Tpl::load() Base implementation without support for layout snippets.
 	 */
-	public static function endlayout(Snippet|null $outsideSnippet, string|null $template = null, array $data = []): string|null
-	{
+	public static function load(
+		string|null $file = null,
+		array $data = [],
+		array $layoutData = [],
+	): string {
+		// if the template is rendered inside a snippet,
+		// we need to keep the "outside" snippet object
+		// to compare it later
+		$outsideSnippet = Snippet::$current;
+
+		// load the template
+		$template = parent::load($file, $data);
+
 		// if last `endsnippet()` inside the current template
 		// has been omitted (= snippet was used as layout snippet),
 		// `Snippet::$current` will point to a snippet that was
@@ -159,21 +174,16 @@ public static function endlayout(Snippet|null $outsideSnippet, string|null $temp
 			return $template;
 		}
 
-		if (!isset($template)) {
-			// let the snippet close and render natively
-			echo static::$current?->render($data);
-			return null;
-		}
 		if (Snippet::$current->slots()->count() === 0) {
 			// no slots have been defined, but the template code
 			// should be used as default slot
-			return Snippet::$current->render($data, [
+			return Snippet::$current->render($layoutData, [
 				'default' => $template
 			]);
 		}
 		// swallow any "unslotted" content
 		// between start and end
-		return Snippet::$current->render($data);
+		return Snippet::$current->render($layoutData);
 	}
 
 	/**
@@ -289,16 +299,8 @@ public function render(array $data = [], array $slots = []): string
 		// custom data overrides for the data that was passed to the snippet instance
 		$data = array_replace_recursive($this->data, $data);
 
-		// if the template is rendered inside a snippet,
-		// we need to keep the "outside" snippet object
-		// to compare it later
-		$snippet = Snippet::$current;
-
 		// load the template representing this snippet
-		$template = static::load($this->file, static::scope($data, $this->slots()));
-
-		// handle any potentially open layout snippet
-		return static::endlayout($snippet, $template);
+		return static::load($this->file, static::scope($data, $this->slots()));
 	}
 
 	/**

src/Template/Template.php

@@ -5,7 +5,6 @@
 use Exception;
 use Kirby\Cms\App;
 use Kirby\Filesystem\F;
-use Kirby\Toolkit\Tpl;
 use Stringable;
 
 /**
@@ -155,16 +154,7 @@ public function name(): string
 	 */
 	public function render(array $data = []): string
 	{
-		// if the template is rendered inside a snippet,
-		// we need to keep the "outside" snippet object
-		// to compare it later
-		$snippet = Snippet::$current;
-
-		// load the template
-		$template = Tpl::load($this->file(), $data);
-
-		// handle any potentially open layout snippet
-		return Snippet::endlayout($snippet, $template, $data);
+		return Snippet::load($this->file(), $data, $data);
 	}
 
 	/**