bug #4565 Fix wrong array index (fabpot)

This PR was merged into the 3.x branch. Discussion ---------- Fix wrong array index Fixes #4563 Commits ------- b039999 Fix wrong array index
twigphp · Feb 1, 2025 · fff5638 · fff5638
2 parents a5ebdfe + b039999
commit fff5638
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 3 deletions.
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,5 +1,6 @@
 # 3.20.0 (2025-XX-XX)
 
+ * Fix wrong array index
  * Bump minimum PHP version to 8.1
 
 # 3.19.0 (2025-01-28)

diff --git a/src/Node/Expression/ArrayExpression.php b/src/Node/Expression/ArrayExpression.php
@@ -112,9 +112,6 @@ public function compile(Compiler $compiler): void
                 }
 
                 if ($nextIndex !== $key) {
-                    if (\is_int($key)) {
-                        $nextIndex = $key + 1;
-                    }
                     $compiler
                         ->subcompile($pair['key'])
                         ->raw(' => ')

diff --git a/tests/Fixtures/expressions/array.test b/tests/Fixtures/expressions/array.test
@@ -50,6 +50,11 @@ Twig supports array notation
 {{ does_not_exist[0]|default('ok') }}
 {{ does_not_exist[0].does_not_exist_either|default('ok') }}
 {{ does_not_exist[0]['does_not_exist_either']|default('ok') }}
+
+{# indexes are kept #}
+{% set trad = {194:'ABC',141:'DEF',100:'GHI',170:'JKL',110:'MNO',111:'PQR'} %}
+{% set trad2 = {'194':'ABC','141':'DEF','100':'GHI','170':'JKL','110':'MNO','111':'PQR'} %}
+{{ trad == trad2 ? 'OK' : 'KO' }}
 --DATA--
 $objectStorage = new SplObjectStorage();
 $object = new stdClass();
@@ -84,6 +89,8 @@ bar
 ok
 ok
 ok
+
+OK
 --DATA--
 return ['bar' => 'bar', 'foo' => ['bar' => 'bar'], 'array_access' => new \ArrayObject(['a' =>  'b']), 'object' => new stdClass()]
 --CONFIG--
@@ -117,3 +124,5 @@ bar
 ok
 ok
 ok
+
+OK