Merge branch '6.4' into 7.3

* 6.4: [Console] Ensure terminal is usable after termination signal bug #61887 [Serializer] Fix discriminator class mapping with allow_extra_attributes=false

Author: nicolas-grekas

Normalizer/GetSetMethodNormalizer.php

@@ -169,6 +169,10 @@ protected function isAllowedAttribute($classOrObject, string $attribute, ?string
 
  $class = \is_object($classOrObject) ? $classOrObject::class : $classOrObject;
 
+ if ($this->classDiscriminatorResolver?->getMappingForMappedObject($classOrObject)?->getTypeProperty() === $attribute) {
+ return true;
+ }
+
  if (!isset(self::$reflectionCache[$class])) {
  self::$reflectionCache[$class] = new \ReflectionClass($class);
  }

Normalizer/ObjectNormalizer.php

@@ -153,6 +153,10 @@ protected function isAllowedAttribute($classOrObject, string $attribute, ?string
 
  $class = \is_object($classOrObject) ? $classOrObject::class : $classOrObject;
 
+ if ($this->classDiscriminatorResolver?->getMappingForMappedObject($classOrObject)?->getTypeProperty() === $attribute) {
+ return true;
+ }
+
  if ($context['_read_attributes'] ?? true) {
  if (!isset(self::$isReadableCache[$class.$attribute])) {
  self::$isReadableCache[$class.$attribute] = $this->propertyInfoExtractor->isReadable($class, $attribute) || $this->hasAttributeAccessorMethod($class, $attribute) || (\is_object($classOrObject) && $this->propertyAccessor->isReadable($classOrObject, $attribute));

Normalizer/PropertyNormalizer.php

@@ -99,6 +99,10 @@ protected function isAllowedAttribute(object|string $classOrObject, string $attr
  return false;
  }
 
+ if ($this->classDiscriminatorResolver?->getMappingForMappedObject($classOrObject)?->getTypeProperty() === $attribute) {
+ return true;
+ }
+
  try {
  $reflectionProperty = $this->getReflectionProperty($classOrObject, $attribute);
  } catch (\ReflectionException) {

Tests/Normalizer/GetSetMethodNormalizerTest.php

@@ -569,6 +569,23 @@ public function testSupportsAndDenormalizeWithOptionalSetterArgument(array $data
  $obj = $this->normalizer->denormalize($data, GetSetDummyWithOptionalAndMultipleSetterArgs::class);
  $this->assertSame($expected, $obj->$method());
  }
+
+ public function testDiscriminatorWithAllowExtraAttributesFalse()
+ {
+ // Discriminator type property should be allowed with allow_extra_attributes=false
+ $classMetadataFactory = new ClassMetadataFactory(new AttributeLoader());
+ $discriminator = new ClassDiscriminatorFromClassMetadata($classMetadataFactory);
+ $normalizer = new GetSetMethodNormalizer($classMetadataFactory, null, null, $discriminator);
+
+ $obj = $normalizer->denormalize(
+ ['type' => 'one'],
+ GetSetMethodDummyInterface::class,
+ null,
+ [AbstractNormalizer::ALLOW_EXTRA_ATTRIBUTES => false]
+ );
+
+ $this->assertInstanceOf(GetSetMethodDiscriminatedDummyOne::class, $obj);
+ }
 }
 
 class GetSetDummy

Tests/Normalizer/ObjectNormalizerTest.php

@@ -25,6 +25,7 @@
 use Symfony\Component\Serializer\Exception\NotNormalizableValueException;
 use Symfony\Component\Serializer\Exception\RuntimeException;
 use Symfony\Component\Serializer\Exception\UnexpectedValueException;
+use Symfony\Component\Serializer\Mapping\ClassDiscriminatorFromClassMetadata;
 use Symfony\Component\Serializer\Mapping\Factory\ClassMetadataFactory;
 use Symfony\Component\Serializer\Mapping\Factory\ClassMetadataFactoryInterface;
 use Symfony\Component\Serializer\Mapping\Loader\AttributeLoader;
@@ -1086,6 +1087,23 @@ public function testPrecedenceOfAccessorMethods()
  'foo' => 'hasFoo',
  ], $normalizedSwappedHasserIsser);
  }
+
+ public function testDiscriminatorWithAllowExtraAttributesFalse()
+ {
+ // Discriminator type property should be allowed with allow_extra_attributes=false
+ $classMetadataFactory = new ClassMetadataFactory(new AttributeLoader());
+ $discriminator = new ClassDiscriminatorFromClassMetadata($classMetadataFactory);
+ $normalizer = new ObjectNormalizer($classMetadataFactory, null, null, null, $discriminator);
+
+ $obj = $normalizer->denormalize(
+ ['type' => 'type_a'],
+ DiscriminatorDummyInterface::class,
+ null,
+ [AbstractNormalizer::ALLOW_EXTRA_ATTRIBUTES => false]
+ );
+
+ $this->assertInstanceOf(DiscriminatorDummyTypeA::class, $obj);
+ }
 }
 
 class ProxyObjectDummy extends ObjectDummy
@@ -1429,6 +1447,25 @@ public function isolate()
  }
 }
 
+#[\Symfony\Component\Serializer\Attribute\DiscriminatorMap(
+ typeProperty: 'type',
+ mapping: [
+ 'type_a' => DiscriminatorDummyTypeA::class,
+ 'type_b' => DiscriminatorDummyTypeB::class,
+ ]
+)]
+interface DiscriminatorDummyInterface
+{
+}
+
+class DiscriminatorDummyTypeA implements DiscriminatorDummyInterface
+{
+}
+
+class DiscriminatorDummyTypeB implements DiscriminatorDummyInterface
+{
+}
+
 class ObjectWithPropertyAndAllAccessorMethods
 {
  public function __construct(

Tests/Normalizer/PropertyNormalizerTest.php

@@ -22,6 +22,7 @@
 use Symfony\Component\Serializer\Mapping\Loader\AttributeLoader;
 use Symfony\Component\Serializer\NameConverter\CamelCaseToSnakeCaseNameConverter;
 use Symfony\Component\Serializer\NameConverter\MetadataAwareNameConverter;
+use Symfony\Component\Serializer\Normalizer\AbstractNormalizer;
 use Symfony\Component\Serializer\Normalizer\AbstractObjectNormalizer;
 use Symfony\Component\Serializer\Normalizer\ArrayDenormalizer;
 use Symfony\Component\Serializer\Normalizer\DenormalizerInterface;
@@ -585,6 +586,23 @@ public function testDenormalizeWithDiscriminator()
  )
  );
  }
+
+ public function testDiscriminatorWithAllowExtraAttributesFalse()
+ {
+ // Discriminator type property should be allowed with allow_extra_attributes=false
+ $classMetadataFactory = new ClassMetadataFactory(new AttributeLoader());
+ $discriminator = new ClassDiscriminatorFromClassMetadata($classMetadataFactory);
+ $normalizer = new PropertyNormalizer($classMetadataFactory, null, null, $discriminator);
+
+ $obj = $normalizer->denormalize(
+ ['type' => 'one'],
+ PropertyDummyInterface::class,
+ null,
+ [AbstractNormalizer::ALLOW_EXTRA_ATTRIBUTES => false]
+ );
+
+ $this->assertInstanceOf(PropertyDiscriminatedDummyOne::class, $obj);
+ }
 }
 
 class PropertyDummy