[DependencyInjection] Add container.excluded tag on classes autodiscovered but excluded

Author: Tiriel

Loader/FileLoader.php

@@ -126,6 +126,7 @@ public function registerClasses(Definition $prototype, string $namespace, string
             if (null === $errorMessage && $autoconfigureAttributes) {
                 $r = $this->container->getReflectionClass($class);
                 if ($r->getAttributes(Exclude::class)[0] ?? null) {
+                    $this->addContainerExcludedTag($class, $source);
                     continue;
                 }
                 if ($this->env) {
@@ -137,6 +138,7 @@ public function registerClasses(Definition $prototype, string $namespace, string
                         }
                     }
                     if (null !== $attribute) {
+                        $this->addContainerExcludedTag($class, $source);
                         continue;
                     }
                 }
@@ -291,18 +293,29 @@ private function findClasses(string $namespace, string $pattern, array $excludeP
         }
 
         if (null !== $prefixLen) {
-            $attributes = null !== $source ? ['source' => sprintf('in "%s/%s"', basename(\dirname($source)), basename($source))] : [];
-
             foreach ($excludePaths as $path => $_) {
                 $class = $namespace.ltrim(str_replace('/', '\\', substr($path, $prefixLen, str_ends_with($path, '.php') ? -4 : null)), '\\');
-                if (!$this->container->has($class)) {
-                    $this->container->register($class)
-                        ->setAbstract(true)
-                        ->addTag('container.excluded', $attributes);
-                }
+                $this->addContainerExcludedTag($class, $source);
             }
         }
 
         return $classes;
     }
+
+    private function addContainerExcludedTag(string $class, ?string $source): void
+    {
+        if ($this->container->has($class)) {
+            return;
+        }
+
+        static $attributes = [];
+
+        if (null !== $source && !isset($attributes[$source])) {
+            $attributes[$source] = ['source' => sprintf('in "%s/%s"', basename(\dirname($source)), basename($source))];
+        }
+
+        $this->container->register($class)
+            ->setAbstract(true)
+            ->addTag('container.excluded', null !== $source ? $attributes[$source] : []);
+    }
 }

Tests/Loader/FileLoaderTest.php

@@ -161,7 +161,7 @@ public function testRegisterClassesWithExcludeAttribute(bool $autoconfigure)
             'Utils/*',
         );
 
-        $this->assertSame(!$autoconfigure, $container->hasDefinition(NotAService::class));
+        $this->assertSame($autoconfigure, $container->getDefinition(NotAService::class)->hasTag('container.excluded'));
     }
 
     public function testRegisterClassesWithExcludeAsArray()
@@ -284,10 +284,10 @@ public static function excludeTrailingSlashConsistencyProvider(): iterable
     }
 
     /**
-     * @testWith ["prod", true]
-     *           ["dev", true]
-     *           ["bar", false]
-     *           [null, true]
+     * @testWith ["prod", false]
+     *           ["dev", false]
+     *           ["bar", true]
+     *           [null, false]
      */
     public function testRegisterClassesWithWhenEnv(?string $env, bool $expected)
     {
@@ -299,7 +299,7 @@ public function testRegisterClassesWithWhenEnv(?string $env, bool $expected)
             'Prototype/{Foo.php}'
         );
 
-        $this->assertSame($expected, $container->has(Foo::class));
+        $this->assertSame($expected, $container->getDefinition(Foo::class)->hasTag('container.excluded'));
     }
 
     /**