[String] wrap(): test and fix

src/Symfony/Component/String/AbstractString.php

@@ -75,11 +75,9 @@ abstract class AbstractString implements \JsonSerializable
         $keys = null;
 
         foreach ($values as $k => $v) {
-            ++$i;
-
             if (\is_string($k) && '' !== $k && $k !== $j = (string) new static($k)) {
                 $keys = $keys ?? array_keys($values);
-                array_splice($keys, $i, 1, [$j]);
+                $keys[$i] = $j;
             }
 
             if (\is_string($v)) {
@@ -87,6 +85,8 @@ abstract class AbstractString implements \JsonSerializable
             } elseif (\is_array($v) && $values[$k] !== $v = static::wrap($v)) {
                 $values[$k] = $v;
             }
+
+            ++$i;
         }
 
         return null !== $keys ? array_combine($keys, $values) : $values;

src/Symfony/Component/String/Tests/AbstractAsciiTestCase.php

@@ -34,6 +34,31 @@ abstract class AbstractAsciiTestCase extends TestCase
         $this->assertTrue($instance->isEmpty());
     }
 
+    /**
+     * @dataProvider provideWrap
+     */
+    public function testWrap(array $expected, array $values)
+    {
+        $s = static::createFromString('');
+
+        $this->assertEquals($expected, $s::wrap($values));
+    }
+
+    public static function provideWrap(): array
+    {
+        return [
+            [[], []],
+            [
+                ['abc' => static::createFromString('foo'), 1, static::createFromString('bar'), 'baz' => true],
+                ['abc' => 'foo', 1, 'bar', 'baz' => true],
+            ],
+            [
+                ['a' => ['b' => static::createFromString('c'), [static::createFromString('d')]], static::createFromString('e')],
+                ['a' => ['b' => 'c', ['d']], 'e'],
+            ],
+        ];
+    }
+
     /**
      * @dataProvider provideLength
      */

src/Symfony/Component/String/Tests/UnicodeStringTest.php

@@ -21,6 +21,23 @@ class UnicodeStringTest extends AbstractUnicodeTestCase
         return new UnicodeString($string);
     }
 
+    public static function provideWrap(): array
+    {
+        return array_merge(
+            parent::provideWrap(),
+            [
+                [
+                    ['Käse' => static::createFromString('köstlich'), 'fromage' => static::createFromString('délicieux')],
+                    ["Ka\u{0308}se" => "ko\u{0308}stlich", 'fromage' => 'délicieux'],
+                ],
+                [
+                    ['a' => 1, 'ä' => ['ö' => 2, 'ü' => 3]],
+                    ['a' => 1, "a\u{0308}" => ["o\u{0308}" => 2, 'ü' => 3]],
+                ],
+            ]
+        );
+    }
+
     public static function provideLength(): array
     {
         return array_merge(