geckon01/Twig
1
0
Fork 0
mirror of https://github.com/twigphp/Twig.git synced 2026-09-21 07:37:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '3.x' into 4.x

Browse Source 
* 3.x:
  Add `#[YieldReady]` to allow extensions to tell when they're ready for yielding
This commit is contained in:
Nicolas Grekas
2024-02-15 11:47:41 +01:00
parent ae7e6cc9a3 0990f81500
commit 1af9ad0c3e
46 changed files with 308 additions and 198 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/Node/ModuleTest.php
+4 -4
View File
@@ -55,7 +55,6 @@ class ModuleTest extends NodeTestCase
$macros = new Node();
$traits = new Node();
$source = new Source('{{ foo }}', 'foo.twig');
$displayStmt = $this->getEchoOrYield();
$node = new ModuleNode($body, $extends, $blocks, $macros, $traits, new Node([]), $source);
$tests[] = [$node, <<<EOF
@@ -96,7 +95,8 @@ class __TwigTemplate_%x extends Template
{
\$macros = \$this->macros;
// line 1
$displayStmt "foo";
yield "foo";
return; yield '';
}
/**
@@ -174,7 +174,7 @@ class __TwigTemplate_%x extends Template
\$macros["macro"] = \$this->macros["macro"] = \$this->loadTemplate("foo.twig", "foo.twig", 2)->unwrap();
// line 1
\$this->parent = \$this->loadTemplate("layout.twig", "foo.twig", 1);
{$this->getDisplayOrYield('$this->parent')}(\$context, array_merge(\$this->blocks, \$blocks));
yield from \$this->parent->unwrap()->yield(\$context, array_merge(\$this->blocks, \$blocks));
}
/**
@@ -264,7 +264,7 @@ class __TwigTemplate_%x extends Template
// line 4
\$context["foo"] = "foo";
// line 2
{$this->getDisplayOrYield('$this->getParent($context)')}(\$context, array_merge(\$this->blocks, \$blocks));
yield from \$this->getParent(\$context)->unwrap()->yield(\$context, array_merge(\$this->blocks, \$blocks));
}
/**