Merge branch '2.8' into 3.1

nicolas-grekas · nicolas-grekas · commit 0cd5f136152e · 2016-08-31T11:05:42.000+02:00
* 2.8:
  Fix merge
diff --git a/src/Symfony/Component/VarDumper/Caster/StubCaster.php b/src/Symfony/Component/VarDumper/Caster/StubCaster.php
@@ -60,7 +60,7 @@ public static function castEnum(EnumStub $c, array $a, Stub $stub, $isNested)
 
             if ($c->value) {
                 foreach (array_keys($c->value) as $k) {
-                    $keys[] = isset($k[0]) && "\0" !== $k[0] ? Caster::PREFIX_VIRTUAL.$k : $k;
+                    $keys[] = !isset($k[0]) || "\0" !== $k[0] ? Caster::PREFIX_VIRTUAL.$k : $k;
                 }
                 // Preserve references with array_combine()
                 $a = array_combine($keys, $c->value);

Original file line number	Diff line number	Diff line change
`@@ -60,7 +60,7 @@ public static function castEnum(EnumStub $c, array $a, Stub $stub, $isNested)`
`60`	`60`
`61`	`61`	`if ($c->value) {`
`62`	`62`	`foreach (array_keys($c->value) as $k) {`
`63`		`- $keys[] = isset($k[0]) && "\0" !== $k[0] ? Caster::PREFIX_VIRTUAL.$k : $k;`
	`63`	`+ $keys[] = !isset($k[0]) \|\| "\0" !== $k[0] ? Caster::PREFIX_VIRTUAL.$k : $k;`
`64`	`64`	`}`
`65`	`65`	`// Preserve references with array_combine()`
`66`	`66`	`$a = array_combine($keys, $c->value);`