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

Merge branch '2.x' into 3.x

Browse Source 
* 2.x:
  added support for macros on "is defined" tests
This commit is contained in:
Fabien Potencier
2019-05-17 18:56:16 +02:00
parent 4f7e216523 7c098a2209
commit c191b7a184
5 changed files with 63 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ExpressionParser.php
+5
View File
@@ -674,6 +674,11 @@ class ExpressionParser
$arguments = $this->parseArguments(true);
}
if ('defined' === $name && $node instanceof NameExpression && null !== $alias = $this->parser->getImportedSymbol('function', $node->getAttribute('name'))) {
$node = new MethodCallExpression($alias['node'], $alias['name'], new ArrayExpression([], $node->getTemplateLine()), $node->getTemplateLine());
$node->setAttribute('safe', true);
}
return new $class($node, $name, $arguments, $this->parser->getCurrentToken()->getLine());
}