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

optimize batch function and add tests

Browse Source
This commit is contained in:
Luiz “Felds” Liscia
2013-02-21 12:11:54 -03:00
parent 15336c154c
commit ccf3cd1c81
4 changed files with 100 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/Twig/Extension/Core.php
+4 -3
View File
@@ -1328,9 +1328,10 @@ function twig_array_batch($items, $size, $fill = null)
if (null !== $fill) { if (null !== $fill) {
$last = count($result) - 1; $last = count($result) - 1;
while (count($result[$last]) < $size) { $result[$last] = array_merge(
$result[$last][] = $fill; $result[$last],
} array_fill(0, $size - count($result[$last]), $fill)
);
} }
return $result; return $result;
test/Twig/Tests/Fixtures/filters/batch.test
+22 -28
View File
@@ -1,37 +1,31 @@
--TEST-- --TEST--
"batch" filter "batch" filter
--TEMPLATE-- --TEMPLATE--
<table> {% for row in items|batch(3) %}
{% for row in items|batch(3, '') %} <div class=row>
<tr>
{% for column in row %} {% for column in row %}
<td>{{ column }}</td> <div class=item>{{ column }}</div>
{% endfor %} {% endfor %}
</tr> </div>
{% endfor %} {% endfor %}
</table>
--DATA-- --DATA--
return array('items' => array('a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j')) return array('items' => array('a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j'))
--EXPECT-- --EXPECT--
<table> <div class=row>
<tr> <div class=item>a</div>
<td>a</td> <div class=item>b</div>
<td>b</td> <div class=item>c</div>
<td>c</td> </div>
</tr> <div class=row>
<tr> <div class=item>d</div>
<td>d</td> <div class=item>e</div>
<td>e</td> <div class=item>f</div>
<td>f</td> </div>
</tr> <div class=row>
<tr> <div class=item>g</div>
<td>g</td> <div class=item>h</div>
<td>h</td> <div class=item>i</div>
<td>i</td> </div>
</tr> <div class=row>
<tr> <div class=item>j</div>
<td>j</td> </div>
<td></td>
<td></td>
</tr>
</table>
test/Twig/Tests/Fixtures/filters/batch_with_empty_fill.test
+37
View File
@@ -0,0 +1,37 @@
--TEST--
"batch" filter
--TEMPLATE--
<table>
{% for row in items|batch(3, '') %}
<tr>
{% for column in row %}
<td>{{ column }}</td>
{% endfor %}
</tr>
{% endfor %}
</table>
--DATA--
return array('items' => array('a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j'))
--EXPECT--
<table>
<tr>
<td>a</td>
<td>b</td>
<td>c</td>
</tr>
<tr>
<td>d</td>
<td>e</td>
<td>f</td>
</tr>
<tr>
<td>g</td>
<td>h</td>
<td>i</td>
</tr>
<tr>
<td>j</td>
<td></td>
<td></td>
</tr>
</table>
test/Twig/Tests/Fixtures/filters/batch_with_fill.test
+37
View File
@@ -0,0 +1,37 @@
--TEST--
"batch" filter
--TEMPLATE--
<table>
{% for row in items|batch(3, 'fill') %}
<tr>
{% for column in row %}
<td>{{ column }}</td>
{% endfor %}
</tr>
{% endfor %}
</table>
--DATA--
return array('items' => array('a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j'))
--EXPECT--
<table>
<tr>
<td>a</td>
<td>b</td>
<td>c</td>
</tr>
<tr>
<td>d</td>
<td>e</td>
<td>f</td>
</tr>
<tr>
<td>g</td>
<td>h</td>
<td>i</td>
</tr>
<tr>
<td>j</td>
<td>fill</td>
<td>fill</td>
</tr>
</table>