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

fixed the for tag for large arrays (closes #64 - based on an idea from gwilym - aeb56f9f966bd23b77d35c87999be0606dbb3f47)

Browse Source
This commit is contained in:
Fabien Potencier
2010-06-07 11:04:23 +02:00
parent f2bb0aa911
commit d47902c7b9
7 changed files with 81 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files
CHANGELOG
+1
View File
@@ -5,6 +5,7 @@ Backward incompatibilities:
* removed the sandboxed attribute of the include tag (use the new sandbox tag instead)
* refactored the Node system (if you have custom nodes, you will have to update them to use the new API)
* fixed the for tag for large arrays (some loop variables are now only available for arrays and objects that implement the Countable interface)
* removed the Twig_Resource::resolveMissingFilter() method
* fixed the filter tag which did not apply filtering to included files
* added a bunch of unit tests
doc/02-Twig-for-Template-Designers.markdown
+7
View File
@@ -466,6 +466,13 @@ for a small speed boost):
| `loop.length` | The number of items in the sequence
| `loop.parent` | The parent context
>**NOTE**
>The `loop.length`, `loop.revindex`, `loop.revindex0`, and `loop.last`
>variables are only available for PHP arrays, or objects that implement the
>`Countable` interface (as of Twig 0.9.7).
-
>**NOTE**
>Unlike in PHP it's not possible to `break` or `continue` in a loop.
lib/Twig/Extension/Core.php
+1 -1
View File
@@ -293,7 +293,7 @@ function twig_iterator_to_array($seq, $useKeys = true)
if (is_array($seq)) {
return $seq;
} elseif (is_object($seq) && $seq instanceof Traversable) {
return $seq instanceof Countable ? $seq : iterator_to_array($seq, $useKeys);
return $seq;
} else {
return array();
}
lib/Twig/Node/For.php
+20 -11
View File
@@ -39,23 +39,28 @@ class Twig_Node_For extends Twig_Node
$compiler
->write("\$context['_seq'] = twig_iterator_to_array(")
->subcompile($this->seq)
->raw(", ".(null !== $this->key_target ? 'true' : 'false').");\n")
->raw(");\n")
;
if ($this['with_loop']) {
$compiler
->write("\$length = count(\$context['_seq']);\n")
->write("\$countable = is_array(\$context['_seq']) || (is_object(\$context['_seq']) && \$context['_seq'] instanceof Countable);\n")
->write("\$length = \$countable ? count(\$context['_seq']) : null;\n")
->write("\$context['loop'] = array(\n")
->write(" 'parent' => \$context['_parent'],\n")
->write(" 'length' => \$length,\n")
->write(" 'index0' => 0,\n")
->write(" 'index' => 1,\n")
->write(" 'revindex0' => \$length - 1,\n")
->write(" 'revindex' => \$length,\n")
->write(" 'first' => true,\n")
->write(" 'last' => 1 === \$length,\n")
->write(" 'parent' => \$context['_parent'],\n")
->write(" 'index0' => 0,\n")
->write(" 'index' => 1,\n")
->write(" 'first' => true,\n")
->write(");\n")
->write("if (\$countable) {\n")
->indent()
->write("\$context['loop']['revindex0'] = \$length - 1;\n")
->write("\$context['loop']['revindex'] = \$length;\n")
->write("\$context['loop']['length'] = \$length;\n")
->write("\$context['loop']['last'] = 1 === \$length;\n")
->outdent()
->write("}\n")
;
}
@@ -78,10 +83,14 @@ class Twig_Node_For extends Twig_Node
$compiler
->write("++\$context['loop']['index0'];\n")
->write("++\$context['loop']['index'];\n")
->write("\$context['loop']['first'] = false;\n")
->write("if (\$countable) {\n")
->indent()
->write("--\$context['loop']['revindex0'];\n")
->write("--\$context['loop']['revindex'];\n")
->write("\$context['loop']['first'] = false;\n")
->write("\$context['loop']['last'] = 0 === \$context['loop']['revindex0'];\n")
->outdent()
->write("}\n")
;
}
test/Twig/Tests/Node/ForTest.php
+37 -27
View File
@@ -62,7 +62,7 @@ class Twig_Tests_Node_ForTest extends Twig_Tests_Node_TestCase
$tests[] = array($node, <<<EOF
\$context['_parent'] = (array) \$context;
\$context['_seq'] = twig_iterator_to_array(\$this->getContext(\$context, 'items'), true);
\$context['_seq'] = twig_iterator_to_array(\$this->getContext(\$context, 'items'));
foreach (\$context['_seq'] as \$context['key'] => \$context['item']) {
echo \$this->getContext(\$context, 'foo');
}
@@ -82,26 +82,31 @@ EOF
$tests[] = array($node, <<<EOF
\$context['_parent'] = (array) \$context;
\$context['_seq'] = twig_iterator_to_array(\$this->getContext(\$context, 'values'), true);
\$length = count(\$context['_seq']);
\$context['_seq'] = twig_iterator_to_array(\$this->getContext(\$context, 'values'));
\$countable = is_array(\$context['_seq']) || (is_object(\$context['_seq']) && \$context['_seq'] instanceof Countable);
\$length = \$countable ? count(\$context['_seq']) : null;
\$context['loop'] = array(
'parent' => \$context['_parent'],
'length' => \$length,
'index0' => 0,
'index' => 1,
'revindex0' => \$length - 1,
'revindex' => \$length,
'first' => true,
'last' => 1 === \$length,
'parent' => \$context['_parent'],
'index0' => 0,
'index' => 1,
'first' => true,
);
if (\$countable) {
\$context['loop']['revindex0'] = \$length - 1;
\$context['loop']['revindex'] = \$length;
\$context['loop']['length'] = \$length;
\$context['loop']['last'] = 1 === \$length;
}
foreach (\$context['_seq'] as \$context['k'] => \$context['v']) {
echo \$this->getContext(\$context, 'foo');
++\$context['loop']['index0'];
++\$context['loop']['index'];
--\$context['loop']['revindex0'];
--\$context['loop']['revindex'];
\$context['loop']['first'] = false;
\$context['loop']['last'] = 0 === \$context['loop']['revindex0'];
if (\$countable) {
--\$context['loop']['revindex0'];
--\$context['loop']['revindex'];
\$context['loop']['last'] = 0 === \$context['loop']['revindex0'];
}
}
\$_parent = \$context['_parent'];
unset(\$context['_seq'], \$context['_iterated'], \$context['k'], \$context['v'], \$context['_parent'], \$context['loop']);
@@ -120,27 +125,32 @@ EOF
$tests[] = array($node, <<<EOF
\$context['_parent'] = (array) \$context;
\$context['_iterated'] = false;
\$context['_seq'] = twig_iterator_to_array(\$this->getContext(\$context, 'values'), true);
\$length = count(\$context['_seq']);
\$context['_seq'] = twig_iterator_to_array(\$this->getContext(\$context, 'values'));
\$countable = is_array(\$context['_seq']) || (is_object(\$context['_seq']) && \$context['_seq'] instanceof Countable);
\$length = \$countable ? count(\$context['_seq']) : null;
\$context['loop'] = array(
'parent' => \$context['_parent'],
'length' => \$length,
'index0' => 0,
'index' => 1,
'revindex0' => \$length - 1,
'revindex' => \$length,
'first' => true,
'last' => 1 === \$length,
'parent' => \$context['_parent'],
'index0' => 0,
'index' => 1,
'first' => true,
);
if (\$countable) {
\$context['loop']['revindex0'] = \$length - 1;
\$context['loop']['revindex'] = \$length;
\$context['loop']['length'] = \$length;
\$context['loop']['last'] = 1 === \$length;
}
foreach (\$context['_seq'] as \$context['k'] => \$context['v']) {
\$context['_iterated'] = true;
echo \$this->getContext(\$context, 'foo');
++\$context['loop']['index0'];
++\$context['loop']['index'];
--\$context['loop']['revindex0'];
--\$context['loop']['revindex'];
\$context['loop']['first'] = false;
\$context['loop']['last'] = 0 === \$context['loop']['revindex0'];
if (\$countable) {
--\$context['loop']['revindex0'];
--\$context['loop']['revindex'];
\$context['loop']['last'] = 0 === \$context['loop']['revindex0'];
}
}
if (!\$context['_iterated']) {
echo \$this->getContext(\$context, 'foo');
test/fixtures/tags/for/objects.test
Vendored
+3 -6
View File
@@ -4,8 +4,7 @@
{% for item in items %}
* {{ item }}
* {{ loop.index }}/{{ loop.index0 }}
* {{ loop.revindex }}/{{ loop.revindex0 }}
* {{ loop.first }}/{{ loop.last }}/{{ loop.length }}
* {{ loop.first }}
{% endfor %}
@@ -30,13 +29,11 @@ return array('items' => new ItemsIterator())
--EXPECT--
* bar
* 1/0
* 2/1
* 1//2
* 1
* foo
* 2/1
* 1/0
* /1/2
*
* foo/bar
test/fixtures/tags/for/objects_countable.test
Vendored
+12
View File
@@ -3,6 +3,10 @@
--TEMPLATE--
{% for item in items %}
* {{ item }}
* {{ loop.index }}/{{ loop.index0 }}
* {{ loop.revindex }}/{{ loop.revindex0 }}
* {{ loop.first }}/{{ loop.last }}/{{ loop.length }}
{% endfor %}
{% for key, value in items %}
@@ -26,7 +30,15 @@ class ItemsIteratorCountable implements Iterator, Countable
return array('items' => new ItemsIteratorCountable())
--EXPECT--
* bar
* 1/0
* 2/1
* 1//2
* foo
* 2/1
* 1/0
* /1/2
* foo/bar
* bar/foo