Skip to content

[Serializer] Revert "Fix object normalizer when properties has the same name as their accessor" - it was a BC Break #54635

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 17, 2024
Merged

[Serializer] Revert "Fix object normalizer when properties has the same name as their accessor" - it was a BC Break #54635

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/Symfony/Component/Serializer/Mapping/Loader/AnnotationLoader.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ public function loadClassMetadata(ClassMetadataInterface $classMetadata)

$accessorOrMutator = preg_match('/^(get|is|has|set)(.+)$/i', $method->name, $matches);
if ($accessorOrMutator) {
$attributeName = $reflectionClass->hasProperty($method->name) ? $method->name : lcfirst($matches[2]);
$attributeName = lcfirst($matches[2]);

if (isset($attributesMetadata[$attributeName])) {
$attributeMetadata = $attributesMetadata[$attributeName];
Expand Down
16 changes: 4 additions & 12 deletions src/Symfony/Component/Serializer/Normalizer/ObjectNormalizer.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,25 +95,17 @@

if (str_starts_with($name, 'get') || str_starts_with($name, 'has')) {
// getters and hassers
$attributeName = $name;
$attributeName = substr($name, 3);

if (!$reflClass->hasProperty($attributeName)) {
$attributeName = substr($attributeName, 3);

if (!$reflClass->hasProperty($attributeName)) {
$attributeName = lcfirst($attributeName);
}
$attributeName = lcfirst($attributeName);
}
} elseif (str_starts_with($name, 'is')) {
// issers
$attributeName = $name;
$attributeName = substr($name, 2);

if (!$reflClass->hasProperty($attributeName)) {
$attributeName = substr($attributeName, 2);

if (!$reflClass->hasProperty($attributeName)) {
$attributeName = lcfirst($attributeName);
}
$attributeName = lcfirst($attributeName);
}
}

Expand Down Expand Up @@ -143,7 +135,7 @@
*/
protected function getAttributeValue(object $object, string $attribute, ?string $format = null, array $context = [])
{
$discriminatorProperty = null;

Check failure on line 138 in src/Symfony/Component/Serializer/Normalizer/ObjectNormalizer.php

View workflow job for this annotation

GitHub Actions / Psalm

InvalidReturnStatement 

src/Symfony/Component/Serializer/Normalizer/ObjectNormalizer.php:138:16: InvalidReturnStatement: The inferred type 'list<false|string>' does not match the declared return type 'array<array-key, string>' for Symfony\Component\Serializer\Normalizer\ObjectNormalizer::extractAttributes (see https://psalm.dev/128)

Check failure on line 138 in src/Symfony/Component/Serializer/Normalizer/ObjectNormalizer.php

View workflow job for this annotation

GitHub Actions / Psalm

InvalidReturnStatement 

src/Symfony/Component/Serializer/Normalizer/ObjectNormalizer.php:138:16: InvalidReturnStatement: The inferred type 'list<false|string>' does not match the declared return type 'array<array-key, string>' for Symfony\Component\Serializer\Normalizer\ObjectNormalizer::extractAttributes (see https://psalm.dev/128)
if (null !== $this->classDiscriminatorResolver && null !== $mapping = $this->classDiscriminatorResolver->getMappingForMappedObject($object)) {
$discriminatorProperty = $mapping->getTypeProperty();
}
Expand Down
48 changes: 0 additions & 48 deletions src/Symfony/Component/Serializer/Tests/Fixtures/SamePropertyAsMethodDummy.php
View file
Open in desktop

This file was deleted.

62 changes: 0 additions & 62 deletions ...Component/Serializer/Tests/Fixtures/SamePropertyAsMethodWithMethodSerializedNameDummy.php
View file
Open in desktop

This file was deleted.

65 changes: 0 additions & 65 deletions ...mponent/Serializer/Tests/Fixtures/SamePropertyAsMethodWithPropertySerializedNameDummy.php
View file
Open in desktop

This file was deleted.

50 changes: 0 additions & 50 deletions src/Symfony/Component/Serializer/Tests/Normalizer/ObjectNormalizerTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,9 +41,6 @@
use Symfony\Component\Serializer\Tests\Fixtures\Php74Dummy;
use Symfony\Component\Serializer\Tests\Fixtures\Php74DummyPrivate;
use Symfony\Component\Serializer\Tests\Fixtures\Php80Dummy;
use Symfony\Component\Serializer\Tests\Fixtures\SamePropertyAsMethodDummy;
use Symfony\Component\Serializer\Tests\Fixtures\SamePropertyAsMethodWithMethodSerializedNameDummy;
use Symfony\Component\Serializer\Tests\Fixtures\SamePropertyAsMethodWithPropertySerializedNameDummy;
use Symfony\Component\Serializer\Tests\Fixtures\SiblingHolder;
use Symfony\Component\Serializer\Tests\Normalizer\Features\AttributesTestTrait;
use Symfony\Component\Serializer\Tests\Normalizer\Features\CacheableObjectAttributesTestTrait;
Expand Down Expand Up @@ -874,53 +871,6 @@ public function testNormalizeStdClass()
$this->assertSame(['baz' => 'baz'], $this->normalizer->normalize($o2));
}

public function testSamePropertyAsMethod()
{
$object = new SamePropertyAsMethodDummy('free_trial', 'has_subscribe', 'get_ready', 'is_active');
$expected = [
'freeTrial' => 'free_trial',
'hasSubscribe' => 'has_subscribe',
'getReady' => 'get_ready',
'isActive' => 'is_active',
];

$this->assertSame($expected, $this->normalizer->normalize($object));
}

public function testSamePropertyAsMethodWithPropertySerializedName()
{
$classMetadataFactory = new ClassMetadataFactory(new AnnotationLoader(new AnnotationReader()));
$this->normalizer = new ObjectNormalizer($classMetadataFactory, new MetadataAwareNameConverter($classMetadataFactory));
$this->normalizer->setSerializer($this->serializer);

$object = new SamePropertyAsMethodWithPropertySerializedNameDummy('free_trial', 'has_subscribe', 'get_ready', 'is_active');
$expected = [
'free_trial_property' => 'free_trial',
'has_subscribe_property' => 'has_subscribe',
'get_ready_property' => 'get_ready',
'is_active_property' => 'is_active',
];

$this->assertSame($expected, $this->normalizer->normalize($object));
}

public function testSamePropertyAsMethodWithMethodSerializedName()
{
$classMetadataFactory = new ClassMetadataFactory(new AnnotationLoader(new AnnotationReader()));
$this->normalizer = new ObjectNormalizer($classMetadataFactory, new MetadataAwareNameConverter($classMetadataFactory));
$this->normalizer->setSerializer($this->serializer);

$object = new SamePropertyAsMethodWithMethodSerializedNameDummy('free_trial', 'has_subscribe', 'get_ready', 'is_active');
$expected = [
'free_trial_method' => 'free_trial',
'has_subscribe_method' => 'has_subscribe',
'get_ready_method' => 'get_ready',
'is_active_method' => 'is_active',
];

$this->assertSame($expected, $this->normalizer->normalize($object));
}

public function testNormalizeWithIgnoreAnnotationAndPrivateProperties()
{
$classMetadataFactory = new ClassMetadataFactory(new AnnotationLoader(new AnnotationReader()));
Expand Down
Loading