Merge branch '7.3' into 7.4

* 7.3:
  [DependencyInjection] Fix dealing with errored service definitions

Author: nicolas-grekas

Compiler/CheckDefinitionValidityPass.php

@@ -38,6 +38,10 @@ class CheckDefinitionValidityPass implements CompilerPassInterface
     public function process(ContainerBuilder $container): void
     {
         foreach ($container->getDefinitions() as $id => $definition) {
+            if ($definition->hasErrors()) {
+                continue;
+            }
+
             // synthetic service is public
             if ($definition->isSynthetic() && !$definition->isPublic()) {
                 throw new RuntimeException(\sprintf('A synthetic service ("%s") must be public.', $id));

Compiler/ResolveClassPass.php

@@ -24,6 +24,7 @@ public function process(ContainerBuilder $container): void
     {
         foreach ($container->getDefinitions() as $id => $definition) {
             if ($definition->isSynthetic()
+                || $definition->hasErrors()
                 || null !== $definition->getClass()
                 || !preg_match('/^[a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*+(?:\\\\[a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*+)++$/', $id)
             ) {

Loader/FileLoader.php

@@ -192,12 +192,12 @@ public function registerClasses(Definition $prototype, string $namespace, string
 
             $abstract = $r?->isAbstract() || $r?->isInterface() ? '.abstract.' : '';
             $this->setDefinition($abstract.$class, $definition = $getPrototype());
+            $definition->setClass($class);
             if (null !== $errorMessage) {
                 $definition->addError($errorMessage);
 
                 continue;
             }
-            $definition->setClass($class);
 
             if ($abstract) {
                 if ($r->isInterface()) {

Tests/Compiler/CheckDefinitionValidityPassTest.php

@@ -156,6 +156,18 @@ public function testDynamicPrivateName()
         $this->addToAssertionCount(1);
     }
 
+    public function testProcessSkipsDefinitionsWithErrors()
+    {
+        $container = new ContainerBuilder();
+        $definition = $container->register('a')->setSynthetic(true)->setPublic(false);
+        $definition->addError('Some error message');
+
+        // This should not throw an exception because the definition has errors
+        $this->process($container);
+
+        $this->addToAssertionCount(1);
+    }
+
     protected function process(ContainerBuilder $container)
     {
         $pass = new CheckDefinitionValidityPass();

Tests/Compiler/ResolveClassPassTest.php

@@ -95,6 +95,18 @@ public function testAmbiguousChildDefinition()
         (new ResolveClassPass())->process($container);
     }
 
+    public function testSkipsDefinitionsWithErrors()
+    {
+        $container = new ContainerBuilder();
+        $def = $container->register('App\SomeClass');
+        $def->addError('Some error message');
+
+        (new ResolveClassPass())->process($container);
+
+        // The class should not be set because the definition has errors
+        $this->assertNull($def->getClass());
+    }
+
     #[IgnoreDeprecations]
     #[Group('legacy')]
     public function testInvalidClassNameDefinition()

Tests/Loader/FileLoaderTest.php

@@ -226,6 +226,25 @@ public function testMissingParentClass()
         );
     }
 
+    public function testClassIsSetEvenWhenDefinitionHasErrors()
+    {
+        $container = new ContainerBuilder();
+        $container->setParameter('bad_classes_dir', 'BadClasses');
+        $loader = new TestFileLoader($container, new FileLocator(self::$fixturesPath.'/Fixtures'), 'test');
+
+        $loader->registerClasses(
+            (new Definition())->setAutoconfigured(true),
+            'Symfony\Component\DependencyInjection\Tests\Fixtures\Prototype\BadClasses\\',
+            'Prototype/%bad_classes_dir%/*'
+        );
+
+        $definition = $container->getDefinition(MissingParent::class);
+
+        // The class should be set even when the definition has errors
+        $this->assertSame(MissingParent::class, $definition->getClass());
+        $this->assertNotEmpty($definition->getErrors());
+    }
+
     public function testRegisterClassesWithBadPrefix()
     {
         $this->expectException(InvalidArgumentException::class);