Merge branch '5.4' into 6.4

* 5.4:
  fix compatibility with Twig 3.10
  [Strings][EnglishInflector] Fix incorrect pluralisation of 'Album'
  handle union and intersection types for cascaded validations
  move wiring of the property info extractor to the ObjectNormalizer
  move Process component dep to require-dev
  Remove calls to `onConsecutiveCalls()`
  fix: remove unwanted type cast
  accept AbstractAsset instances when filtering schemas
  better distinguish URL schemes and windows drive letters
  convert empty CSV header names into numeric keys

Author: derrabus

Mapping/ClassMetadata.php

@@ -198,7 +198,7 @@ public function addConstraint(Constraint $constraint): static
                     continue;
                 }
 
-                if ($property->hasType() && (('array' === $type = $property->getType()->getName()) || class_exists($type))) {
+                if ($this->canCascade($property->getType())) {
                     $this->addPropertyConstraint($property->getName(), new Valid());
                 }
             }
@@ -487,4 +487,33 @@ private function checkConstraint(Constraint $constraint): void
             }
         }
     }
+
+    private function canCascade(?\ReflectionType $type = null): bool
+    {
+        if (null === $type) {
+            return false;
+        }
+
+        if ($type instanceof \ReflectionIntersectionType) {
+            foreach ($type->getTypes() as $nestedType) {
+                if ($this->canCascade($nestedType)) {
+                    return true;
+                }
+            }
+
+            return false;
+        }
+
+        if ($type instanceof \ReflectionUnionType) {
+            foreach ($type->getTypes() as $nestedType) {
+                if (!$this->canCascade($nestedType)) {
+                    return false;
+                }
+            }
+
+            return true;
+        }
+
+        return $type instanceof \ReflectionNamedType && (\in_array($type->getName(), ['array', 'null'], true) || class_exists($type->getName()));
+    }
 }

Tests/Fixtures/CascadingEntityIntersection.php

@@ -0,0 +1,17 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <[email protected]>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Validator\Tests\Fixtures;
+
+class CascadingEntityIntersection
+{
+    public CascadedChild&\stdClass $classes;
+}

Tests/Fixtures/CascadingEntityUnion.php

@@ -0,0 +1,25 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <[email protected]>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Validator\Tests\Fixtures;
+
+class CascadingEntityUnion
+{
+    public CascadedChild|\stdClass $classes;
+    public CascadedChild|array $classAndArray;
+    public CascadedChild|null $classAndNull;
+    public array|null $arrayAndNull;
+    public CascadedChild|array|null $classAndArrayAndNull;
+    public int|string $scalars;
+    public int|null $scalarAndNull;
+    public CascadedChild|int $classAndScalar;
+    public array|int $arrayAndScalar;
+}

Tests/Mapping/ClassMetadataTest.php

@@ -22,6 +22,8 @@
 use Symfony\Component\Validator\Mapping\CascadingStrategy;
 use Symfony\Component\Validator\Mapping\ClassMetadata;
 use Symfony\Component\Validator\Tests\Fixtures\CascadingEntity;
+use Symfony\Component\Validator\Tests\Fixtures\CascadingEntityIntersection;
+use Symfony\Component\Validator\Tests\Fixtures\CascadingEntityUnion;
 use Symfony\Component\Validator\Tests\Fixtures\ClassConstraint;
 use Symfony\Component\Validator\Tests\Fixtures\ConstraintA;
 use Symfony\Component\Validator\Tests\Fixtures\ConstraintB;
@@ -342,6 +344,34 @@ public function testCascadeConstraint()
         ], $metadata->getConstrainedProperties());
     }
 
+    public function testCascadeConstraintWithUnionTypeProperties()
+    {
+        $metadata = new ClassMetadata(CascadingEntityUnion::class);
+        $metadata->addConstraint(new Cascade());
+
+        $this->assertSame(CascadingStrategy::CASCADE, $metadata->getCascadingStrategy());
+        $this->assertCount(5, $metadata->properties);
+        $this->assertSame([
+            'classes',
+            'classAndArray',
+            'classAndNull',
+            'arrayAndNull',
+            'classAndArrayAndNull',
+        ], $metadata->getConstrainedProperties());
+    }
+
+    public function testCascadeConstraintWithIntersectionTypeProperties()
+    {
+        $metadata = new ClassMetadata(CascadingEntityIntersection::class);
+        $metadata->addConstraint(new Cascade());
+
+        $this->assertSame(CascadingStrategy::CASCADE, $metadata->getCascadingStrategy());
+        $this->assertCount(1, $metadata->properties);
+        $this->assertSame([
+            'classes',
+        ], $metadata->getConstrainedProperties());
+    }
+
     public function testCascadeConstraintWithExcludedProperties()
     {
         $metadata = new ClassMetadata(CascadingEntity::class);

Tests/Mapping/Loader/PropertyInfoLoaderTest.php

@@ -54,9 +54,10 @@ public function testLoadClassMetadata()
                 'noAutoMapping',
             ])
         ;
+
         $propertyInfoStub
             ->method('getTypes')
-            ->will($this->onConsecutiveCalls(
+            ->willReturn(
                 [new Type(Type::BUILTIN_TYPE_STRING, true)],
                 [new Type(Type::BUILTIN_TYPE_STRING)],
                 [new Type(Type::BUILTIN_TYPE_STRING, true), new Type(Type::BUILTIN_TYPE_INT), new Type(Type::BUILTIN_TYPE_BOOL)],
@@ -69,11 +70,12 @@ public function testLoadClassMetadata()
                 [new Type(Type::BUILTIN_TYPE_ARRAY, true, null, true, null, new Type(Type::BUILTIN_TYPE_FLOAT))],
                 [new Type(Type::BUILTIN_TYPE_STRING)],
                 [new Type(Type::BUILTIN_TYPE_STRING)]
-            ))
+            )
         ;
+
         $propertyInfoStub
             ->method('isWritable')
-            ->will($this->onConsecutiveCalls(
+            ->willReturn(
                 true,
                 true,
                 true,
@@ -86,7 +88,7 @@ public function testLoadClassMetadata()
                 true,
                 false,
                 true
-            ))
+            )
         ;
 
         $propertyInfoLoader = new PropertyInfoLoader($propertyInfoStub, $propertyInfoStub, $propertyInfoStub, '{.*}');
@@ -221,9 +223,10 @@ public function testClassNoAutoMapping()
             ->method('getProperties')
             ->willReturn(['string', 'autoMappingExplicitlyEnabled'])
         ;
+
         $propertyInfoStub
             ->method('getTypes')
-            ->willReturnOnConsecutiveCalls(
+            ->willReturn(
                 [new Type(Type::BUILTIN_TYPE_STRING)],
                 [new Type(Type::BUILTIN_TYPE_BOOL)]
             );