geckon01/Twig
1
0
Fork 0
mirror of https://github.com/twigphp/Twig.git synced 2026-09-12 02:16:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

added a proper error message when block() is called without arguments

Browse Source
This commit is contained in:
Fabien Potencier
2016-11-10 21:25:21 -08:00
parent 924c2f4813
commit a63ee7c6fb
2 changed files with 18 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/Twig/ExpressionParser.php
+6 -1
View File
@@ -344,7 +344,12 @@ class Twig_ExpressionParser
return new Twig_Node_Expression_Parent($this->parser->peekBlockStack(), $line);
case 'block':
return new Twig_Node_Expression_BlockReference($this->parseArguments()->getNode(0), false, $line);
$args = $this->parseArguments();
if (count($args) < 1) {
throw new Twig_Error_Syntax('The "block" function takes one argument (the block name).', $line, $this->parser->getStream()->getSourceContext()->getName());
}
return new Twig_Node_Expression_BlockReference($args->getNode(0), false, $line);
case 'attribute':
$args = $this->parseArguments();
if (count($args) < 2) {
test/Twig/Tests/Fixtures/functions/block_without_name.test
+12
View File
@@ -0,0 +1,12 @@
--TEST--
"block" function without arguments
--TEMPLATE--
{% extends 'base.twig' %}
{% block bar %}BAR{% endblock %}
--TEMPLATE(base.twig)--
{% block foo %}{{ block() }}{% endblock %}
{% block bar %}BAR_BASE{% endblock %}
--DATA--
return array()
--EXCEPTION--
Twig_Error_Syntax: The "block" function takes one argument (the block name) in "base.twig" at line 2.