diff --git a/src/Symfony/Component/Serializer/Normalizer/ObjectNormalizer.php b/src/Symfony/Component/Serializer/Normalizer/ObjectNormalizer.php
index 88732bbd3e14f..f766286b2b11a 100644
--- a/src/Symfony/Component/Serializer/Normalizer/ObjectNormalizer.php
+++ b/src/Symfony/Component/Serializer/Normalizer/ObjectNormalizer.php
@@ -43,7 +43,10 @@ public function __construct(ClassMetadataFactoryInterface $classMetadataFactory
parent::__construct($classMetadataFactory, $nameConverter, $propertyTypeExtractor, $classDiscriminatorResolver, $objectClassResolver, $defaultContext);
$this->propertyAccessor = $propertyAccessor ?: PropertyAccess::createPropertyAccessor();
- $this->objectClassResolver = $objectClassResolver;
+
+ $this->objectClassResolver = $objectClassResolver ?? function ($class) {
+ return \is_object($class) ? \get_class($class) : $class;
+ };
}
/**
@@ -63,7 +66,7 @@ protected function extractAttributes($object, $format = null, array $context = [
$attributes = [];
// methods
- $class = $this->objectClassResolver ? ($this->objectClassResolver)($object) : \get_class($object);
+ $class = ($this->objectClassResolver)($object);
$reflClass = new \ReflectionClass($class);
foreach ($reflClass->getMethods(\ReflectionMethod::IS_PUBLIC) as $reflMethod) {
diff --git a/src/Symfony/Component/Serializer/Tests/Normalizer/ObjectNormalizerTest.php b/src/Symfony/Component/Serializer/Tests/Normalizer/ObjectNormalizerTest.php
index b85ec8b5e23d5..4c4448dfe4b0e 100644
--- a/src/Symfony/Component/Serializer/Tests/Normalizer/ObjectNormalizerTest.php
+++ b/src/Symfony/Component/Serializer/Tests/Normalizer/ObjectNormalizerTest.php
@@ -1043,6 +1043,30 @@ public function denormalize($propertyName, string $class = null, string $format
$this->assertArrayHasKey('foo-Symfony\Component\Serializer\Tests\Normalizer\ObjectDummy-json-bar', $normalizer->normalize(new ObjectDummy(), 'json', ['foo' => 'bar']));
}
+ public function testDefaultObjectClassResolver()
+ {
+ $normalizer = new ObjectNormalizer();
+
+ $obj = new ObjectDummy();
+ $obj->setFoo('foo');
+ $obj->bar = 'bar';
+ $obj->setBaz(true);
+ $obj->setCamelCase('camelcase');
+ $obj->unwantedProperty = 'notwanted';
+
+ $this->assertEquals(
+ [
+ 'foo' => 'foo',
+ 'bar' => 'bar',
+ 'baz' => true,
+ 'fooBar' => 'foobar',
+ 'camelCase' => 'camelcase',
+ 'object' => null,
+ ],
+ $normalizer->normalize($obj, 'any')
+ );
+ }
+
public function testObjectClassResolver()
{
$classResolver = function ($object) {
pFad - Phonifier reborn
Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.
Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.
Alternative Proxies:
Alternative Proxy
pFad Proxy
pFad v3 Proxy
pFad v4 Proxy