[DI] add FileLoader::registerAliasesForSinglyImplementedInterfaces()

Author: nicolas-grekas

CHANGELOG.md

@@ -8,6 +8,7 @@ CHANGELOG
  * deprecated support for short factories and short configurators in Yaml
  * deprecated `tagged` in favor of `tagged_iterator`
  * deprecated passing an instance of `Symfony\Component\DependencyInjection\Parameter` as class name to `Symfony\Component\DependencyInjection\Definition`
+ * made singly-implemented interfaces detection be scoped by file
 
 4.3.0
 -----

Loader/Configurator/ContainerConfigurator.php

@@ -73,8 +73,6 @@ final public function parameters(): ParametersConfigurator
 
     final public function services(): ServicesConfigurator
     {
-        $this->loader->resetBeforeConfiguringServices();
-
         return new ServicesConfigurator($this->container, $this->loader, $this->instanceof, $this->path, $this->anonymousCount);
     }
 }

Loader/Configurator/ServicesConfigurator.php

@@ -105,7 +105,6 @@ final public function alias(string $id, string $referencedId): AliasConfigurator
         $ref = static::processValue($referencedId, true);
         $alias = new Alias((string) $ref, $this->defaults->isPublic());
         $this->container->setAlias($id, $alias);
-        $this->loader->removeSinglyImplementedAlias((string) $ref);
 
         return new AliasConfigurator($this, $alias);
     }
@@ -140,4 +139,9 @@ final public function __invoke(string $id, string $class = null): ServiceConfigu
     {
         return $this->set($id, $class);
     }
+
+    public function __destruct()
+    {
+        $this->loader->registerAliasesForSinglyImplementedInterfaces();
+    }
 }

Loader/FileLoader.php

@@ -31,7 +31,6 @@ abstract class FileLoader extends BaseFileLoader
     protected $instanceof = [];
     protected $interfaces = [];
     protected $singlyImplemented = [];
-    protected $singlyImplementedAliases = [];
 
     public function __construct(ContainerBuilder $container, FileLocatorInterface $locator)
     {
@@ -76,15 +75,17 @@ public function registerClasses(Definition $prototype, $namespace, $resource, $e
                 }
             }
         }
+    }
 
+    public function registerAliasesForSinglyImplementedInterfaces()
+    {
         foreach ($this->interfaces as $interface) {
             if (!empty($this->singlyImplemented[$interface]) && !$this->container->hasAlias($interface)) {
                 $this->container->setAlias($interface, $this->singlyImplemented[$interface])->setPublic(false);
-                $this->singlyImplementedAliases[$interface] = true;
-            } elseif ($this->singlyImplementedAliases[$interface] ?? false) {
-                $this->container->removeAlias($interface);
             }
         }
+
+        $this->interfaces = $this->singlyImplemented = [];
     }
 
     /**

Loader/PhpFileLoader.php

@@ -41,10 +41,15 @@ public function load($resource, $type = null)
             return include $path;
         }, $this, ProtectedPhpFileLoader::class);
 
-        $callback = $load($path);
+        try {
+            $callback = $load($path);
 
-        if (\is_object($callback) && \is_callable($callback)) {
-            $callback(new ContainerConfigurator($this->container, $this, $this->instanceof, $path, $resource), $this->container, $this);
+            if (\is_object($callback) && \is_callable($callback)) {
+                $callback(new ContainerConfigurator($this->container, $this, $this->instanceof, $path, $resource), $this->container, $this);
+            }
+        } finally {
+            $this->instanceof = [];
+            $this->registerAliasesForSinglyImplementedInterfaces();
         }
     }
 
@@ -63,18 +68,6 @@ public function supports($resource, $type = null)
 
         return 'php' === $type;
     }
-
-    public function resetBeforeConfiguringServices(): void
-    {
-        $this->interfaces = [];
-        $this->singlyImplemented = [];
-        $this->singlyImplementedAliases = [];
-    }
-
-    public function removeSinglyImplementedAlias(string $alias): void
-    {
-        unset($this->singlyImplementedAliases[$alias]);
-    }
 }
 
 /**

Loader/XmlFileLoader.php

@@ -66,9 +66,7 @@ public function load($resource, $type = null)
             $this->parseDefinitions($xml, $path, $defaults);
         } finally {
             $this->instanceof = [];
-            $this->interfaces = [];
-            $this->singlyImplemented = [];
-            $this->singlyImplementedAliases = [];
+            $this->registerAliasesForSinglyImplementedInterfaces();
         }
     }
 
@@ -197,7 +195,6 @@ private function parseDefinition(\DOMElement $service, string $file, array $defa
             $this->validateAlias($service, $file);
 
             $this->container->setAlias((string) $service->getAttribute('id'), $alias = new Alias($alias));
-            unset($this->singlyImplementedAliases[(string) $service->getAttribute('id')]);
             if ($publicAttr = $service->getAttribute('public')) {
                 $alias->setPublic(XmlUtils::phpize($publicAttr));
             } elseif (isset($defaults['public'])) {

Loader/YamlFileLoader.php

@@ -150,9 +150,7 @@ public function load($resource, $type = null)
             $this->parseDefinitions($content, $path);
         } finally {
             $this->instanceof = [];
-            $this->interfaces = [];
-            $this->singlyImplemented = [];
-            $this->singlyImplementedAliases = [];
+            $this->registerAliasesForSinglyImplementedInterfaces();
         }
     }
 
@@ -321,7 +319,6 @@ private function parseDefinition(string $id, $service, string $file, array $defa
 
         if (\is_string($service) && 0 === strpos($service, '@')) {
             $this->container->setAlias($id, $alias = new Alias(substr($service, 1)));
-            unset($this->singlyImplementedAliases[$id]);
             if (isset($defaults['public'])) {
                 $alias->setPublic($defaults['public']);
             }
@@ -345,7 +342,6 @@ private function parseDefinition(string $id, $service, string $file, array $defa
 
         if (isset($service['alias'])) {
             $this->container->setAlias($id, $alias = new Alias($service['alias']));
-            unset($this->singlyImplementedAliases[$id]);
             if (\array_key_exists('public', $service)) {
                 $alias->setPublic($service['public']);
             } elseif (isset($defaults['public'])) {

Tests/Loader/FileLoaderTest.php

@@ -260,4 +260,10 @@ public function supports($resource, $type = null): bool
     {
         return false;
     }
+
+    public function registerClasses(Definition $prototype, $namespace, $resource, $exclude = null)
+    {
+        parent::registerClasses($prototype, $namespace, $resource, $exclude);
+        $this->registerAliasesForSinglyImplementedInterfaces();
+    }
 }