Skip to content

Commit 5b80025

Browse files
committed
fix merge
1 parent ef5aa96 commit 5b80025

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

src/Symfony/Component/Serializer/Tests/Normalizer/AbstractObjectNormalizerTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1522,7 +1522,7 @@ protected function extractAttributes(object $object, ?string $format = null, arr
15221522
return [];
15231523
}
15241524

1525-
protected function getAttributeValue(object $object, string $attribute, ?string $format = null, array $context = [])
1525+
protected function getAttributeValue(object $object, string $attribute, ?string $format = null, array $context = []): mixed
15261526
{
15271527
return null;
15281528
}

0 commit comments

Comments
 (0)