Merge branch '5.4' into 6.2

* 5.4:
  [Serializer] Throw NotNormalizableValueException if it doesn't concern a backedEnum in construct method
  Do not expose `Sfjs` as it is unused and conflicts with WebProfilerBundle’s
  [PropertyInfo] Fix phpDocExtractor nullable array value type

Author: nicolas-grekas

Normalizer/AbstractNormalizer.php

@@ -322,6 +322,7 @@ protected function instantiateObject(array &$data, string $class, array &$contex
 
         $constructor = $this->getConstructor($data, $class, $context, $reflectionClass, $allowedAttributes);
         if ($constructor) {
+            $context['has_constructor'] = true;
             if (true !== $constructor->isPublic()) {
                 return $reflectionClass->newInstanceWithoutConstructor();
             }
@@ -412,6 +413,8 @@ protected function instantiateObject(array &$data, string $class, array &$contex
             }
         }
 
+        unset($context['has_constructor']);
+
         return new $class();
     }
 

Normalizer/BackedEnumNormalizer.php

@@ -52,7 +52,11 @@ public function denormalize(mixed $data, string $type, string $format = null, ar
         try {
             return $type::from($data);
         } catch (\ValueError $e) {
-            throw new InvalidArgumentException('The data must belong to a backed enumeration of type '.$type);
+            if (isset($context['has_constructor'])) {
+                throw new InvalidArgumentException('The data must belong to a backed enumeration of type '.$type);
+            }
+
+            throw NotNormalizableValueException::createForUnexpectedDataType('The data must belong to a backed enumeration of type '.$type, $data, [$type], $context['deserialization_path'] ?? null, true, 0, $e);
         }
     }
 

Tests/Fixtures/DummyObjectWithEnumProperty.php

@@ -0,0 +1,10 @@
+<?php
+
+namespace Symfony\Component\Serializer\Tests\Fixtures;
+
+use Symfony\Component\Serializer\Tests\Fixtures\StringBackedEnumDummy;
+
+class DummyObjectWithEnumProperty
+{
+    public StringBackedEnumDummy $get;
+}

Tests/Normalizer/BackedEnumNormalizerTest.php

@@ -88,7 +88,7 @@ public function testDenormalizeObjectThrowsException()
 
     public function testDenormalizeBadBackingValueThrowsException()
     {
-        $this->expectException(InvalidArgumentException::class);
+        $this->expectException(NotNormalizableValueException::class);
         $this->expectExceptionMessage('The data must belong to a backed enumeration of type '.StringBackedEnumDummy::class);
 
         $this->normalizer->denormalize('POST', StringBackedEnumDummy::class);

Tests/SerializerTest.php

@@ -60,6 +60,7 @@
 use Symfony\Component\Serializer\Tests\Fixtures\DummyMessageNumberOne;
 use Symfony\Component\Serializer\Tests\Fixtures\DummyMessageNumberTwo;
 use Symfony\Component\Serializer\Tests\Fixtures\DummyObjectWithEnumConstructor;
+use Symfony\Component\Serializer\Tests\Fixtures\DummyObjectWithEnumProperty;
 use Symfony\Component\Serializer\Tests\Fixtures\FalseBuiltInDummy;
 use Symfony\Component\Serializer\Tests\Fixtures\NormalizableTraversableDummy;
 use Symfony\Component\Serializer\Tests\Fixtures\Php74Full;
@@ -1232,7 +1233,48 @@ public function testCollectDenormalizationErrorsWithEnumConstructor()
         $this->assertSame($expected, $exceptionsAsArray);
     }
 
-    public function testNoCollectDenormalizationErrorsWithWrongEnum()
+    public function testCollectDenormalizationErrorsWithWrongPropertyWithoutConstruct()
+    {
+        $classMetadataFactory = new ClassMetadataFactory(new AnnotationLoader());
+        $reflectionExtractor = new ReflectionExtractor();
+        $propertyInfoExtractor = new PropertyInfoExtractor([], [$reflectionExtractor], [], [], []);
+
+        $serializer = new Serializer(
+            [
+                new BackedEnumNormalizer(),
+                new ObjectNormalizer($classMetadataFactory, null, null, $propertyInfoExtractor),
+            ],
+            ['json' => new JsonEncoder()]
+        );
+
+        try {
+            $serializer->deserialize('{"get": "POST"}', DummyObjectWithEnumProperty::class, 'json', [
+                 DenormalizerInterface::COLLECT_DENORMALIZATION_ERRORS => true,
+             ]);
+        } catch (\Throwable $e) {
+            $this->assertInstanceOf(PartialDenormalizationException::class, $e);
+        }
+
+        $exceptionsAsArray = array_map(function (NotNormalizableValueException $e): array {
+            return [
+                'currentType' => $e->getCurrentType(),
+                'useMessageForUser' => $e->canUseMessageForUser(),
+                'message' => $e->getMessage(),
+            ];
+        }, $e->getErrors());
+
+        $expected = [
+            [
+                'currentType' => 'string',
+                'useMessageForUser' => true,
+                'message' => 'The data must belong to a backed enumeration of type Symfony\Component\Serializer\Tests\Fixtures\StringBackedEnumDummy',
+            ],
+        ];
+
+        $this->assertSame($expected, $exceptionsAsArray);
+    }
+
+    public function testNoCollectDenormalizationErrorsWithWrongEnumOnConstructor()
     {
         $serializer = new Serializer(
             [
@@ -1243,7 +1285,7 @@ public function testNoCollectDenormalizationErrorsWithWrongEnum()
         );
 
         try {
-            $serializer->deserialize('{"get": "invalid"}', DummyObjectWithEnumConstructor::class, 'json', [
+            $serializer->deserialize('{"get": "POST"}', DummyObjectWithEnumConstructor::class, 'json', [
                 DenormalizerInterface::COLLECT_DENORMALIZATION_ERRORS => true,
             ]);
         } catch (\Throwable $th) {