Skip to content

Commit 5519cc7

Browse files
Merge branch '6.2' into 6.3
* 6.2: fix style of label containing new lines in PUML dump [TwigBridge] Allow floats in html5 input type number field [Translation] Handle the translation of empty strings [VarDumper] Fix error when reflected class has default Enum parameter in constructor [FrameworkBundle] Fix denyAccessUnlessGranted for mixed attributes [Validator] Fix translation of AtLeastOneOf constraint message do not drop embed label classes [Validator] Sync IBAN formats with Swift IBAN registry Update Infobip API transport to use the API V3 [String] Use same alphabet for ByteString::fromRandom tests Fix phpdocs in components Fix the rendering of query explanation with Postgresql
2 parents 4c9dc4d + cf8d4ca commit 5519cc7

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

Caster/Caster.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ public static function castObject(object $obj, string $class, bool $hasDebugInfo
115115
* @param array $a The array containing the properties to filter
116116
* @param int $filter A bit field of Caster::EXCLUDE_* constants specifying which properties to filter out
117117
* @param string[] $listedProperties List of properties to exclude when Caster::EXCLUDE_VERBOSE is set, and to preserve when Caster::EXCLUDE_NOT_IMPORTANT is set
118-
* @param int &$count Set to the number of removed properties
118+
* @param int|null &$count Set to the number of removed properties
119119
*/
120120
public static function filter(array $a, int $filter, array $listedProperties = [], ?int &$count = 0): array
121121
{

Caster/ReflectionCaster.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -322,7 +322,7 @@ public static function castParameter(\ReflectionParameter $c, array $a, Stub $st
322322
if ($c->isOptional()) {
323323
try {
324324
$a[$prefix.'default'] = $v = $c->getDefaultValue();
325-
if ($c->isDefaultValueConstant()) {
325+
if ($c->isDefaultValueConstant() && !\is_object($v)) {
326326
$a[$prefix.'default'] = new ConstStub($c->getDefaultValueConstantName(), $v);
327327
}
328328
if (null === $v) {

0 commit comments

Comments
 (0)