Merge branch '7.0' into 7.1

* 7.0:
  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
  restore deprecated properties
  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
  handle edge cases when constructing constraints with named arguments
  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());
                 }
             }
@@ -483,4 +483,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()));
+    }
 }

Mapping/Loader/AbstractLoader.php

@@ -85,6 +85,18 @@ protected function newConstraint(string $name, mixed $options = null): Constrain
         }
 
         if ($this->namedArgumentsCache[$className] ??= (bool) (new \ReflectionMethod($className, '__construct'))->getAttributes(HasNamedArguments::class)) {
+            if (null === $options) {
+                return new $className();
+            }
+
+            if (!\is_array($options)) {
+                return new $className($options);
+            }
+
+            if (1 === \count($options) && isset($options['value'])) {
+                return new $className($options['value']);
+            }
+
             return new $className(...$options);
         }
 

Mapping/Loader/XmlFileLoader.php

@@ -80,7 +80,9 @@ protected function parseConstraints(\SimpleXMLElement $nodes): array
         foreach ($nodes as $node) {
             if (\count($node) > 0) {
                 if (\count($node->value) > 0) {
-                    $options = $this->parseValues($node->value);
+                    $options = [
+                        'value' => $this->parseValues($node->value),
+                    ];
                 } elseif (\count($node->constraint) > 0) {
                     $options = $this->parseConstraints($node->constraint);
                 } elseif (\count($node->option) > 0) {
@@ -94,6 +96,10 @@ protected function parseConstraints(\SimpleXMLElement $nodes): array
                 $options = null;
             }
 
+            if (isset($options['groups']) && !\is_array($options['groups'])) {
+                $options['groups'] = (array) $options['groups'];
+            }
+
             $constraints[] = $this->newConstraint((string) $node['name'], $options);
         }
 

Mapping/Loader/YamlFileLoader.php

@@ -86,6 +86,12 @@ protected function parseNodes(array $nodes): array
                     $options = $this->parseNodes($options);
                 }
 
+                if (null !== $options && (!\is_array($options) || array_is_list($options))) {
+                    $options = [
+                        'value' => $options,
+                    ];
+                }
+
                 $values[] = $this->newConstraint(key($childNodes), $options);
             } else {
                 if (\is_array($childNodes)) {

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;
@@ -346,6 +348,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/Fixtures/ConstraintWithNamedArguments.php

@@ -0,0 +1,33 @@
+<?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\Mapping\Loader\Fixtures;
+
+use Symfony\Component\Validator\Attribute\HasNamedArguments;
+use Symfony\Component\Validator\Constraint;
+
+class ConstraintWithNamedArguments extends Constraint
+{
+    public $choices;
+
+    #[HasNamedArguments]
+    public function __construct(array|string|null $choices = [], ?array $groups = null)
+    {
+        parent::__construct([], $groups);
+
+        $this->choices = $choices;
+    }
+
+    public function getTargets(): string
+    {
+        return self::CLASS_CONSTRAINT;
+    }
+}

Tests/Mapping/Loader/Fixtures/ConstraintWithoutValueWithNamedArguments.php

@@ -0,0 +1,29 @@
+<?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\Mapping\Loader\Fixtures;
+
+use Symfony\Component\Validator\Attribute\HasNamedArguments;
+use Symfony\Component\Validator\Constraint;
+
+class ConstraintWithoutValueWithNamedArguments extends Constraint
+{
+    #[HasNamedArguments]
+    public function __construct(?array $groups = null)
+    {
+        parent::__construct([], $groups);
+    }
+
+    public function getTargets(): string
+    {
+        return self::CLASS_CONSTRAINT;
+    }
+}

Tests/Mapping/Loader/PropertyInfoLoaderTest.php

@@ -114,7 +114,7 @@ public function getTypes(string $class, string $property, array $context = []):
         $propertyAccessExtractor = $this->createMock(PropertyAccessExtractorInterface::class);
         $propertyAccessExtractor
             ->method('isWritable')
-            ->will($this->onConsecutiveCalls(
+            ->willReturn(
                 true,
                 true,
                 true,
@@ -127,7 +127,7 @@ public function getTypes(string $class, string $property, array $context = []):
                 true,
                 false,
                 true
-            ))
+            )
         ;
 
         $propertyInfoLoader = new PropertyInfoLoader($propertyListExtractor, $propertyTypeExtractor, $propertyAccessExtractor, '{.*}');