[DependencyInjection] Add #[AutowireMethodOf] attribute to autowire a method of a service as a callable

Author: nicolas-grekas

Attribute/AutowireMethodOf.php

@@ -0,0 +1,38 @@
+<?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\Component\DependencyInjection\Attribute;
+
+use Symfony\Component\DependencyInjection\Definition;
+use Symfony\Component\DependencyInjection\Reference;
+
+/**
+ * Tells which method should be turned into a Closure based on the name of the parameter it's attached to.
+ */
+#[\Attribute(\Attribute::TARGET_PARAMETER)]
+class AutowireMethodOf extends AutowireCallable
+{
+    /**
+     * @param string            $service The service containing the method to autowire
+     * @param bool|class-string $lazy    Whether to use lazy-loading for this argument
+     */
+    public function __construct(string $service, bool|string $lazy = false)
+    {
+        parent::__construct([new Reference($service)], lazy: $lazy);
+    }
+
+    public function buildDefinition(mixed $value, ?string $type, \ReflectionParameter $parameter): Definition
+    {
+        $value[1] = $parameter->name;
+
+        return parent::buildDefinition($value, $type, $parameter);
+    }
+}

CHANGELOG.md

@@ -8,6 +8,7 @@ CHANGELOG
  * Add argument `$prepend` to `ContainerConfigurator::extension()` to prepend the configuration instead of appending it
  * Have `ServiceLocator` implement `ServiceCollectionInterface`
  * Add `#[Lazy]` attribute as shortcut for `#[Autowire(lazy: [bool|string])]` and `#[Autoconfigure(lazy: [bool|string])]`
+ * Add `#[AutowireMethodOf]` attribute to autowire a method of a service as a callable
 
 7.0
 ---

Compiler/CheckExceptionOnInvalidReferenceBehaviorPass.php

@@ -47,7 +47,7 @@ protected function processValue(mixed $value, bool $isRoot = false): mixed
         if (!$value instanceof Reference) {
             return parent::processValue($value, $isRoot);
         }
-        if (ContainerInterface::EXCEPTION_ON_INVALID_REFERENCE < $value->getInvalidBehavior() || $this->container->has($id = (string) $value)) {
+        if (ContainerInterface::EXCEPTION_ON_INVALID_REFERENCE < $value->getInvalidBehavior() || $this->container->has((string) $value)) {
             return $value;
         }
 
@@ -83,7 +83,7 @@ protected function processValue(mixed $value, bool $isRoot = false): mixed
         $this->throwServiceNotFoundException($value, $currentId, $value);
     }
 
-    private function throwServiceNotFoundException(Reference $ref, string $sourceId, $value): void
+    private function throwServiceNotFoundException(Reference $ref, string $sourceId, mixed $value): void
     {
         $id = (string) $ref;
         $alternatives = [];

Tests/Attribute/AutowireMethodOfTest.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\Component\DependencyInjection\Tests\Attribute;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\DependencyInjection\Attribute\AutowireMethodOf;
+use Symfony\Component\DependencyInjection\Reference;
+
+class AutowireMethodOfTest extends TestCase
+{
+    public function testConstructor()
+    {
+        $a = new AutowireMethodOf('foo');
+
+        $this->assertEquals([new Reference('foo')], $a->value);
+    }
+
+    public function testBuildDefinition(?\Closure $dummy = null)
+    {
+        $a = new AutowireMethodOf('foo');
+        $r = new \ReflectionParameter([__CLASS__, __FUNCTION__], 0);
+
+        $this->assertEquals([[new Reference('foo'), 'dummy']], $a->buildDefinition($a->value, 'Closure', $r)->getArguments());
+    }
+}