Drupal
/
drupal
mirror of https://git.drupalcode.org/project/drupal.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Issue #2698141 by TravisCarden, ChuChuNaKu, effulgentsia: Empty Twig {% trans %} tag causes unhelpful fatal exception

8.2.x
Alex Pott 2016-06-26 10:50:41 +02:00
parent eac023bced
commit 1dc4ba8533
2 changed files with 27 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
core/lib/Drupal/Core/Template/TwigNodeTrans.php
View File

@ -169,6 +169,9 @@ class TwigNodeTrans extends \Twig_Node {
}
}
}
elseif (!$body->hasAttribute('data')) {
throw new \Twig_Error_Syntax('{% trans %} tag cannot be empty');
}
else {
$text = $body->getAttribute('data');
}

24
core/modules/system/src/Tests/Theme/TwigTransTest.php
View File

@ -91,6 +91,30 @@ class TwigTransTest extends WebTestBase {
$this->assertTwigTransTags();
}
/**
* Test empty Twig "trans" tags.
*/
public function testEmptyTwigTransTags() {
$elements = [
'#type' => 'inline_template',
'#template' => '{% trans %}{% endtrans %}',
];
/** @var \Drupal\Core\Render\RendererInterface $renderer */
$renderer = \Drupal::service('renderer');
try {
$renderer->renderPlain($elements);
$this->fail('{% trans %}{% endtrans %} did not throw an exception.');
}
catch (\Twig_Error_Syntax $e) {
$this->assertTrue(strstr($e->getMessage(), '{% trans %} tag cannot be empty'), '{% trans %}{% endtrans %} threw the expected exception.');
}
catch (\Exception $e) {
$this->fail('{% trans %}{% endtrans %} threw an unexpected exception.');
}
}
/**
* Asserts Twig trans tags.
*/