delegate rendering to twig if a template surrogate exists

m-vo · m-vo · commit 5e9b81de2de0 · 2021-07-09T17:16:50.000+02:00
diff --git a/core-bundle/src/Resources/contao/library/Contao/TemplateInheritance.php b/core-bundle/src/Resources/contao/library/Contao/TemplateInheritance.php
@@ -12,6 +12,7 @@
 
 use Contao\CoreBundle\Monolog\ContaoContext;
 use Psr\Log\LogLevel;
+use Webmozart\PathUtil\Path;
 
 /**
  * Provides the template inheritance logic
@@ -68,13 +69,24 @@ trait TemplateInheritance
 	 */
 	protected $intBufferLevel = 0;
 
+	/**
+	 * Allow to delegate rendering to Twig
+	 * @var bool
+	 */
+	protected $blnEnableTwigSurrogateRendering = true;
+
 	/**
 	 * Parse the template file and return it as string
 	 *
 	 * @return string The template markup
 	 */
 	public function inherit()
 	{
+		if ($this->blnEnableTwigSurrogateRendering && null !== ($result = $this->renderTwigSurrogateIfExists()))
+		{
+			return $result;
+		}
+
 		$strBuffer = '';
 
 		// Start with the template itself
@@ -323,6 +335,35 @@ protected function getTemplatePath($strTemplate, $strFormat='html5', $blnDefault
 
 		return Controller::getTemplate($strTemplate);
 	}
+
+	private function renderTwigSurrogateIfExists(): ?string
+	{
+		$templateCandidates = array(
+			"@ContaoLegacy/{$this->strTemplate}.html.twig",
+		);
+
+		if (null !== ($page = $GLOBALS['objPage'] ?? null) && null !== $themePath = $page->templateGroup)
+		{
+			$theme = Path::makeRelative($themePath, 'templates');
+
+			array_unshift(
+				$templateCandidates,
+				"@ContaoLegacy_$theme/{$this->strTemplate}.html.twig",
+			);
+		}
+
+		$twig = System::getContainer()->get('twig');
+
+		foreach ($templateCandidates as $templateCandidate)
+		{
+			if ($twig->getLoader()->exists($templateCandidate))
+			{
+				return $twig->render($templateCandidate, $this->arrData);
+			}
+		}
+
+		return null;
+	}
 }
 
 class_alias(TemplateInheritance::class, 'TemplateInheritance');
