Merge branch '3.x' into 4.x

* 3.x:
  Resolve block chains against the render context instead of freezing lineages
  Resolve constant parent templates once instead of on every lookup
  Template runtime and block composition
  Fix wrapping the Twig cache pool in a second tag aware adapter
  Check that the use tag is allowed before resolving trait templates

# Conflicts:
#	CHANGELOG
#	extra/twig-extra-bundle/TwigExtraBundle.php
#	src/Template.php
This commit is contained in:
Fabien Potencier
2026-09-12 09:57:39 +02:00
17 changed files with 1426 additions and 13 deletions
+1 -1
View File
@@ -213,7 +213,7 @@ class __TwigTemplate_%x extends Template
protected function doGetParent(array \$context): bool|string|Template|TemplateWrapper
{
// line 1
return "layout.twig";
return \$this->parent ??= \$this->load("layout.twig", 1);
}
protected function doDisplay(array \$context, array \$blocks = []): iterable