From ede9a604eb43533b322c932d08f986999300b3f0 Mon Sep 17 00:00:00 2001
From: Fabien Potencier <fabien@potencier.org>
Date: Tue, 12 Mar 2019 10:19:08 +0100
Subject: [PATCH 1/2] added preserveKeys support for the batch filter

---
 CHANGELOG                                           |  1 +
 src/Extension/CoreExtension.php                     | 13 +++++--------
 .../Tests/Fixtures/filters/batch_with_keys.test     |  4 ++--
 3 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index 7e9ad26144..205c88e53e 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,5 +1,6 @@
 * 1.38.0 (2019-XX-XX)
 
+ * added preserveKeys support for the batch filter
  * fixed "embed" support when used from "template_from_string"
  * added the possibility to pass a TemplateWrapper to Twig\Environment::load()
  * improved the performance of the sandbox
diff --git a/src/Extension/CoreExtension.php b/src/Extension/CoreExtension.php
index 21178b6ef3..7918e1f8e8 100644
--- 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
index f3279a636f..e56cd79bbc 100644
--- 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--

From 750cb237421a2210b677c8ae1f23096ce407714b Mon Sep 17 00:00:00 2001
From: Fabien Potencier <fabien@potencier.org>
Date: Tue, 12 Mar 2019 10:48:58 +0100
Subject: [PATCH 2/2] fixed batch filter clobbers array keys when fill
 parameter is used

---
 CHANGELOG                                     |  1 +
 src/Extension/CoreExtension.php               |  4 +++-
 .../filters/batch_with_more_elements.test     | 23 +++++++++++++++++++
 3 files changed, 27 insertions(+), 1 deletion(-)
 create mode 100644 test/Twig/Tests/Fixtures/filters/batch_with_more_elements.test

diff --git a/CHANGELOG b/CHANGELOG
index 205c88e53e..b5e117f4b2 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,5 +1,6 @@
 * 1.38.0 (2019-XX-XX)
 
+ * fixed batch filter clobbers array keys when fill parameter is used
  * added preserveKeys support for the batch filter
  * fixed "embed" support when used from "template_from_string"
  * added the possibility to pass a TemplateWrapper to Twig\Environment::load()
diff --git a/src/Extension/CoreExtension.php b/src/Extension/CoreExtension.php
index 7918e1f8e8..63265d619a 100644
--- a/src/Extension/CoreExtension.php
+++ b/src/Extension/CoreExtension.php
@@ -1651,7 +1651,9 @@ function twig_array_batch($items, $size, $fill = null, $preserveKeys = true)
     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));
+            for ($i = 0; $i < $fillCount; $i++) {
+                $result[$last][] = $fill;
+            }
         }
     }
 
diff --git a/test/Twig/Tests/Fixtures/filters/batch_with_more_elements.test b/test/Twig/Tests/Fixtures/filters/batch_with_more_elements.test
new file mode 100644
index 0000000000..90f4de6859
--- /dev/null
+++ b/test/Twig/Tests/Fixtures/filters/batch_with_more_elements.test
@@ -0,0 +1,23 @@
+--TEST--
+"batch" filter
+--TEMPLATE--
+{% for row in items|batch(3, 'fill') %}
+  <div class=row>
+  {% for key, column in row %}
+    <div class={{ key }}>{{ column }}</div>
+  {% endfor %}
+  </div>
+{% endfor %}
+--DATA--
+return ['items' => ['a' => 'a', 'b' => 'b', 'c' => 'c', 'd' => 'd', '123' => 'e']]
+--EXPECT--
+<div class=row>
+      <div class=a>a</div>
+      <div class=b>b</div>
+      <div class=c>c</div>
+    </div>
+  <div class=row>
+      <div class=d>d</div>
+      <div class=123>e</div>
+      <div class=124>fill</div>
+    </div>