Merge branch '1.x' into 2.x

* 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
4 changed files with 24 additions and 3 deletions
+7
View File
@@ -84,6 +84,7 @@ class ExpressionParserTest extends TestCase
return [
['{{ [1, "a": "b"] }}'],
['{{ {"a": "b", 2} }}'],
['{{ {"a"} }}'],
];
}
@@ -160,6 +161,12 @@ class ExpressionParserTest extends TestCase
new ConstantExpression('c', 1),
], 1),
],
['{{ {a, b} }}', new ArrayExpression([
new ConstantExpression('a', 1),
new NameExpression('a', 1),
new ConstantExpression('b', 1),
new NameExpression('b', 1),
], 1)],
];
}