Removing code that forced indexed keys in favor of identical, non-ind…

…exed
twigphp · Jun 16, 2023 · 9b84952 · 9b84952
1 parent 87cd4f2
commit 9b84952
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 7 deletions.
diff --git a/src/Node/Expression/ArrayExpression.php b/src/Node/Expression/ArrayExpression.php
@@ -100,9 +100,7 @@ public function compile(Compiler $compiler): void
                 $compiler->raw('...')->subcompile($pair['value']);
             } else {
                 $indexSpecified = false === $pair['key']->hasAttribute('index_specified') || true === $pair['key']->getAttribute('index_specified');
-                // if you apply the spread operator, for proper merging, we stop
-                // explicitly assigning indexes and allow PHP to do it
-                if ($indexSpecified || !$hasSpreadItem) {
+                if ($indexSpecified) {
                     $compiler
                         ->subcompile($pair['key'])
                         ->raw(' => ')

diff --git a/tests/Node/Expression/FilterTest.php b/tests/Node/Expression/FilterTest.php
@@ -127,7 +127,7 @@ protected function foobar()
             new ConstantExpression('3', 1),
             'foo' => new ConstantExpression('bar', 1),
         ]);
-        $tests[] = [$node, 'Twig\Tests\Node\Expression\twig_tests_filter_barbar($context, "abc", "1", "2", [0 => "3", "foo" => "bar"])', $environment];
+        $tests[] = [$node, 'Twig\Tests\Node\Expression\twig_tests_filter_barbar($context, "abc", "1", "2", ["3", "foo" => "bar"])', $environment];
 
         // from extension
         $node = $this->createFilter($string, 'foo');

diff --git a/tests/Node/Expression/FunctionTest.php b/tests/Node/Expression/FunctionTest.php
@@ -94,7 +94,7 @@ public function getTests()
             new ConstantExpression('3', 1),
             'foo' => new ConstantExpression('bar', 1),
         ]);
-        $tests[] = [$node, 'Twig\Tests\Node\Expression\twig_tests_function_barbar("1", "2", [0 => "3", "foo" => "bar"])', $environment];
+        $tests[] = [$node, 'Twig\Tests\Node\Expression\twig_tests_function_barbar("1", "2", ["3", "foo" => "bar"])', $environment];
 
         // function as an anonymous function
         $node = $this->createFunction('anonymous', [new ConstantExpression('foo', 1)]);

diff --git a/tests/Node/Expression/GetAttrTest.php b/tests/Node/Expression/GetAttrTest.php
@@ -53,7 +53,7 @@ public function getTests()
         $args->addElement(new NameExpression('foo', 1));
         $args->addElement(new ConstantExpression('bar', 1));
         $node = new GetAttrExpression($expr, $attr, $args, Template::METHOD_CALL, 1);
-        $tests[] = [$node, sprintf('%s%s, "bar", [0 => %s, 1 => "bar"], "method", false, false, false, 1)', $this->getAttributeGetter(), $this->getVariableGetter('foo', 1), $this->getVariableGetter('foo'))];
+        $tests[] = [$node, sprintf('%s%s, "bar", [%s, "bar"], "method", false, false, false, 1)', $this->getAttributeGetter(), $this->getVariableGetter('foo', 1), $this->getVariableGetter('foo'))];
 
         return $tests;
     }

diff --git a/tests/Node/Expression/TestTest.php b/tests/Node/Expression/TestTest.php
@@ -67,7 +67,7 @@ public function getTests()
             new ConstantExpression('3', 1),
             'foo' => new ConstantExpression('bar', 1),
         ]);
-        $tests[] = [$node, 'Twig\Tests\Node\Expression\twig_tests_test_barbar("abc", "1", "2", [0 => "3", "foo" => "bar"])', $environment];
+        $tests[] = [$node, 'Twig\Tests\Node\Expression\twig_tests_test_barbar("abc", "1", "2", ["3", "foo" => "bar"])', $environment];
 
         return $tests;
     }