Skip to content

Commit 9d18eba

Browse files
committed
Merge branch '6.4' into 7.3
* 6.4: [ProxyManager] Remove extra space before return‑type colon in `proxy-implem.php` [Config] Use the empty string instead of null as an array offset Conflicts: src/Symfony/Bridge/ProxyManager/Tests/LazyProxy/PhpDumper/Fixtures/proxy-implem.php src/Symfony/Bridge/ProxyManager/Tests/LazyProxy/PhpDumper/ProxyDumperTest.php
2 parents 8a09223 + 15947c1 commit 9d18eba

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

Definition/Dumper/YamlReferenceDumper.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -240,6 +240,6 @@ private function getPrototypeChildren(PrototypedArrayNode $node): array
240240
}
241241
$keyNode->setInfo($info);
242242

243-
return [$key => $keyNode];
243+
return [$key ?? '' => $keyNode];
244244
}
245245
}

0 commit comments

Comments
 (0)