diogo/symfony
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[Serializer] Use object class resolver when extracting attributes

Browse Source
This commit is contained in:
Joel Wurtz 2019-03-26 15:05:43 +01:00 committed by Fabien Potencier
parent 8d7e002168
commit 1d8b5af3f0
2 changed files with 39 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/Symfony/Component/Serializer/Normalizer/ObjectNormalizer.php
View File

@ -32,6 +32,8 @@ class ObjectNormalizer extends AbstractObjectNormalizer
private $discriminatorCache = [];
private $objectClassResolver;
public function __construct(ClassMetadataFactoryInterface $classMetadataFactory = null, NameConverterInterface $nameConverter = null, PropertyAccessorInterface $propertyAccessor = null, PropertyTypeExtractorInterface $propertyTypeExtractor = null, ClassDiscriminatorResolverInterface $classDiscriminatorResolver = null, callable $objectClassResolver = null, array $defaultContext = [])
{
if (!\class_exists(PropertyAccess::class)) {
@ -41,6 +43,7 @@ class ObjectNormalizer extends AbstractObjectNormalizer
parent::__construct($classMetadataFactory, $nameConverter, $propertyTypeExtractor, $classDiscriminatorResolver, $objectClassResolver, $defaultContext);
$this->propertyAccessor = $propertyAccessor ?: PropertyAccess::createPropertyAccessor();
$this->objectClassResolver = $objectClassResolver;
}
/**
@ -60,7 +63,9 @@ class ObjectNormalizer extends AbstractObjectNormalizer
$attributes = [];
// methods
$reflClass = new \ReflectionClass($object);
$class = $this->objectClassResolver ? ($this->objectClassResolver)($object) : \get_class($object);
$reflClass = new \ReflectionClass($class);
foreach ($reflClass->getMethods(\ReflectionMethod::IS_PUBLIC) as $reflMethod) {
if (
0 !== $reflMethod->getNumberOfRequiredParameters() ||

33
src/Symfony/Component/Serializer/Tests/Normalizer/ObjectNormalizerTest.php
View File

@ -1003,6 +1003,34 @@ class ObjectNormalizerTest extends TestCase
$normalizer = new ObjectNormalizer(null, $nameConverter);
$this->assertArrayHasKey('foo-Symfony\Component\Serializer\Tests\Normalizer\ObjectDummy-json-bar', $normalizer->normalize(new ObjectDummy(), 'json', ['foo' => 'bar']));
}
public function testObjectClassResolver()
{
$classResolver = function ($object) {
return ObjectDummy::class;
};
$normalizer = new ObjectNormalizer(null, null, null, null, null, $classResolver);
$obj = new ProxyObjectDummy();
$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')
);
}
}
class ObjectDummy
@ -1064,6 +1092,11 @@ class ObjectDummy
}
}
class ProxyObjectDummy extends ObjectDummy
{
public $unwantedProperty;
}
class ObjectConstructorDummy
{
protected $foo;