[DependencyInjection][EventDispatcher] Avoid instantiating not called listeners when tracing

Author: Jean-Beru

Dumper/PhpDumper.php

@@ -1739,7 +1739,18 @@ private function dumpValue(mixed $value, bool $interpolate = true): string
 
                     $code = sprintf('return %s;', $code);
 
-                    return sprintf("function ()%s {\n            %s\n        }", $returnedType, $code);
+                    $attribute = '';
+                    if ($value) {
+                        $attribute = 'name: '.$this->dumpValue((string) $value, $interpolate);
+
+                        if ($this->container->hasDefinition($value) && ($class = $this->container->findDefinition($value)->getClass()) && $class !== (string) $value) {
+                            $attribute .= ', class: '.$this->dumpValue($class, $interpolate);
+                        }
+
+                        $attribute = sprintf('#[\Closure(%s)] ', $attribute);
+                    }
+
+                    return sprintf("%sfunction ()%s {\n            %s\n        }", $attribute, $returnedType, $code);
                 }
 
                 if ($value instanceof IteratorArgument) {

Tests/Fixtures/php/services10_as_files.txt

@@ -29,7 +29,7 @@ class getClosureService extends ProjectServiceContainer
     {
         $container->services['closure'] = $instance = new \stdClass();
 
-        $instance->closures = [0 => function () use ($container): ?\stdClass {
+        $instance->closures = [0 => #[\Closure(name: 'foo', class: 'FooClass')] function () use ($container): ?\stdClass {
             return ($container->services['foo'] ?? null);
         }];
 

Tests/Fixtures/php/services_closure_argument_compiled.php

@@ -55,7 +55,7 @@ protected function getFooService()
      */
     protected function getServiceClosureService()
     {
-        return $this->services['service_closure'] = new \Bar(function () {
+        return $this->services['service_closure'] = new \Bar(#[\Closure(name: 'foo', class: 'Foo')] function () {
             return ($this->services['foo'] ?? ($this->services['foo'] = new \Foo()));
         });
     }

Tests/Fixtures/php/services_locator.php

@@ -70,9 +70,9 @@ protected function getBarServiceService()
      */
     protected function getFooServiceService()
     {
-        return $this->services['foo_service'] = new \Symfony\Component\DependencyInjection\ServiceLocator(['bar' => function () {
+        return $this->services['foo_service'] = new \Symfony\Component\DependencyInjection\ServiceLocator(['bar' => #[\Closure(name: 'bar_service', class: 'stdClass')] function () {
             return ($this->services['bar_service'] ?? $this->getBarServiceService());
-        }, 'baz' => function (): \stdClass {
+        }, 'baz' => #[\Closure(name: 'baz_service', class: 'stdClass')] function (): \stdClass {
             return ($this->privates['baz_service'] ?? ($this->privates['baz_service'] = new \stdClass()));
         }, 'nil' => function () {
             return NULL;
@@ -116,7 +116,7 @@ protected function getTranslator_Loader3Service()
      */
     protected function getTranslator1Service()
     {
-        return $this->services['translator_1'] = new \Symfony\Component\DependencyInjection\Tests\Fixtures\StubbedTranslator(new \Symfony\Component\DependencyInjection\ServiceLocator(['translator.loader_1' => function () {
+        return $this->services['translator_1'] = new \Symfony\Component\DependencyInjection\Tests\Fixtures\StubbedTranslator(new \Symfony\Component\DependencyInjection\ServiceLocator(['translator.loader_1' => #[\Closure(name: 'translator.loader_1', class: 'stdClass')] function () {
             return ($this->services['translator.loader_1'] ?? ($this->services['translator.loader_1'] = new \stdClass()));
         }]));
     }
@@ -128,7 +128,7 @@ protected function getTranslator1Service()
      */
     protected function getTranslator2Service()
     {
-        $this->services['translator_2'] = $instance = new \Symfony\Component\DependencyInjection\Tests\Fixtures\StubbedTranslator(new \Symfony\Component\DependencyInjection\ServiceLocator(['translator.loader_2' => function () {
+        $this->services['translator_2'] = $instance = new \Symfony\Component\DependencyInjection\Tests\Fixtures\StubbedTranslator(new \Symfony\Component\DependencyInjection\ServiceLocator(['translator.loader_2' => #[\Closure(name: 'translator.loader_2', class: 'stdClass')] function () {
             return ($this->services['translator.loader_2'] ?? ($this->services['translator.loader_2'] = new \stdClass()));
         }]));
 
@@ -144,7 +144,7 @@ protected function getTranslator2Service()
      */
     protected function getTranslator3Service()
     {
-        $this->services['translator_3'] = $instance = new \Symfony\Component\DependencyInjection\Tests\Fixtures\StubbedTranslator(new \Symfony\Component\DependencyInjection\ServiceLocator(['translator.loader_3' => function () {
+        $this->services['translator_3'] = $instance = new \Symfony\Component\DependencyInjection\Tests\Fixtures\StubbedTranslator(new \Symfony\Component\DependencyInjection\ServiceLocator(['translator.loader_3' => #[\Closure(name: 'translator.loader_3', class: 'stdClass')] function () {
             return ($this->services['translator.loader_3'] ?? ($this->services['translator.loader_3'] = new \stdClass()));
         }]));
 

Tests/Fixtures/php/services_uninitialized_ref.php

@@ -58,11 +58,11 @@ protected function getBarService()
         $instance->foo1 = ($this->services['foo1'] ?? null);
         $instance->foo2 = null;
         $instance->foo3 = ($this->privates['foo3'] ?? null);
-        $instance->closures = [0 => function () {
+        $instance->closures = [0 => #[\Closure(name: 'foo1', class: 'stdClass')] function () {
             return ($this->services['foo1'] ?? null);
-        }, 1 => function () {
+        }, 1 => #[\Closure(name: 'foo2')] function () {
             return null;
-        }, 2 => function () {
+        }, 2 => #[\Closure(name: 'foo3', class: 'stdClass')] function () {
             return ($this->privates['foo3'] ?? null);
         }];
         $instance->iter = new RewindableGenerator(function () {