From 4195287f70772d5b7fd781531d6bee883df27cb1 Mon Sep 17 00:00:00 2001
From: Fabien Potencier <fabien@potencier.org>
Date: Tue, 12 Mar 2019 10:48:58 +0100
Subject: [PATCH] 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..5f6e22cb74 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));
+            foreach (array_fill(0, $fillCount, $fill) as $v) {
+                $result[$last][] = $v;
+            }
         }
     }
 
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>