geckon01/Twig
1
0
Fork 0
mirror of https://github.com/twigphp/Twig.git synced 2026-11-13 13:56:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '2.x' into 3.x

Browse Source 
* 2.x:
  tweaked the error message when using extends in a block/macro
This commit is contained in:
Fabien Potencier
2019-05-16 16:17:01 +02:00
parent 2e8354bdee ad1d08a431
commit 50f8df7fc7
5 changed files with 25 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/TokenParser/ExtendsTokenParser.php
+4 -2
View File
@@ -27,8 +27,10 @@ final class ExtendsTokenParser extends AbstractTokenParser
{
$stream = $this->parser->getStream();
if (!$this->parser->isMainScope()) {
throw new SyntaxError('Cannot extend from a block.', $token->getLine(), $stream->getSourceContext());
if ($this->parser->peekBlockStack()) {
throw new SyntaxError('Cannot use "extend" in a block.', $token->getLine(), $stream->getSourceContext());
} elseif (!$this->parser->isMainScope()) {
throw new SyntaxError('Cannot use "extend" in a macro.', $token->getLine(), $stream->getSourceContext());
}
if (null !== $this->parser->getParent()) {