Commit015b81a

committed

[String] wrap(): test and fix

1 parenta306d99 commit015b81aCopy full SHA for 015b81a

File tree

+45

-3

lines changed

+45

-3

lines changed

Lines changed: 3 additions & 3 deletions

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 ($valuesas$k =>$v) {`
`78`		`- ++$i;`
`79`		`-`
`80`	`78`	`if (\is_string($k) &&'' !==$k &&$k !==$j = (string)newstatic($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] =newstatic($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`	`returnnull !==$keys ?array_combine($keys,$values) :$values;`

Lines changed: 25 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -34,6 +34,31 @@ public function testCreateFromEmptyString()`
`34`	`34`	`$this->assertTrue($instance->isEmpty());`
`35`	`35`	`}`
`36`	`36`
	`37`	`+/**`
	`38`	`+ * @dataProvider provideWrap`
	`39`	`+ */`
	`40`	`+publicfunctiontestWrap(array$expected,array$values)`
	`41`	`+ {`
	`42`	`+$s =static::createFromString('');`
	`43`	`+`
	`44`	`+$this->assertEquals($expected,$s::wrap($values));`
	`45`	`+ }`
	`46`	`+`
	`47`	`+publicstaticfunctionprovideWrap():array`
	`48`	`+ {`
	`49`	`+return [`
	`50`	`+ [[], []],`
	`51`	`+ [`
	`52`	`+ ['abc' =>static::createFromString('foo'),1,static::createFromString('bar'),'baz' =>true],`
	`53`	`+ ['abc' =>'foo',1,'bar','baz' =>true],`
	`54`	`+ ],`
	`55`	`+ [`
	`56`	`+ ['a' => ['b' =>static::createFromString('c'), [static::createFromString('d')]],static::createFromString('e')],`
	`57`	`+ ['a' => ['b' =>'c', ['d']],'e'],`
	`58`	`+ ],`
	`59`	`+ ];`
	`60`	`+ }`
	`61`	`+`
`37`	`62`	`/**`
`38`	`63`	`* @dataProvider provideLength`
`39`	`64`	`*/`

Lines changed: 17 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -21,6 +21,23 @@ protected static function createFromString(string $string): AbstractString`
`21`	`21`	`returnnewUnicodeString($string);`
`22`	`22`	`}`
`23`	`23`
	`24`	`+publicstaticfunctionprovideWrap():array`
	`25`	`+ {`
	`26`	`+returnarray_merge(`
	`27`	`+parent::provideWrap(),`
	`28`	`+ [`
	`29`	`+ [`
	`30`	`+ ['Käse' =>static::createFromString('köstlich'),'fromage' =>static::createFromString('délicieux')],`
	`31`	`+ ["Ka\u{0308}se" =>"ko\u{0308}stlich",'fromage' =>'délicieux'],`
	`32`	`+ ],`
	`33`	`+ [`
	`34`	`+ ['a' =>1,'ä' => ['ö' =>2,'ü' =>3]],`
	`35`	`+ ['a' =>1,"a\u{0308}" => ["o\u{0308}" =>2,'ü' =>3]],`
	`36`	`+ ],`
	`37`	`+ ]`
	`38`	`+ );`
	`39`	`+ }`
	`40`	`+`
`24`	`41`	`publicstaticfunctionprovideLength():array`
`25`	`42`	`{`
`26`	`43`	`returnarray_merge(`

Comments

(0)