[String] wrap(): test and fix

gharlan · gharlan · commit 99c4d76b65ba · 2019-10-13T15:22:21.000+02:00
diff --git a/src/Symfony/Component/String/AbstractString.php b/src/Symfony/Component/String/AbstractString.php
@@ -75,18 +75,18 @@ public static function wrap(array $values): array
         $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)) {
                 $values[$k] = new static($v);
             } elseif (\is_array($v) && $values[$k] !== $v = static::wrap($v)) {
                 $values[$k] = $v;
             }
+
+            ++$i;
         }
 
         return null !== $keys ? array_combine($keys, $values) : $values;
diff --git a/src/Symfony/Component/String/Tests/AbstractAsciiTestCase.php b/src/Symfony/Component/String/Tests/AbstractAsciiTestCase.php
@@ -11,11 +11,18 @@
 
 abstract class AbstractAsciiTestCase extends TestCase
 {
-    protected static function createFromString(string $string): AbstractString
+    protected static function stringClass(): string
     {
         throw new \BadMethodCallException('This method must be implemented by subclasses.');
     }
 
+    protected static function createFromString(string $string): AbstractString
+    {
+        $class = static::stringClass();
+
+        return new $class($string);
+    }
+
     public function testCreateFromString()
     {
         $bytes = static::createFromString('Symfony is a PHP framework!');
@@ -34,6 +41,31 @@ public function testCreateFromEmptyString()
         $this->assertTrue($instance->isEmpty());
     }
 
+    /**
+     * @dataProvider provideWrap
+     */
+    public function testWrap(array $expected, array $values)
+    {
+        $class = static::stringClass();
+
+        $this->assertEquals($expected, $class::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
      */
diff --git a/src/Symfony/Component/String/Tests/ByteStringTest.php b/src/Symfony/Component/String/Tests/ByteStringTest.php
@@ -11,14 +11,13 @@
 
 namespace Symfony\Component\String\Tests;
 
-use Symfony\Component\String\AbstractString;
 use Symfony\Component\String\ByteString;
 
 class ByteStringTest extends AbstractAsciiTestCase
 {
-    protected static function createFromString(string $string): AbstractString
+    protected static function stringClass(): string
     {
-        return new ByteString($string);
+        return ByteString::class;
     }
 
     public static function provideLength(): array
diff --git a/src/Symfony/Component/String/Tests/CodePointStringTest.php b/src/Symfony/Component/String/Tests/CodePointStringTest.php
@@ -11,14 +11,13 @@
 
 namespace Symfony\Component\String\Tests;
 
-use Symfony\Component\String\AbstractString;
 use Symfony\Component\String\CodePointString;
 
 class CodePointStringTest extends AbstractUnicodeTestCase
 {
-    protected static function createFromString(string $string): AbstractString
+    protected static function stringClass(): string
     {
-        return new CodePointString($string);
+        return CodePointString::class;
     }
 
     public static function provideLength(): array
diff --git a/src/Symfony/Component/String/Tests/UnicodeStringTest.php b/src/Symfony/Component/String/Tests/UnicodeStringTest.php
@@ -11,14 +11,30 @@
 
 namespace Symfony\Component\String\Tests;
 
-use Symfony\Component\String\AbstractString;
 use Symfony\Component\String\UnicodeString;
 
 class UnicodeStringTest extends AbstractUnicodeTestCase
 {
-    protected static function createFromString(string $string): AbstractString
+    protected static function stringClass(): string
     {
-        return new UnicodeString($string);
+        return UnicodeString::class;
+    }
+
+    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

Original file line number	Diff line number	Diff line change
`@@ -75,18 +75,18 @@ public static function wrap(array $values): array`
`75`	`75`	`$keys = null;`
`76`	`76`
`77`	`77`	`foreach ($values as $k => $v) {`
`78`		`- ++$i;`
`79`		`-`
`80`	`78`	`if (\is_string($k) && '' !== $k && $k !== $j = (string) new static($k)) {`
`81`	`79`	`$keys = $keys ?? array_keys($values);`
`82`		`- array_splice($keys, $i, 1, [$j]);`
	`80`	`+ $keys[$i] = $j;`
`83`	`81`	`}`
`84`	`82`
`85`	`83`	`if (\is_string($v)) {`
`86`	`84`	`$values[$k] = new static($v);`
`87`	`85`	`} elseif (\is_array($v) && $values[$k] !== $v = static::wrap($v)) {`
`88`	`86`	`$values[$k] = $v;`
`89`	`87`	`}`
	`88`	`+`
	`89`	`+ ++$i;`
`90`	`90`	`}`
`91`	`91`
`92`	`92`	`return null !== $keys ? array_combine($keys, $values) : $values;`
Original file line number	Diff line number	Diff line change
`@@ -11,14 +11,13 @@`
`11`	`11`
`12`	`12`	`namespace Symfony\Component\String\Tests;`
`13`	`13`
`14`		`-use Symfony\Component\String\AbstractString;`
`15`	`14`	`use Symfony\Component\String\ByteString;`
`16`	`15`
`17`	`16`	`class ByteStringTest extends AbstractAsciiTestCase`
`18`	`17`	`{`
`19`		`- protected static function createFromString(string $string): AbstractString`
	`18`	`+ protected static function stringClass(): string`
`20`	`19`	`{`
`21`		`- return new ByteString($string);`
	`20`	`+ return ByteString::class;`
`22`	`21`	`}`
`23`	`22`
`24`	`23`	`public static function provideLength(): array`