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

Revert "merged branch arnaud-lb/hash-key-expr (PR #514)"

Browse Source 
This reverts commit 8665c64634, reversing
changes made to 4aba337cda.
This commit is contained in:
Fabien Potencier
2011-12-23 08:58:23 +01:00
parent a555faec40
commit 99b2c5bf99
7 changed files with 26 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files
CHANGELOG
-1
View File
@@ -1,6 +1,5 @@
* 1.5.0
* allowed hash keys to be any expression
* added a do tag
* added a flush tag
* added support for dynamically named filters and functions
lib/Twig/ExpressionParser.php
+8 -11
View File
@@ -198,7 +198,6 @@ class Twig_ExpressionParser
$stream = $this->parser->getStream();
$stream->expect(Twig_Token::PUNCTUATION_TYPE, '[', 'An array element was expected');
$elements = array();
$index = 0;
while (!$stream->test(Twig_Token::PUNCTUATION_TYPE, ']')) {
if (!empty($elements)) {
$stream->expect(Twig_Token::PUNCTUATION_TYPE, ',', 'An array element must be followed by a comma');
@@ -209,12 +208,7 @@ class Twig_ExpressionParser
}
}
$value = $this->parseExpression();
$key = new Twig_Node_Expression_Constant($index, $value->getLine());
array_push($elements, $key, $value);
$index += 1;
$elements[] = $this->parseExpression();
}
$stream->expect(Twig_Token::PUNCTUATION_TYPE, ']', 'An opened array is not properly closed');
@@ -236,11 +230,14 @@ class Twig_ExpressionParser
}
}
$key = $this->parseExpression();
$stream->expect(Twig_Token::PUNCTUATION_TYPE, ':', 'A hash key must be followed by a colon (:)');
$value = $this->parseExpression();
if (!$stream->test(Twig_Token::STRING_TYPE) && !$stream->test(Twig_Token::NUMBER_TYPE)) {
$current = $stream->getCurrent();
throw new Twig_Error_Syntax(sprintf('A hash key must be a quoted string or a number (unexpected token "%s" of value "%s"', Twig_Token::typeToEnglish($current->getType(), $current->getLine()), $current->getValue()), $current->getLine());
}
array_push($elements, $key, $value);
$key = $stream->next()->getValue();
$stream->expect(Twig_Token::PUNCTUATION_TYPE, ':', 'A hash key must be followed by a colon (:)');
$elements[$key] = $this->parseExpression();
}
$stream->expect(Twig_Token::PUNCTUATION_TYPE, '}', 'An opened hash is not properly closed');
lib/Twig/Node/Expression/Array.php
+3 -17
View File
@@ -15,20 +15,6 @@ class Twig_Node_Expression_Array extends Twig_Node_Expression
parent::__construct($elements, array(), $lineno);
}
public function getKeyValuePairs()
{
$pairs = array();
foreach (array_chunk($this->nodes, 2) as $pair) {
$pairs[] = array(
'key' => $pair[0],
'value' => $pair[1],
);
}
return $pairs;
}
/**
* Compiles the node to PHP.
*
@@ -38,16 +24,16 @@ class Twig_Node_Expression_Array extends Twig_Node_Expression
{
$compiler->raw('array(');
$first = true;
foreach ($this->getKeyValuePairs() as $pair) {
foreach ($this->nodes as $name => $node) {
if (!$first) {
$compiler->raw(', ');
}
$first = false;
$compiler
->subcompile($pair['key'])
->repr($name)
->raw(' => ')
->subcompile($pair['value'])
->subcompile($node)
;
}
$compiler->raw(')');
test/Twig/Tests/ExpressionParserTest.php
+9 -31
View File
@@ -64,6 +64,7 @@ class Twig_Tests_ExpressionParserTest extends PHPUnit_Framework_TestCase
{
return array(
array('{{ [1, "a": "b"] }}'),
array('{{ {a: "b"} }}'),
array('{{ {"a": "b", 2} }}'),
);
}
@@ -73,9 +74,6 @@ class Twig_Tests_ExpressionParserTest extends PHPUnit_Framework_TestCase
return array(
// simple array
array('{{ [1, 2] }}', new Twig_Node_Expression_Array(array(
new Twig_Node_Expression_Constant(0, 1),
new Twig_Node_Expression_Constant(1, 1),
new Twig_Node_Expression_Constant(1, 1),
new Twig_Node_Expression_Constant(2, 1),
), 1),
@@ -83,9 +81,6 @@ class Twig_Tests_ExpressionParserTest extends PHPUnit_Framework_TestCase
// array with trailing ,
array('{{ [1, 2, ] }}', new Twig_Node_Expression_Array(array(
new Twig_Node_Expression_Constant(0, 1),
new Twig_Node_Expression_Constant(1, 1),
new Twig_Node_Expression_Constant(1, 1),
new Twig_Node_Expression_Constant(2, 1),
), 1),
@@ -93,52 +88,35 @@ class Twig_Tests_ExpressionParserTest extends PHPUnit_Framework_TestCase
// simple hash
array('{{ {"a": "b", "b": "c"} }}', new Twig_Node_Expression_Array(array(
new Twig_Node_Expression_Constant('a', 1),
new Twig_Node_Expression_Constant('b', 1),
new Twig_Node_Expression_Constant('b', 1),
new Twig_Node_Expression_Constant('c', 1),
'a' => new Twig_Node_Expression_Constant('b', 1),
'b' => new Twig_Node_Expression_Constant('c', 1),
), 1),
),
// hash with trailing ,
array('{{ {"a": "b", "b": "c", } }}', new Twig_Node_Expression_Array(array(
new Twig_Node_Expression_Constant('a', 1),
new Twig_Node_Expression_Constant('b', 1),
new Twig_Node_Expression_Constant('b', 1),
new Twig_Node_Expression_Constant('c', 1),
'a' => new Twig_Node_Expression_Constant('b', 1),
'b' => new Twig_Node_Expression_Constant('c', 1),
), 1),
),
// hash in an array
array('{{ [1, {"a": "b", "b": "c"}] }}', new Twig_Node_Expression_Array(array(
new Twig_Node_Expression_Constant(0, 1),
new Twig_Node_Expression_Constant(1, 1),
new Twig_Node_Expression_Constant(1, 1),
new Twig_Node_Expression_Array(array(
new Twig_Node_Expression_Constant('a', 1),
new Twig_Node_Expression_Constant('b', 1),
new Twig_Node_Expression_Constant('b', 1),
new Twig_Node_Expression_Constant('c', 1),
'a' => new Twig_Node_Expression_Constant('b', 1),
'b' => new Twig_Node_Expression_Constant('c', 1),
), 1),
), 1),
),
// array in a hash
array('{{ {"a": [1, 2], "b": "c"} }}', new Twig_Node_Expression_Array(array(
new Twig_Node_Expression_Constant('a', 1),
new Twig_Node_Expression_Array(array(
new Twig_Node_Expression_Constant(0, 1),
new Twig_Node_Expression_Constant(1, 1),
'a' => new Twig_Node_Expression_Array(array(
new Twig_Node_Expression_Constant(1, 1),
new Twig_Node_Expression_Constant(2, 1),
), 1),
new Twig_Node_Expression_Constant('b', 1),
new Twig_Node_Expression_Constant('c', 1),
'b' => new Twig_Node_Expression_Constant('c', 1),
), 1),
),
);
test/Twig/Tests/Fixtures/expressions/array.test
-10
View File
@@ -27,13 +27,6 @@ Twig supports array notation
2,
]|join(',')
}}
{# keys can be any expression #}
{% set a = 1 %}
{% set b = "foo" %}
{% set ary = { a: 'a', b: 'b', 'c': 'c', a~b: 'd' } %}
{{ ary|keys|join(',') }}
{{ ary|join(',') }}
--DATA--
return array('bar' => 'bar', 'foo' => array('bar' => 'bar'))
--EXPECT--
@@ -50,6 +43,3 @@ bar
FOO,BAR,
1,2
1,foo,c,1foo
a,b,c,d
test/Twig/Tests/Node/Expression/ArrayTest.php
+4 -7
View File
@@ -18,10 +18,10 @@ class Twig_Tests_Node_Expression_ArrayTest extends Twig_Tests_Node_TestCase
*/
public function testConstructor()
{
$elements = array(new Twig_Node_Expression_Constant('foo', 0), $foo = new Twig_Node_Expression_Constant('bar', 0));
$elements = array('foo' => $foo = new Twig_Node_Expression_Constant('bar', 0));
$node = new Twig_Node_Expression_Array($elements, 0);
$this->assertEquals($foo, $node->getNode(1));
$this->assertEquals($foo, $node->getNode('foo'));
}
/**
@@ -36,11 +36,8 @@ class Twig_Tests_Node_Expression_ArrayTest extends Twig_Tests_Node_TestCase
public function getTests()
{
$elements = array(
new Twig_Node_Expression_Constant('foo', 0),
new Twig_Node_Expression_Constant('bar', 0),
new Twig_Node_Expression_Constant('bar', 0),
new Twig_Node_Expression_Constant('foo', 0),
'foo' => new Twig_Node_Expression_Constant('bar', 0),
'bar' => new Twig_Node_Expression_Constant('foo', 0),
);
$node = new Twig_Node_Expression_Array($elements, 0);
test/Twig/Tests/Node/IncludeTest.php
+2 -2
View File
@@ -25,7 +25,7 @@ class Twig_Tests_Node_IncludeTest extends Twig_Tests_Node_TestCase
$this->assertEquals($expr, $node->getNode('expr'));
$this->assertFalse($node->getAttribute('only'));
$vars = new Twig_Node_Expression_Array(array(new Twig_Node_Expression_Constant('foo', 0), new Twig_Node_Expression_Constant(true, 0)), 0);
$vars = new Twig_Node_Expression_Array(array('foo' => new Twig_Node_Expression_Constant(true, 0)), 0);
$node = new Twig_Node_Include($expr, $vars, true, false, 0);
$this->assertEquals($vars, $node->getNode('variables'));
$this->assertTrue($node->getAttribute('only'));
@@ -62,7 +62,7 @@ EOF
);
$expr = new Twig_Node_Expression_Constant('foo.twig', 0);
$vars = new Twig_Node_Expression_Array(array(new Twig_Node_Expression_Constant('foo', 0), new Twig_Node_Expression_Constant(true, 0)), 0);
$vars = new Twig_Node_Expression_Array(array('foo' => new Twig_Node_Expression_Constant(true, 0)), 0);
$node = new Twig_Node_Include($expr, $vars, false, false, 0);
$tests[] = array($node, '$this->env->loadTemplate("foo.twig")->display(array_merge($context, array("foo" => true)));');