Merge branch '2.8' into 3.1

* 2.8:
  Fix merge
This commit is contained in:
Nicolas Grekas 2016-08-31 11:05:42 +02:00
commit 0cd5f13615

View File

@ -60,7 +60,7 @@ class StubCaster
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);