Merge branch '7.3' into 7.4

* 7.3:
  fall back to legacy options handling if configured named arguments do not match
  [DependencyInjection] Fix optimizing ClassExistenceResource

Author: nicolas-grekas

src/Symfony/Component/DependencyInjection/ContainerBuilder.php

@@ -273,46 +273,58 @@ public function addResource(ResourceInterface $resource): static
         if ($resource instanceof DirectoryResource && $this->inVendors($resource->getResource())) {
             return $this;
         }
-        if ($resource instanceof ClassExistenceResource) {
-            $class = $resource->getResource();
+        if (!$resource instanceof ClassExistenceResource) {
+            $this->resources[(string) $resource] = $resource;
 
-            $inVendor = false;
-            foreach (spl_autoload_functions() as $autoloader) {
-                if (!\is_array($autoloader)) {
-                    continue;
-                }
+            return $this;
+        }
 
-                if ($autoloader[0] instanceof DebugClassLoader) {
-                    $autoloader = $autoloader[0]->getClassLoader();
-                }
+        $class = $resource->getResource();
+
+        if (!(new ClassExistenceResource($class, false))->isFresh(1)) {
+            if (!$this->inVendors((new \ReflectionClass($class))->getFileName())) {
+                $this->resources[$class] = $resource;
+            }
+
+            return $this;
+        }
+
+        $inVendor = true;
+        foreach (spl_autoload_functions() as $autoloader) {
+            if (!\is_array($autoloader)) {
+                $inVendor = false;
+                break;
+            }
+
+            if ($autoloader[0] instanceof DebugClassLoader) {
+                $autoloader = $autoloader[0]->getClassLoader();
+            }
 
-                if (!\is_array($autoloader) || !$autoloader[0] instanceof ClassLoader || !$autoloader[0]->findFile(__CLASS__)) {
+            if (!\is_array($autoloader) || !$autoloader[0] instanceof ClassLoader) {
+                $inVendor = false;
+                break;
+            }
+
+            foreach ($autoloader[0]->getPrefixesPsr4() as $prefix => $dirs) {
+                if (!str_starts_with($class, $prefix)) {
                     continue;
                 }
 
-                foreach ($autoloader[0]->getPrefixesPsr4() as $prefix => $dirs) {
-                    if ('' === $prefix || !str_starts_with($class, $prefix)) {
+                foreach ($dirs as $dir) {
+                    if (!$dir = realpath($dir)) {
                         continue;
                     }
 
-                    foreach ($dirs as $dir) {
-                        if (!$dir = realpath($dir)) {
-                            continue;
-                        }
-
-                        if (!$inVendor = $this->inVendors($dir)) {
-                            break 3;
-                        }
+                    if (!$inVendor = $this->inVendors($dir)) {
+                        break 3;
                     }
                 }
             }
-
-            if ($inVendor) {
-                return $this;
-            }
         }
 
-        $this->resources[(string) $resource] = $resource;
+        if (!$inVendor) {
+            $this->resources[$class] = $resource;
+        }
 
         return $this;
     }

src/Symfony/Component/DependencyInjection/Tests/ContainerBuilderTest.php

@@ -1225,7 +1225,10 @@ public function testGetReflectionClass()
         $r2 = $container->getReflectionClass('BarClass');
         $r3 = $container->getReflectionClass('BarClass');
 
-        $this->assertNull($container->getReflectionClass('BarMissingClass'));
+        $this->assertNull($container->getReflectionClass(BarMissingClass::class));
+
+        // No resource should be added for this class because no autoloader would be able to load it
+        $this->assertNull($container->getReflectionClass(\BarMissingClass::class));
 
         $this->assertEquals($r1, $r2);
         $this->assertSame($r2, $r3);
@@ -1235,7 +1238,7 @@ public function testGetReflectionClass()
         $this->assertCount(2, $resources);
 
         $this->assertSame('reflection.BarClass', (string) $resources[0]);
-        $this->assertSame('BarMissingClass', (string) end($resources));
+        $this->assertSame(BarMissingClass::class, (string) end($resources));
     }
 
     public function testGetReflectionClassOnInternalTypes()

src/Symfony/Component/Validator/Mapping/Loader/AbstractLoader.php

@@ -101,7 +101,15 @@ protected function newConstraint(string $name, mixed $options = null): Constrain
                 return new $className($options);
             }
 
-            return new $className(...$options);
+            try {
+                return new $className(...$options);
+            } catch (\Error $e) {
+                if (str_starts_with($e->getMessage(), 'Unknown named parameter ')) {
+                    return new $className($options);
+                }
+
+                throw $e;
+            }
         }
 
         if ($options) {

src/Symfony/Component/Validator/Tests/Mapping/Loader/XmlFileLoaderTest.php

@@ -19,6 +19,7 @@
 use Symfony\Component\Validator\Constraints\Choice;
 use Symfony\Component\Validator\Constraints\Collection;
 use Symfony\Component\Validator\Constraints\IsTrue;
+use Symfony\Component\Validator\Constraints\Length;
 use Symfony\Component\Validator\Constraints\NotNull;
 use Symfony\Component\Validator\Constraints\Range;
 use Symfony\Component\Validator\Constraints\Regex;
@@ -201,4 +202,23 @@ public function testLoadConstraintWithoutNamedArgumentsSupport()
 
         $loader->loadClassMetadata($metadata);
     }
+
+    /**
+     * @group legacy
+     */
+    public function testLengthConstraintValueOptionTriggersDeprecation()
+    {
+        $loader = new XmlFileLoader(__DIR__.'/constraint-mapping-exactly-value.xml');
+        $metadata = new ClassMetadata(Entity_81::class);
+
+        $this->expectUserDeprecationMessage(\sprintf('Since symfony/validator 7.3: Passing an array of options to configure the "%s" constraint is deprecated, use named arguments instead.', Length::class));
+
+        $loader->loadClassMetadata($metadata);
+        $constraints = $metadata->getPropertyMetadata('title')[0]->constraints;
+
+        self::assertCount(1, $constraints);
+        self::assertInstanceOf(Length::class, $constraints[0]);
+        self::assertSame(6, $constraints[0]->min);
+        self::assertSame(6, $constraints[0]->max);
+    }
 }

src/Symfony/Component/Validator/Tests/Mapping/Loader/constraint-mapping-exactly-value.xml

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<constraint-mapping xmlns="http://symfony.com/schema/dic/constraint-mapping"
+                    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+                    xsi:schemaLocation="http://symfony.com/schema/dic/constraint-mapping
+                        https://symfony.com/schema/dic/constraint-mapping/constraint-mapping-1.0.xsd">
+
+    <class name="Symfony\Component\Validator\Tests\Fixtures\Entity_81">
+        <property name="title">
+            <constraint name="Length">
+                <option name="value">6</option>
+                <option name="groups">
+                    <value>Foo</value>
+                </option>
+            </constraint>
+        </property>
+    </class>
+</constraint-mapping>