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

Merge branch '1.x' into 2.x

Browse Source 
* 1.x:
  Bump version
  Tweak docs
  Update CHANGELOG
  Support object init from variable
This commit is contained in:
Fabien Potencier
2020-08-23 14:01:18 +02:00
parent cb3a8a25d0 c6927de9e7
commit 77dcff7186
4 changed files with 24 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ExpressionParser.php
+10 -1
View File
@@ -366,7 +366,16 @@ class ExpressionParser
// * a string -- 'a'
// * a name, which is equivalent to a string -- a
// * an expression, which must be enclosed in parentheses -- (1 + 2)
if (($token = $stream->nextIf(/* Token::STRING_TYPE */ 7)) || ($token = $stream->nextIf(/* Token::NAME_TYPE */ 5)) || $token = $stream->nextIf(/* Token::NUMBER_TYPE */ 6)) {
if ($token = $stream->nextIf(/* Token::NAME_TYPE */ 5)) {
$key = new ConstantExpression($token->getValue(), $token->getLine());
// {a} is a shortcut for {a:a}
if ($stream->test(Token::PUNCTUATION_TYPE, [',', '}'])) {
$value = new NameExpression($key->getAttribute('value'), $key->getTemplateLine());
$node->addElement($value, $key);
continue;
}
} elseif (($token = $stream->nextIf(/* Token::STRING_TYPE */ 7)) || $token = $stream->nextIf(/* Token::NUMBER_TYPE */ 6)) {
$key = new ConstantExpression($token->getValue(), $token->getLine());
} elseif ($stream->test(/* Token::PUNCTUATION_TYPE */ 9, '(')) {
$key = $this->parseExpression();