[DI] Add "#[Autoconfigure]" to tell how a discovered type should be autoconfigured

nicolas-grekas · nicolas-grekas · commit bd4ece585f14 · 2021-01-12T20:23:37.000+01:00
diff --git a/src/Symfony/Component/DependencyInjection/Loader/FileLoader.php b/src/Symfony/Component/DependencyInjection/Loader/FileLoader.php
@@ -21,6 +21,7 @@
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Definition;
 use Symfony\Component\DependencyInjection\Exception\InvalidArgumentException;
+use Symfony\Contracts\Service\Attribute\Autoconfigure;
 
 /**
  * FileLoader is the abstract class used by all built-in loaders that are file based.
@@ -96,7 +97,7 @@ public function registerClasses(Definition $prototype, string $namespace, string
             throw new InvalidArgumentException(sprintf('Namespace is not a valid PSR-4 prefix: "%s".', $namespace));
         }
 
-        $classes = $this->findClasses($namespace, $resource, (array) $exclude);
+        $classes = $this->findClasses($namespace, $resource, (array) $exclude, $prototype->isAutoconfigured());
         // prepare for deep cloning
         $serializedPrototype = serialize($prototype);
 
@@ -149,7 +150,7 @@ protected function setDefinition(string $id, Definition $definition)
         }
     }
 
-    private function findClasses(string $namespace, string $pattern, array $excludePatterns): array
+    private function findClasses(string $namespace, string $pattern, array $excludePatterns, bool $autoconfigure): array
     {
         $parameterBag = $this->container->getParameterBag();
 
@@ -167,6 +168,13 @@ private function findClasses(string $namespace, string $pattern, array $excludeP
             }
         }
 
+        if (80000 <= \PHP_VERSION_ID && $autoconfigure) {
+            $parseDefinition = new \ReflectionMethod(YamlFileLoader::class, 'parseDefinition');
+            $parseDefinition->setAccessible(true);
+            $yamlLoader = $parseDefinition->getDeclaringClass()->newInstanceWithoutConstructor();
+            $yamlLoader->isLoadingInstanceof = true;
+        }
+
         $pattern = $parameterBag->unescapeValue($parameterBag->resolveValue($pattern));
         $classes = [];
         $extRegexp = '/\\.php$/';
@@ -207,6 +215,17 @@ private function findClasses(string $namespace, string $pattern, array $excludeP
             if ($r->isInstantiable() || $r->isInterface()) {
                 $classes[$class] = null;
             }
+
+            if (80000 > \PHP_VERSION_ID || !$autoconfigure) {
+                continue;
+            }
+
+            foreach ($r->getAttributes(Autoconfigure::class, \ReflectionAttribute::IS_INSTANCEOF) as $attribute) {
+                if (!class_exists(Autoconfigure::class)) {
+                    throw new \LogicException(sprintf('You cannot use the "%s" attribute unless Symfony Contracts 2.4+ are installed. Try running "composer require symfony/service-contracts:^2.4".', Autoconfigure::class));
+                }
+                $parseDefinition->invoke($yamlLoader, $class, [$this->container->registerForAutoconfiguration($class)] + (array) $attribute->getInstance(), $r->getFileName(), [], true);
+            }
         }
 
         // track only for new & removed files
diff --git a/src/Symfony/Component/DependencyInjection/Loader/YamlFileLoader.php b/src/Symfony/Component/DependencyInjection/Loader/YamlFileLoader.php
@@ -389,6 +389,8 @@ private function parseDefinition(string $id, $service, string $file, array $defa
             ];
         }
 
+        $definition = isset($service[0]) && $service[0] instanceof Definition ? array_shift($service) : null;
+
         $this->checkDefinition($id, $service, $file);
 
         if (isset($service['alias'])) {
@@ -423,7 +425,9 @@ private function parseDefinition(string $id, $service, string $file, array $defa
             return $return ? $alias : $this->container->setAlias($id, $alias);
         }
 
-        if ($this->isLoadingInstanceof) {
+        if (null !== $definition) {
+            // no-op
+        } elseif ($this->isLoadingInstanceof) {
             $definition = new ChildDefinition('');
         } elseif (isset($service['parent'])) {
             if ('' !== $service['parent'] && '@' === $service['parent'][0]) {
@@ -627,7 +631,8 @@ private function parseDefinition(string $id, $service, string $file, array $defa
 
         if (isset($defaults['bind']) || isset($service['bind'])) {
             // deep clone, to avoid multiple process of the same instance in the passes
-            $bindings = isset($defaults['bind']) ? unserialize(serialize($defaults['bind'])) : [];
+            $bindings = $definition->getBindings();
+            $bindings += isset($defaults['bind']) ? unserialize(serialize($defaults['bind'])) : [];
 
             if (isset($service['bind'])) {
                 if (!\is_array($service['bind'])) {
diff --git a/src/Symfony/Contracts/Service/Attribute/Autoconfigure.php b/src/Symfony/Contracts/Service/Attribute/Autoconfigure.php
@@ -0,0 +1,34 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Contracts\Service\Attribute;
+
+/**
+ * A tag to tell how a base type should be autoconfigured.
+ *
+ * @author Nicolas Grekas <p@tchwork.com>
+ */
+#[\Attribute(\Attribute::TARGET_CLASS | \Attribute::IS_REPEATABLE)]
+class Autoconfigure
+{
+    public function __construct(
+        public ?array $tags = null,
+        public ?array $calls = null,
+        public ?array $bind = null,
+        public bool|string|null $lazy = null,
+        public ?bool $public = null,
+        public ?bool $shared = null,
+        public ?bool $autowire = null,
+        public ?array $properties = null,
+        public array|string|null $configurator = null,
+    ) {
+    }
+}
