Merge branch '5.4' into 6.3

xabbuh · xabbuh · commit 6b0fbfbc5826 · 2023-12-19T09:55:35.000+01:00
* 5.4:
  fix typo
  CS fix
  [Serializer] Keep stack trace for enum value denormalizer error
  [Serializer] Fix partial denormalization with missing constructor arguments
  [Serializer] Moves dummy to fixtures folder
diff --git a/src/Symfony/Bridge/PhpUnit/Tests/DeprecationErrorHandler/DeprecationTest.php b/src/Symfony/Bridge/PhpUnit/Tests/DeprecationErrorHandler/DeprecationTest.php
@@ -265,7 +265,7 @@ private static function removeDir($dir)
         rmdir($dir);
     }
 
-    public static function setupBeforeClass(): void
+    public static function setUpBeforeClass(): void
     {
         foreach (get_declared_classes() as $class) {
             if ('C' === $class[0] && 0 === strpos($class, 'ComposerAutoloaderInit')) {
diff --git a/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/CompleteConfigurationTestCase.php b/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/CompleteConfigurationTestCase.php
@@ -242,7 +242,7 @@ public function testFirewalls()
             ],
         ], $listeners);
 
-        $this->assertFalse($container->hasAlias(UserCheckerInterface::class, 'No user checker alias is registered when custom user checker services are registered'));
+        $this->assertFalse($container->hasAlias(UserCheckerInterface::class), 'No user checker alias is registered when custom user checker services are registered');
     }
 
     public function testFirewallRequestMatchers()
diff --git a/src/Symfony/Component/Cache/Tests/Adapter/CouchbaseBucketAdapterTest.php b/src/Symfony/Component/Cache/Tests/Adapter/CouchbaseBucketAdapterTest.php
@@ -33,7 +33,7 @@ class CouchbaseBucketAdapterTest extends AdapterTestCase
     /** @var \CouchbaseBucket */
     protected static $client;
 
-    public static function setupBeforeClass(): void
+    public static function setUpBeforeClass(): void
     {
         if (!CouchbaseBucketAdapter::isSupported()) {
             throw new SkippedTestSuiteError('Couchbase >= 2.6.0 < 3.0.0 is required.');
diff --git a/src/Symfony/Component/Cache/Tests/Adapter/CouchbaseCollectionAdapterTest.php b/src/Symfony/Component/Cache/Tests/Adapter/CouchbaseCollectionAdapterTest.php
@@ -33,7 +33,7 @@ class CouchbaseCollectionAdapterTest extends AdapterTestCase
     /** @var Collection */
     protected static $client;
 
-    public static function setupBeforeClass(): void
+    public static function setUpBeforeClass(): void
     {
         if (!CouchbaseCollectionAdapter::isSupported()) {
             self::markTestSkipped('Couchbase >= 3.0.0 < 4.0.0 is required.');
diff --git a/src/Symfony/Component/Cache/Tests/Adapter/RedisArrayAdapterTest.php b/src/Symfony/Component/Cache/Tests/Adapter/RedisArrayAdapterTest.php
@@ -20,7 +20,7 @@ class RedisArrayAdapterTest extends AbstractRedisAdapterTestCase
 {
     public static function setUpBeforeClass(): void
     {
-        parent::setupBeforeClass();
+        parent::setUpBeforeClass();
         if (!class_exists(\RedisArray::class)) {
             throw new SkippedTestSuiteError('The RedisArray class is required.');
         }
diff --git a/src/Symfony/Component/Lock/Tests/Store/MongoDbStoreFactoryTest.php b/src/Symfony/Component/Lock/Tests/Store/MongoDbStoreFactoryTest.php
@@ -25,7 +25,7 @@
  */
 class MongoDbStoreFactoryTest extends TestCase
 {
-    public static function setupBeforeClass(): void
+    public static function setUpBeforeClass(): void
     {
         if (!class_exists(Client::class)) {
             throw new SkippedTestSuiteError('The mongodb/mongodb package is required.');
diff --git a/src/Symfony/Component/Lock/Tests/Store/MongoDbStoreTest.php b/src/Symfony/Component/Lock/Tests/Store/MongoDbStoreTest.php
@@ -30,7 +30,7 @@ class MongoDbStoreTest extends AbstractStoreTestCase
 {
     use ExpiringStoreTestTrait;
 
-    public static function setupBeforeClass(): void
+    public static function setUpBeforeClass(): void
     {
         if (!class_exists(Client::class)) {
             throw new SkippedTestSuiteError('The mongodb/mongodb package is required.');
diff --git a/src/Symfony/Component/Serializer/Normalizer/AbstractNormalizer.php b/src/Symfony/Component/Serializer/Normalizer/AbstractNormalizer.php
@@ -367,32 +367,32 @@ protected function instantiateObject(array &$data, string $class, array &$contex
                 } elseif ($allowed && !$ignored && (isset($data[$key]) || \array_key_exists($key, $data))) {
                     $parameterData = $data[$key];
                     if (null === $parameterData && $constructorParameter->allowsNull()) {
-                        $params[] = null;
+                        $params[$paramName] = null;
                         $unsetKeys[] = $key;
 
                         continue;
                     }
 
                     try {
-                        $params[] = $this->denormalizeParameter($reflectionClass, $constructorParameter, $paramName, $parameterData, $attributeContext, $format);
+                        $params[$paramName] = $this->denormalizeParameter($reflectionClass, $constructorParameter, $paramName, $parameterData, $attributeContext, $format);
                     } catch (NotNormalizableValueException $exception) {
                         if (!isset($context['not_normalizable_value_exceptions'])) {
                             throw $exception;
                         }
 
                         $context['not_normalizable_value_exceptions'][] = $exception;
-                        $params[] = $parameterData;
+                        $params[$paramName] = $parameterData;
                     }
 
                     $unsetKeys[] = $key;
                 } elseif (\array_key_exists($key, $context[static::DEFAULT_CONSTRUCTOR_ARGUMENTS][$class] ?? [])) {
-                    $params[] = $context[static::DEFAULT_CONSTRUCTOR_ARGUMENTS][$class][$key];
+                    $params[$paramName] = $context[static::DEFAULT_CONSTRUCTOR_ARGUMENTS][$class][$key];
                 } elseif (\array_key_exists($key, $this->defaultContext[self::DEFAULT_CONSTRUCTOR_ARGUMENTS][$class] ?? [])) {
-                    $params[] = $this->defaultContext[self::DEFAULT_CONSTRUCTOR_ARGUMENTS][$class][$key];
+                    $params[$paramName] = $this->defaultContext[self::DEFAULT_CONSTRUCTOR_ARGUMENTS][$class][$key];
                 } elseif ($constructorParameter->isDefaultValueAvailable()) {
-                    $params[] = $constructorParameter->getDefaultValue();
+                    $params[$paramName] = $constructorParameter->getDefaultValue();
                 } elseif (!($context[self::REQUIRE_ALL_PROPERTIES] ?? $this->defaultContext[self::REQUIRE_ALL_PROPERTIES] ?? false) && $constructorParameter->hasType() && $constructorParameter->getType()->allowsNull()) {
-                    $params[] = null;
+                    $params[$paramName] = null;
                 } else {
                     if (!isset($context['not_normalizable_value_exceptions'])) {
                         $missingConstructorArguments[] = $constructorParameter->name;
diff --git a/src/Symfony/Component/Serializer/Normalizer/BackedEnumNormalizer.php b/src/Symfony/Component/Serializer/Normalizer/BackedEnumNormalizer.php
@@ -77,7 +77,7 @@ public function denormalize(mixed $data, string $type, string $format = null, ar
             return $type::from($data);
         } catch (\ValueError $e) {
             if (isset($context['has_constructor'])) {
-                throw new InvalidArgumentException('The data must belong to a backed enumeration of type '.$type);
+                throw new InvalidArgumentException('The data must belong to a backed enumeration of type '.$type, 0, $e);
             }
 
             throw NotNormalizableValueException::createForUnexpectedDataType('The data must belong to a backed enumeration of type '.$type, $data, [$type], $context['deserialization_path'] ?? null, true, 0, $e);
diff --git a/src/Symfony/Component/Serializer/Tests/Fixtures/Php80Dummy.php b/src/Symfony/Component/Serializer/Tests/Fixtures/Php80Dummy.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Symfony\Component\Serializer\Tests;
+namespace Symfony\Component\Serializer\Tests\Fixtures;
 
 final class Php80Dummy
 {
diff --git a/src/Symfony/Component/Serializer/Tests/Fixtures/Php80WithOptionalConstructorParameter.php b/src/Symfony/Component/Serializer/Tests/Fixtures/Php80WithOptionalConstructorParameter.php
@@ -0,0 +1,22 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Serializer\Tests\Fixtures;
+
+final class Php80WithOptionalConstructorParameter
+{
+    public function __construct(
+        public string $one,
+        public string $two,
+        public ?string $three = null,
+    ) {
+    }
+}
diff --git a/src/Symfony/Component/Serializer/Tests/Normalizer/ObjectNormalizerTest.php b/src/Symfony/Component/Serializer/Tests/Normalizer/ObjectNormalizerTest.php
@@ -41,6 +41,7 @@
 use Symfony\Component\Serializer\Tests\Fixtures\OtherSerializedNameDummy;
 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\SiblingHolder;
 use Symfony\Component\Serializer\Tests\Normalizer\Features\AttributesTestTrait;
 use Symfony\Component\Serializer\Tests\Normalizer\Features\CacheableObjectAttributesTestTrait;
@@ -58,7 +59,6 @@
 use Symfony\Component\Serializer\Tests\Normalizer\Features\TypedPropertiesObject;
 use Symfony\Component\Serializer\Tests\Normalizer\Features\TypedPropertiesObjectWithGetters;
 use Symfony\Component\Serializer\Tests\Normalizer\Features\TypeEnforcementTestTrait;
-use Symfony\Component\Serializer\Tests\Php80Dummy;
 
 /**
  * @author Kévin Dunglas <dunglas@gmail.com>
diff --git a/src/Symfony/Component/Serializer/Tests/SerializerTest.php b/src/Symfony/Component/Serializer/Tests/SerializerTest.php
@@ -68,6 +68,7 @@
 use Symfony\Component\Serializer\Tests\Fixtures\NormalizableTraversableDummy;
 use Symfony\Component\Serializer\Tests\Fixtures\ObjectCollectionPropertyDummy;
 use Symfony\Component\Serializer\Tests\Fixtures\Php74Full;
+use Symfony\Component\Serializer\Tests\Fixtures\Php80WithOptionalConstructorParameter;
 use Symfony\Component\Serializer\Tests\Fixtures\Php80WithPromotedTypedConstructor;
 use Symfony\Component\Serializer\Tests\Fixtures\TraversableDummy;
 use Symfony\Component\Serializer\Tests\Fixtures\TrueBuiltInDummy;
@@ -1502,6 +1503,58 @@ public function testSerializerUsesSupportedTypesMethod()
         $serializer->denormalize('foo', Model::class, 'json');
         $serializer->denormalize('foo', Model::class, 'json');
     }
+
+    public function testPartialDenormalizationWithMissingConstructorTypes()
+    {
+        $json = '{"one": "one string", "three": "three string"}';
+
+        $extractor = new PropertyInfoExtractor([], [new ReflectionExtractor()]);
+
+        $serializer = new Serializer(
+            [new ObjectNormalizer(null, null, null, $extractor)],
+            ['json' => new JsonEncoder()]
+        );
+
+        try {
+            $serializer->deserialize($json, Php80WithOptionalConstructorParameter::class, 'json', [
+                DenormalizerInterface::COLLECT_DENORMALIZATION_ERRORS => true,
+            ]);
+
+            $this->fail();
+        } catch (\Throwable $th) {
+            $this->assertInstanceOf(PartialDenormalizationException::class, $th);
+        }
+
+        $this->assertInstanceOf(Php80WithOptionalConstructorParameter::class, $object = $th->getData());
+
+        $this->assertSame('one string', $object->one);
+        $this->assertFalse(isset($object->two));
+        $this->assertSame('three string', $object->three);
+
+        $exceptionsAsArray = array_map(function (NotNormalizableValueException $e): array {
+            return [
+                'currentType' => $e->getCurrentType(),
+                'expectedTypes' => $e->getExpectedTypes(),
+                'path' => $e->getPath(),
+                'useMessageForUser' => $e->canUseMessageForUser(),
+                'message' => $e->getMessage(),
+            ];
+        }, $th->getErrors());
+
+        $expected = [
+            [
+                'currentType' => 'array',
+                'expectedTypes' => [
+                    'unknown',
+                ],
+                'path' => null,
+                'useMessageForUser' => true,
+                'message' => 'Failed to create object because the class misses the "two" property.',
+            ],
+        ];
+
+        $this->assertSame($expected, $exceptionsAsArray);
+    }
 }
 
 class Model

Original file line number	Diff line number	Diff line change
`@@ -265,7 +265,7 @@ private static function removeDir($dir)`
`265`	`265`	`rmdir($dir);`
`266`	`266`	`}`
`267`	`267`
`268`		`- public static function setupBeforeClass(): void`
	`268`	`+ public static function setUpBeforeClass(): void`
`269`	`269`	`{`
`270`	`270`	`foreach (get_declared_classes() as $class) {`
`271`	`271`	`if ('C' === $class[0] && 0 === strpos($class, 'ComposerAutoloaderInit')) {`
Original file line number	Diff line number	Diff line change
`@@ -242,7 +242,7 @@ public function testFirewalls()`
`242`	`242`	`],`
`243`	`243`	`], $listeners);`
`244`	`244`
`245`		`- $this->assertFalse($container->hasAlias(UserCheckerInterface::class, 'No user checker alias is registered when custom user checker services are registered'));`
	`245`	`+ $this->assertFalse($container->hasAlias(UserCheckerInterface::class), 'No user checker alias is registered when custom user checker services are registered');`
`246`	`246`	`}`
`247`	`247`
`248`	`248`	`public function testFirewallRequestMatchers()`
Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@ class CouchbaseBucketAdapterTest extends AdapterTestCase`
`33`	`33`	`/** @var \CouchbaseBucket */`
`34`	`34`	`protected static $client;`
`35`	`35`
`36`		`- public static function setupBeforeClass(): void`
	`36`	`+ public static function setUpBeforeClass(): void`
`37`	`37`	`{`
`38`	`38`	`if (!CouchbaseBucketAdapter::isSupported()) {`
`39`	`39`	`throw new SkippedTestSuiteError('Couchbase >= 2.6.0 < 3.0.0 is required.');`
Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@ class CouchbaseCollectionAdapterTest extends AdapterTestCase`
`33`	`33`	`/** @var Collection */`
`34`	`34`	`protected static $client;`
`35`	`35`
`36`		`- public static function setupBeforeClass(): void`
	`36`	`+ public static function setUpBeforeClass(): void`
`37`	`37`	`{`
`38`	`38`	`if (!CouchbaseCollectionAdapter::isSupported()) {`
`39`	`39`	`self::markTestSkipped('Couchbase >= 3.0.0 < 4.0.0 is required.');`
Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ class RedisArrayAdapterTest extends AbstractRedisAdapterTestCase`
`20`	`20`	`{`
`21`	`21`	`public static function setUpBeforeClass(): void`
`22`	`22`	`{`
`23`		`- parent::setupBeforeClass();`
	`23`	`+ parent::setUpBeforeClass();`
`24`	`24`	`if (!class_exists(\RedisArray::class)) {`
`25`	`25`	`throw new SkippedTestSuiteError('The RedisArray class is required.');`
`26`	`26`	`}`
Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@`
`25`	`25`	`*/`
`26`	`26`	`class MongoDbStoreFactoryTest extends TestCase`
`27`	`27`	`{`
`28`		`- public static function setupBeforeClass(): void`
	`28`	`+ public static function setUpBeforeClass(): void`
`29`	`29`	`{`
`30`	`30`	`if (!class_exists(Client::class)) {`
`31`	`31`	`throw new SkippedTestSuiteError('The mongodb/mongodb package is required.');`
Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@ class MongoDbStoreTest extends AbstractStoreTestCase`
`30`	`30`	`{`
`31`	`31`	`use ExpiringStoreTestTrait;`
`32`	`32`
`33`		`- public static function setupBeforeClass(): void`
	`33`	`+ public static function setUpBeforeClass(): void`
`34`	`34`	`{`
`35`	`35`	`if (!class_exists(Client::class)) {`
`36`	`36`	`throw new SkippedTestSuiteError('The mongodb/mongodb package is required.');`
Original file line number	Diff line number	Diff line change
`@@ -77,7 +77,7 @@ public function denormalize(mixed $data, string $type, string $format = null, ar`
`77`	`77`	`return $type::from($data);`
`78`	`78`	`} catch (\ValueError $e) {`
`79`	`79`	`if (isset($context['has_constructor'])) {`
`80`		`- throw new InvalidArgumentException('The data must belong to a backed enumeration of type '.$type);`
	`80`	`+ throw new InvalidArgumentException('The data must belong to a backed enumeration of type '.$type, 0, $e);`
`81`	`81`	`}`
`82`	`82`
`83`	`83`	`throw NotNormalizableValueException::createForUnexpectedDataType('The data must belong to a backed enumeration of type '.$type, $data, [$type], $context['deserialization_path'] ?? null, true, 0, $e);`
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@`
`9`	`9`	`* file that was distributed with this source code.`
`10`	`10`	`*/`
`11`	`11`
`12`		`-namespace Symfony\Component\Serializer\Tests;`
	`12`	`+namespace Symfony\Component\Serializer\Tests\Fixtures;`
`13`	`13`
`14`	`14`	`final class Php80Dummy`
`15`	`15`	`{`