added preserveKeys support for the batch filter

twigphp · Mar 12, 2019 · 37c398f · 37c398f
1 parent e797635
commit 37c398f
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 10 deletions.
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,5 +1,6 @@
 * 1.38.0 (2019-XX-XX)
 
+ * added preserveKeys support for the batch filter
  * added the possibility to pass a TemplateWrapper to Twig\Environment::load()
  * improved the performance of the sandbox
  * added a spaceless filter

diff --git a/src/Extension/CoreExtension.php b/src/Extension/CoreExtension.php
@@ -1638,23 +1638,20 @@ function twig_constant_is_defined($constant, $object = null)
  *
  * @return array
  */
-function twig_array_batch($items, $size, $fill = null)
+function twig_array_batch($items, $size, $fill = null, $preserveKeys = true)
 {
     if ($items instanceof \Traversable) {
-        $items = iterator_to_array($items, false);
+        $items = iterator_to_array($items, $preserveKeys);
     }
 
     $size = ceil($size);
 
-    $result = array_chunk($items, $size, true);
+    $result = array_chunk($items, $size, $preserveKeys);
 
-    if (null !== $fill && !empty($result)) {
+    if (null !== $fill && $result) {
         $last = \count($result) - 1;
         if ($fillCount = $size - \count($result[$last])) {
-            $result[$last] = array_merge(
-                $result[$last],
-                array_fill(0, $fillCount, $fill)
-            );
+            $result[$last] = array_merge($result[$last], array_fill(0, $fillCount, $fill));
         }
     }
 

diff --git a/test/Twig/Tests/Fixtures/filters/batch_with_keys.test b/test/Twig/Tests/Fixtures/filters/batch_with_keys.test
@@ -1,8 +1,8 @@
 --TEST--
 "batch" filter preserves array keys
 --TEMPLATE--
-{{ {'foo': 'bar', 'key': 'value'}|batch(4)|first|keys|join(',')  }}
-{{ {'foo': 'bar', 'key': 'value'}|batch(4, 'fill')|first|keys|join(',')  }}
+{{ {'foo': 'bar', 'key': 'value'}|batch(4)|first|keys|join(',') }}
+{{ {'foo': 'bar', 'key': 'value'}|batch(4, 'fill')|first|keys|join(',') }}
 --DATA--
 return []
 --EXPECT--