From: Fabien Potencier <fabien.potencier@gmail.com>
Date: Tue, 26 Feb 2013 13:02:07 +0000 (+0100)
Subject: Merge remote-tracking branch 'lyrixx/feat-batch-ceil'
X-Git-Url: http://git.silmor.de/gitweb/?a=commitdiff_plain;h=7b11c6fd5e8356fb4f0e2b539c4a91839031d54c;p=web%2Fkonrad%2Ftwig.git

Merge remote-tracking branch 'lyrixx/feat-batch-ceil'

* lyrixx/feat-batch-ceil:
  Ceil the size in batch filter

Conflicts:
	test/Twig/Tests/Fixtures/filters/batch.test
---

7b11c6fd5e8356fb4f0e2b539c4a91839031d54c
diff --cc test/Twig/Tests/Fixtures/filters/batch_float.php
index 0000000,0000000..52de39c
new file mode 100644
--- /dev/null
+++ b/test/Twig/Tests/Fixtures/filters/batch_float.php
@@@ -1,0 -1,0 +1,31 @@@
++--TEST--
++"batch" filter
++--TEMPLATE--
++{% for row in items|batch(3.1) %}
++  <div class=row>
++  {% for column in row %}
++    <div class=item>{{ column }}</div>
++  {% endfor %}
++  </div>
++{% endfor %}
++--DATA--
++return array('items' => array('a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j'))
++--EXPECT--
++<div class=row>
++      <div class=item>a</div>
++      <div class=item>b</div>
++      <div class=item>c</div>
++    </div>
++  <div class=row>
++      <div class=item>d</div>
++      <div class=item>e</div>
++      <div class=item>f</div>
++    </div>
++  <div class=row>
++      <div class=item>g</div>
++      <div class=item>h</div>
++      <div class=item>i</div>
++    </div>
++  <div class=row>
++      <div class=item>j</div>
++    </div>