Merge branch '5.4' into 6.2

derrabus · derrabus · commit 020b6894682f · 2023-07-20T16:50:55.000+02:00
* 5.4:
  relax assertions for ICU 72.1
  [Validator] Fix regression with class metadatada on parent classes
  [VarExporter] Fix exporting classes with __serialize() but not __unserialize()
  [HttpFoundation][HttpKernel] Fix deprecations when `Content-Type` is `null`
diff --git a/src/Symfony/Bridge/Doctrine/Validator/DoctrineLoader.php b/src/Symfony/Bridge/Doctrine/Validator/DoctrineLoader.php
@@ -105,7 +105,7 @@ public function loadClassMetadata(ClassMetadata $metadata): bool
                 if (isset($mapping['originalClass']) && !str_contains($mapping['declaredField'], '.')) {
                     $metadata->addPropertyConstraint($mapping['declaredField'], new Valid());
                     $loaded = true;
-                } elseif (property_exists($className, $mapping['fieldName'])) {
+                } elseif (property_exists($className, $mapping['fieldName']) && (!$doctrineMetadata->isMappedSuperclass || $metadata->getReflectionClass()->getProperty($mapping['fieldName'])->isPrivate())) {
                     $metadata->addPropertyConstraint($mapping['fieldName'], new Length(['max' => $mapping['length']]));
                     $loaded = true;
                 }
diff --git a/src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/DateTimeToLocalizedStringTransformerTest.php b/src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/DateTimeToLocalizedStringTransformerTest.php
@@ -124,7 +124,7 @@ public function testTransformToDifferentLocale()
 
         $transformer = new DateTimeToLocalizedStringTransformer('UTC', 'UTC');
 
-        $this->assertEquals('Feb 3, 2010, 4:05 AM', $transformer->transform($this->dateTime));
+        $this->assertMatchesRegularExpression('/^Feb 3, 2010, 4:05\s+AM$/u', $transformer->transform($this->dateTime));
     }
 
     public function testTransformEmpty()
diff --git a/src/Symfony/Component/Form/Tests/Extension/Core/Type/DateTimeTypeTest.php b/src/Symfony/Component/Form/Tests/Extension/Core/Type/DateTimeTypeTest.php
@@ -530,7 +530,7 @@ public function testSingleTextWidgetWithCustomNonHtml5Format()
         ]);
         $view = $form->createView();
 
-        $this->assertSame('2/13/19, 7:12:13 PM', $view->vars['value']);
+        $this->assertMatchesRegularExpression('#^2/13/19, 7:12:13\s+PM$#u', $view->vars['value']);
     }
 
     public function testDateTypeChoiceErrorsBubbleUp()
diff --git a/src/Symfony/Component/HttpFoundation/Response.php b/src/Symfony/Component/HttpFoundation/Response.php
@@ -281,7 +281,7 @@ public function prepare(Request $request): static
             $charset = $this->charset ?: 'UTF-8';
             if (!$headers->has('Content-Type')) {
                 $headers->set('Content-Type', 'text/html; charset='.$charset);
-            } elseif (0 === stripos($headers->get('Content-Type'), 'text/') && false === stripos($headers->get('Content-Type'), 'charset')) {
+            } elseif (0 === stripos($headers->get('Content-Type') ?? '', 'text/') && false === stripos($headers->get('Content-Type') ?? '', 'charset')) {
                 // add the charset
                 $headers->set('Content-Type', $headers->get('Content-Type').'; charset='.$charset);
             }
diff --git a/src/Symfony/Component/HttpFoundation/Tests/ResponseTest.php b/src/Symfony/Component/HttpFoundation/Tests/ResponseTest.php
@@ -537,6 +537,16 @@ public function testContentTypeCharset()
         $this->assertEquals('text/css; charset=UTF-8', $response->headers->get('Content-Type'));
     }
 
+    public function testContentTypeIsNull()
+    {
+        $response = new Response('foo');
+        $response->headers->set('Content-Type', null);
+
+        $response->prepare(new Request());
+
+        $this->expectNotToPerformAssertions();
+    }
+
     public function testPrepareDoesNothingIfContentTypeIsSet()
     {
         $response = new Response('foo');
diff --git a/src/Symfony/Component/HttpKernel/DataCollector/DumpDataCollector.php b/src/Symfony/Component/HttpKernel/DataCollector/DumpDataCollector.php
@@ -108,11 +108,11 @@ public function collect(Request $request, Response $response, \Throwable $except
         if (!$this->requestStack
             || !$response->headers->has('X-Debug-Token')
             || $response->isRedirection()
-            || ($response->headers->has('Content-Type') && !str_contains($response->headers->get('Content-Type'), 'html'))
+            || ($response->headers->has('Content-Type') && !str_contains($response->headers->get('Content-Type') ?? '', 'html'))
             || 'html' !== $request->getRequestFormat()
             || false === strripos($response->getContent(), '</body>')
         ) {
-            if ($response->headers->has('Content-Type') && str_contains($response->headers->get('Content-Type'), 'html')) {
+            if ($response->headers->has('Content-Type') && str_contains($response->headers->get('Content-Type') ?? '', 'html')) {
                 $dumper = new HtmlDumper('php://output', $this->charset);
                 $dumper->setDisplayOptions(['fileLinkFormat' => $this->fileLinkFormat]);
             } else {
diff --git a/src/Symfony/Component/HttpKernel/Tests/DataCollector/DumpDataCollectorTest.php b/src/Symfony/Component/HttpKernel/Tests/DataCollector/DumpDataCollectorTest.php
@@ -13,6 +13,7 @@
 
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpFoundation\RequestStack;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\HttpKernel\DataCollector\DumpDataCollector;
 use Symfony\Component\HttpKernel\Debug\FileLinkFormatter;
@@ -156,4 +157,22 @@ public function testFlushNothingWhenDataDumperIsProvided()
         $collector->__destruct();
         $this->assertEmpty(ob_get_clean());
     }
+
+    public function testNullContentTypeWithNoDebugEnv()
+    {
+        $request = new Request();
+        $requestStack = new RequestStack();
+        $requestStack->push($request);
+
+        $response = new Response('<html><head></head><body></body></html>');
+        $response->headers->set('Content-Type', null);
+        $response->headers->set('X-Debug-Token', 'xxxxxxxx');
+
+        $collector = new DumpDataCollector(null, null, null, $requestStack);
+        $collector->collect($request, $response);
+
+        ob_start();
+        $collector->__destruct();
+        $this->assertEmpty(ob_get_clean());
+    }
 }
diff --git a/src/Symfony/Component/Validator/Mapping/ClassMetadata.php b/src/Symfony/Component/Validator/Mapping/ClassMetadata.php
@@ -342,11 +342,11 @@ public function mergeConstraints(self $source)
 
                 if ($member instanceof MemberMetadata && !$member->isPrivate($this->name)) {
                     $property = $member->getPropertyName();
-                    $this->members[$property] = [$member];
+                    $this->members[$property][] = $member;
 
-                    if ($member instanceof PropertyMetadata) {
+                    if ($member instanceof PropertyMetadata && !isset($this->properties[$property])) {
                         $this->properties[$property] = $member;
-                    } elseif ($member instanceof GetterMetadata) {
+                    } elseif ($member instanceof GetterMetadata && !isset($this->getters[$property])) {
                         $this->getters[$property] = $member;
                     }
                 } else {
diff --git a/src/Symfony/Component/Validator/Tests/Fixtures/Annotation/Entity.php b/src/Symfony/Component/Validator/Tests/Fixtures/Annotation/Entity.php
@@ -55,6 +55,10 @@ class Entity extends EntityParent implements EntityInterfaceB
     private $internal;
     public $data = 'Overridden data';
     public $initialized = false;
+    /**
+     * @Assert\Type("integer")
+     */
+    protected $other;
 
     public function __construct($internal = null)
     {
diff --git a/src/Symfony/Component/Validator/Tests/Fixtures/Attribute/Entity.php b/src/Symfony/Component/Validator/Tests/Fixtures/Attribute/Entity.php
@@ -57,6 +57,8 @@ class Entity extends EntityParent implements EntityInterfaceB
     private $internal;
     public $data = 'Overridden data';
     public $initialized = false;
+    #[Assert\Type('integer')]
+    protected $other;
 
     public function __construct($internal = null)
     {
diff --git a/src/Symfony/Component/Validator/Tests/Fixtures/NestedAttribute/Entity.php b/src/Symfony/Component/Validator/Tests/Fixtures/NestedAttribute/Entity.php
@@ -78,6 +78,8 @@ class Entity extends EntityParent implements EntityInterfaceB
     private $internal;
     public $data = 'Overridden data';
     public $initialized = false;
+    #[Assert\Type('integer')]
+    protected $other;
 
     public function __construct($internal = null)
     {
diff --git a/src/Symfony/Component/Validator/Tests/Mapping/ClassMetadataTest.php b/src/Symfony/Component/Validator/Tests/Mapping/ClassMetadataTest.php
@@ -163,8 +163,8 @@ public function testMergeConstraintsMergesMemberConstraints()
         $parent->addPropertyConstraint('firstName', new ConstraintA());
         $parent->addPropertyConstraint('firstName', new ConstraintB(['groups' => 'foo']));
 
-        $this->metadata->mergeConstraints($parent);
         $this->metadata->addPropertyConstraint('firstName', new ConstraintA());
+        $this->metadata->mergeConstraints($parent);
 
         $constraintA1 = new ConstraintA(['groups' => [
             'Default',
@@ -179,35 +179,29 @@ public function testMergeConstraintsMergesMemberConstraints()
             'groups' => ['foo'],
         ]);
 
-        $constraints = [
-            $constraintA1,
-            $constraintB,
-            $constraintA2,
-        ];
+        $members = $this->metadata->getPropertyMetadata('firstName');
 
-        $constraintsByGroup = [
-            'Default' => [
-                $constraintA1,
-                $constraintA2,
-            ],
-            'EntityParent' => [
-                $constraintA1,
-            ],
-            'Entity' => [
-                $constraintA1,
-                $constraintA2,
+        $this->assertCount(2, $members);
+        $this->assertEquals(self::CLASSNAME, $members[0]->getClassName());
+        $this->assertEquals([$constraintA2], $members[0]->getConstraints());
+        $this->assertEquals(
+            [
+                'Default' => [$constraintA2],
+                'Entity' => [$constraintA2],
             ],
-            'foo' => [
-                $constraintB,
+            $members[0]->constraintsByGroup
+        );
+        $this->assertEquals(self::PARENTCLASS, $members[1]->getClassName());
+        $this->assertEquals([$constraintA1, $constraintB], $members[1]->getConstraints());
+        $this->assertEquals(
+            [
+                'Default' => [$constraintA1],
+                'Entity' => [$constraintA1],
+                'EntityParent' => [$constraintA1],
+                'foo' => [$constraintB],
             ],
-        ];
-
-        $members = $this->metadata->getPropertyMetadata('firstName');
-
-        $this->assertCount(1, $members);
-        $this->assertEquals(self::PARENTCLASS, $members[0]->getClassName());
-        $this->assertEquals($constraints, $members[0]->getConstraints());
-        $this->assertEquals($constraintsByGroup, $members[0]->constraintsByGroup);
+            $members[1]->constraintsByGroup
+        );
     }
 
     public function testMemberMetadatas()
diff --git a/src/Symfony/Component/Validator/Tests/Mapping/Loader/AnnotationLoaderTest.php b/src/Symfony/Component/Validator/Tests/Mapping/Loader/AnnotationLoaderTest.php
@@ -27,6 +27,7 @@
 use Symfony\Component\Validator\Constraints\Range;
 use Symfony\Component\Validator\Constraints\Required;
 use Symfony\Component\Validator\Constraints\Sequentially;
+use Symfony\Component\Validator\Constraints\Type;
 use Symfony\Component\Validator\Constraints\Valid;
 use Symfony\Component\Validator\Mapping\ClassMetadata;
 use Symfony\Component\Validator\Mapping\Loader\AnnotationLoader;
@@ -98,6 +99,7 @@ public function testLoadClassMetadata(string $namespace)
         $expected->addGetterConstraint('lastName', new NotNull());
         $expected->addGetterMethodConstraint('valid', 'isValid', new IsTrue());
         $expected->addGetterConstraint('permissions', new IsTrue());
+        $expected->addPropertyConstraint('other', new Type('integer'));
 
         // load reflection class so that the comparison passes
         $expected->getReflectionClass();
@@ -139,18 +141,16 @@ public function testLoadClassMetadataAndMerge(string $namespace)
         $loader->loadClassMetadata($parent_metadata);
 
         $metadata = new ClassMetadata($namespace.'\Entity');
+        $loader->loadClassMetadata($metadata);
 
         // Merge parent metaData.
         $metadata->mergeConstraints($parent_metadata);
 
-        $loader->loadClassMetadata($metadata);
-
         $expected_parent = new ClassMetadata($namespace.'\EntityParent');
         $expected_parent->addPropertyConstraint('other', new NotNull());
         $expected_parent->getReflectionClass();
 
         $expected = new ClassMetadata($namespace.'\Entity');
-        $expected->mergeConstraints($expected_parent);
 
         $expected->setGroupSequence(['Foo', 'Entity']);
         $expected->addConstraint(new ConstraintA());
@@ -187,11 +187,18 @@ public function testLoadClassMetadataAndMerge(string $namespace)
         $expected->addGetterConstraint('lastName', new NotNull());
         $expected->addGetterMethodConstraint('valid', 'isValid', new IsTrue());
         $expected->addGetterConstraint('permissions', new IsTrue());
+        $expected->addPropertyConstraint('other', new Type('integer'));
 
         // load reflection class so that the comparison passes
         $expected->getReflectionClass();
+        $expected->mergeConstraints($expected_parent);
 
         $this->assertEquals($expected, $metadata);
+
+        $otherMetadata = $metadata->getPropertyMetadata('other');
+        $this->assertCount(2, $otherMetadata);
+        $this->assertInstanceOf(Type::class, $otherMetadata[0]->getConstraints()[0]);
+        $this->assertInstanceOf(NotNull::class, $otherMetadata[1]->getConstraints()[0]);
     }
 
     /**
diff --git a/src/Symfony/Component/VarExporter/Internal/Exporter.php b/src/Symfony/Component/VarExporter/Internal/Exporter.php
@@ -75,20 +75,29 @@ public static function prepare($values, $objectsPool, &$refsPool, &$objectsCount
 
             $class = $value::class;
             $reflector = Registry::$reflectors[$class] ??= Registry::getClassReflector($class);
+            $properties = [];
 
             if ($reflector->hasMethod('__serialize')) {
                 if (!$reflector->getMethod('__serialize')->isPublic()) {
                     throw new \Error(sprintf('Call to %s method "%s::__serialize()".', $reflector->getMethod('__serialize')->isProtected() ? 'protected' : 'private', $class));
                 }
 
-                if (!\is_array($properties = $value->__serialize())) {
+                if (!\is_array($serializeProperties = $value->__serialize())) {
                     throw new \TypeError($class.'::__serialize() must return an array');
                 }
 
+                if ($reflector->hasMethod('__unserialize')) {
+                    $properties = $serializeProperties;
+                } else {
+                    foreach ($serializeProperties as $n => $v) {
+                        $c = \PHP_VERSION_ID >= 80100 && $reflector->hasProperty($n) && ($p = $reflector->getProperty($n))->isReadOnly() ? $p->class : 'stdClass';
+                        $properties[$c][$n] = $v;
+                    }
+                }
+
                 goto prepare_value;
             }
 
-            $properties = [];
             $sleep = null;
             $proto = Registry::$prototypes[$class];
 
diff --git a/src/Symfony/Component/VarExporter/Tests/Fixtures/__serialize-but-no-__unserialize.php b/src/Symfony/Component/VarExporter/Tests/Fixtures/__serialize-but-no-__unserialize.php
@@ -0,0 +1,17 @@
+<?php
+
+return \Symfony\Component\VarExporter\Internal\Hydrator::hydrate(
+    $o = [
+        clone (\Symfony\Component\VarExporter\Internal\Registry::$prototypes['Symfony\\Component\\VarExporter\\Tests\\__SerializeButNo__Unserialize'] ?? \Symfony\Component\VarExporter\Internal\Registry::p('Symfony\\Component\\VarExporter\\Tests\\__SerializeButNo__Unserialize')),
+    ],
+    null,
+    [
+        'stdClass' => [
+            'foo' => [
+                'ccc',
+            ],
+        ],
+    ],
+    $o[0],
+    []
+);
diff --git a/src/Symfony/Component/VarExporter/Tests/VarExporterTest.php b/src/Symfony/Component/VarExporter/Tests/VarExporterTest.php
@@ -235,6 +235,8 @@ public static function provideExport()
 
         yield ['__unserialize-but-no-__serialize', new __UnserializeButNo__Serialize()];
 
+        yield ['__serialize-but-no-__unserialize', new __SerializeButNo__Unserialize()];
+
         yield ['unit-enum', [FooUnitEnum::Bar], true];
         yield ['readonly', new FooReadonly('k', 'v')];
     }
@@ -454,3 +456,20 @@ public function __unserialize(array $data): void
         $this->foo = $data['foo'];
     }
 }
+
+class __SerializeButNo__Unserialize
+{
+    public $foo;
+
+    public function __construct()
+    {
+        $this->foo = 'ccc';
+    }
+
+    public function __serialize(): array
+    {
+        return [
+            'foo' => $this->foo,
+        ];
+    }
+}

Original file line number	Diff line number	Diff line change
`@@ -105,7 +105,7 @@ public function loadClassMetadata(ClassMetadata $metadata): bool`
`105`	`105`	`if (isset($mapping['originalClass']) && !str_contains($mapping['declaredField'], '.')) {`
`106`	`106`	`$metadata->addPropertyConstraint($mapping['declaredField'], new Valid());`
`107`	`107`	`$loaded = true;`
`108`		`- } elseif (property_exists($className, $mapping['fieldName'])) {`
	`108`	`+ } elseif (property_exists($className, $mapping['fieldName']) && (!$doctrineMetadata->isMappedSuperclass \|\| $metadata->getReflectionClass()->getProperty($mapping['fieldName'])->isPrivate())) {`
`109`	`109`	`$metadata->addPropertyConstraint($mapping['fieldName'], new Length(['max' => $mapping['length']]));`
`110`	`110`	`$loaded = true;`
`111`	`111`	`}`
Original file line number	Diff line number	Diff line change
`@@ -124,7 +124,7 @@ public function testTransformToDifferentLocale()`
`124`	`124`
`125`	`125`	`$transformer = new DateTimeToLocalizedStringTransformer('UTC', 'UTC');`
`126`	`126`
`127`		`- $this->assertEquals('Feb 3, 2010, 4:05 AM', $transformer->transform($this->dateTime));`
	`127`	`+ $this->assertMatchesRegularExpression('/^Feb 3, 2010, 4:05\s+AM$/u', $transformer->transform($this->dateTime));`
`128`	`128`	`}`
`129`	`129`
`130`	`130`	`public function testTransformEmpty()`
Original file line number	Diff line number	Diff line change
`@@ -530,7 +530,7 @@ public function testSingleTextWidgetWithCustomNonHtml5Format()`
`530`	`530`	`]);`
`531`	`531`	`$view = $form->createView();`
`532`	`532`
`533`		`- $this->assertSame('2/13/19, 7:12:13 PM', $view->vars['value']);`
	`533`	`+ $this->assertMatchesRegularExpression('#^2/13/19, 7:12:13\s+PM$#u', $view->vars['value']);`
`534`	`534`	`}`
`535`	`535`
`536`	`536`	`public function testDateTypeChoiceErrorsBubbleUp()`
Original file line number	Diff line number	Diff line change
`@@ -281,7 +281,7 @@ public function prepare(Request $request): static`
`281`	`281`	`$charset = $this->charset ?: 'UTF-8';`
`282`	`282`	`if (!$headers->has('Content-Type')) {`
`283`	`283`	`$headers->set('Content-Type', 'text/html; charset='.$charset);`
`284`		`- } elseif (0 === stripos($headers->get('Content-Type'), 'text/') && false === stripos($headers->get('Content-Type'), 'charset')) {`
	`284`	`+ } elseif (0 === stripos($headers->get('Content-Type') ?? '', 'text/') && false === stripos($headers->get('Content-Type') ?? '', 'charset')) {`
`285`	`285`	`// add the charset`
`286`	`286`	`$headers->set('Content-Type', $headers->get('Content-Type').'; charset='.$charset);`
`287`	`287`	`}`
Original file line number	Diff line number	Diff line change
`@@ -57,6 +57,8 @@ class Entity extends EntityParent implements EntityInterfaceB`
`57`	`57`	`private $internal;`
`58`	`58`	`public $data = 'Overridden data';`
`59`	`59`	`public $initialized = false;`
	`60`	`+ #[Assert\Type('integer')]`
	`61`	`+ protected $other;`
`60`	`62`
`61`	`63`	`public function __construct($internal = null)`
`62`	`64`	`{`