[DI] scope singly-implemented interfaces detection by file

Author: daniel-iwaniec

Loader/Configurator/ContainerConfigurator.php

@@ -73,6 +73,8 @@ 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,6 +105,7 @@ 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);
     }

Loader/FileLoader.php

@@ -29,6 +29,9 @@ abstract class FileLoader extends BaseFileLoader
     protected $container;
     protected $isLoadingInstanceof = false;
     protected $instanceof = [];
+    protected $interfaces = [];
+    protected $singlyImplemented = [];
+    protected $singlyImplementedAliases = [];
 
     public function __construct(ContainerBuilder $container, FileLocatorInterface $locator)
     {
@@ -57,12 +60,10 @@ public function registerClasses(Definition $prototype, $namespace, $resource, $e
         $classes = $this->findClasses($namespace, $resource, (array) $exclude);
         // prepare for deep cloning
         $serializedPrototype = serialize($prototype);
-        $interfaces = [];
-        $singlyImplemented = [];
 
         foreach ($classes as $class => $errorMessage) {
             if (interface_exists($class, false)) {
-                $interfaces[] = $class;
+                $this->interfaces[] = $class;
             } else {
                 $this->setDefinition($class, $definition = unserialize($serializedPrototype));
                 if (null !== $errorMessage) {
@@ -71,14 +72,17 @@ public function registerClasses(Definition $prototype, $namespace, $resource, $e
                     continue;
                 }
                 foreach (class_implements($class, false) as $interface) {
-                    $singlyImplemented[$interface] = isset($singlyImplemented[$interface]) ? false : $class;
+                    $this->singlyImplemented[$interface] = isset($this->singlyImplemented[$interface]) ? false : $class;
                 }
             }
         }
-        foreach ($interfaces as $interface) {
-            if (!empty($singlyImplemented[$interface])) {
-                $this->container->setAlias($interface, $singlyImplemented[$interface])
-                    ->setPublic(false);
+
+        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);
             }
         }
     }

Loader/PhpFileLoader.php

@@ -63,6 +63,18 @@ 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,6 +66,9 @@ public function load($resource, $type = null)
             $this->parseDefinitions($xml, $path, $defaults);
         } finally {
             $this->instanceof = [];
+            $this->interfaces = [];
+            $this->singlyImplemented = [];
+            $this->singlyImplementedAliases = [];
         }
     }
 
@@ -194,6 +197,7 @@ 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,6 +150,9 @@ public function load($resource, $type = null)
             $this->parseDefinitions($content, $path);
         } finally {
             $this->instanceof = [];
+            $this->interfaces = [];
+            $this->singlyImplemented = [];
+            $this->singlyImplementedAliases = [];
         }
     }
 
@@ -318,6 +321,7 @@ 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']);
             }
@@ -341,6 +345,7 @@ 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/Fixtures/Prototype/SinglyImplementedInterface/Adapter/Adapter.php

@@ -0,0 +1,9 @@
+<?php
+
+namespace Symfony\Component\DependencyInjection\Tests\Fixtures\Prototype\SinglyImplementedInterface\Adapter;
+
+use Symfony\Component\DependencyInjection\Tests\Fixtures\Prototype\SinglyImplementedInterface\Port\PortInterface;
+
+class Adapter implements PortInterface
+{
+}

Tests/Fixtures/Prototype/SinglyImplementedInterface/AnotherAdapter/Adapter.php

@@ -0,0 +1,9 @@
+<?php
+
+namespace Symfony\Component\DependencyInjection\Tests\Fixtures\Prototype\SinglyImplementedInterface\AnotherAdapter;
+
+use Symfony\Component\DependencyInjection\Tests\Fixtures\Prototype\SinglyImplementedInterface\Port\PortInterface;
+
+class Adapter implements PortInterface
+{
+}

Tests/Fixtures/Prototype/SinglyImplementedInterface/Port/PortInterface.php

@@ -0,0 +1,7 @@
+<?php
+
+namespace Symfony\Component\DependencyInjection\Tests\Fixtures\Prototype\SinglyImplementedInterface\Port;
+
+interface PortInterface
+{
+}

Tests/Fixtures/config/prototype.php

@@ -9,7 +9,7 @@
         ->tag('baz');
     $di->load(Prototype::class.'\\', '../Prototype')
         ->autoconfigure()
-        ->exclude('../Prototype/{OtherDir,BadClasses}')
+        ->exclude('../Prototype/{OtherDir,BadClasses,SinglyImplementedInterface}')
         ->factory('f')
         ->deprecate('%service_id%')
         ->args([0])