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

Merge branch '3.x' into 4.x

Browse Source 
* 3.x:
  Clarify the exception message for nested block chains from another environment
  Report a clear error when using macros imported in a template body that was not rendered

# Conflicts:
#	CHANGELOG
#	src/Template.php
#	tests/CallMacroTest.php
This commit is contained in:
Fabien Potencier
2026-09-14 14:07:14 +02:00
parent 6b5e02f47d 0f5c902d85
commit 11ff7bf08f
5 changed files with 52 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/BlockChainTest.php
+3 -2
View File
@@ -296,7 +296,7 @@ class BlockChainTest extends TestCase
$other = new Environment(new ArrayLoader(['theme' => '']));
$this->expectException(\LogicException::class);
$this->expectExceptionMessage('A block chain cannot contain templates from different Twig environments.');
$this->expectExceptionMessage('A block chain cannot contain a block chain from a different Twig environment.');
new BlockChain($twig, [new BlockChain($other, ['theme'])]);
}
@@ -519,7 +519,8 @@ class BlockChainTest extends TestCase
try {
$chain->renderBlock('field', ['helper' => 'macros1']);
$this->fail('Rendering an uninitialized import must fail.');
} catch (RuntimeError) {
} catch (RuntimeError $e) {
$this->assertStringContainsString('Macros imported in the body of template "theme" are not available because the body was not rendered', $e->getMessage());
}
$this->assertSame('one', $twig->render('theme', ['helper' => 'macros1']));