Merge branch '1.x' into 2.x

* 1.x: Fix issue #3159 Fix issue #3160
twigphp · Oct 1, 2019 · f8c5f86 · f8c5f86
2 parents c2fd999 + 8909a16
commit f8c5f86
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 2 deletions.
diff --git a/doc/filters/batch.rst b/doc/filters/batch.rst
@@ -46,3 +46,4 @@ Arguments
 
 * ``size``: The size of the batch; fractional numbers will be rounded up
 * ``fill``: Used to fill in missing items
+* ``preserve_keys``: Whether to preserve keys or not
diff --git a/doc/filters/map.rst b/doc/filters/map.rst
@@ -34,5 +34,4 @@ Note that the arrow function has access to the current context.
 Arguments
 ---------
 
-* ``array``: The sequence or mapping
 * ``arrow``: The arrow function
diff --git a/doc/filters/reduce.rst b/doc/filters/reduce.rst
@@ -28,6 +28,5 @@ Note that the arrow function has access to the current context.
 Arguments
 ---------
 
-* ``array``: The sequence or mapping
 * ``arrow``: The arrow function
 * ``initial``: The initial value