Add constructor of anonymous services

unkind · unkind · commit 766ceb383a1b · 2017-10-20T23:46:24.000+03:00
diff --git a/src/Symfony/Component/DependencyInjection/ContainerBuilder.php b/src/Symfony/Component/DependencyInjection/ContainerBuilder.php
@@ -1440,6 +1440,23 @@ public function log(CompilerPassInterface $pass, $message)
         $this->getCompiler()->log($pass, $message);
     }
 
+    /**
+     * @param $prefix
+     * @param string $prefix
+     *
+     * @return string
+     */
+    public function generateServiceName($prefix)
+    {
+        $i = 0;
+
+        while ($this->hasDefinition($prefix.$i)) {
+            ++$i;
+        }
+
+        return $prefix.$i;
+    }
+
     /**
      * Returns the Service Conditionals.
      *
diff --git a/src/Symfony/Component/DependencyInjection/Loader/Configurator/ServicesConfigurator.php b/src/Symfony/Component/DependencyInjection/Loader/Configurator/ServicesConfigurator.php
@@ -90,6 +90,18 @@ final public function set($id, $class = null)
         return null !== $class ? $configurator->class($class) : $configurator;
     }
 
+    /**
+     * Creates anonymous service (service without explicit name).
+     *
+     * @param string $class
+     *
+     * @return ServiceConfigurator
+     */
+    final public function anonymous($class)
+    {
+        return $this->set($this->container->generateServiceName('anon'), $class)->private();
+    }
+
     /**
      * Creates an alias.
      *
diff --git a/src/Symfony/Component/DependencyInjection/Tests/ContainerBuilderTest.php b/src/Symfony/Component/DependencyInjection/Tests/ContainerBuilderTest.php
@@ -1250,6 +1250,18 @@ public function testParameterWithMixedCase()
 
         $this->assertSame('bar', $container->get('foo')->foo);
     }
+
+    public function testServiceNameGenerator()
+    {
+        $container = new ContainerBuilder();
+        $this->assertSame('foo0', $container->generateServiceName('foo'));
+        $this->assertSame('bar0', $container->generateServiceName('bar'));
+
+        $container->register('foo0', \stdClass::class);
+        $container->register('foo1', \stdClass::class);
+
+        $this->assertSame('foo2', $container->generateServiceName('foo'));
+    }
 }
 
 class FooClass
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/StdClassDecorator.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/StdClassDecorator.php
@@ -0,0 +1,11 @@
+<?php
+
+namespace Symfony\Component\DependencyInjection\Tests\Fixtures;
+
+final class StdClassDecorator
+{
+    public function __construct(\stdClass $foo)
+    {
+        $this->foo = $foo;
+    }
+}
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/config/anonymous.expected.yml b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/config/anonymous.expected.yml
@@ -0,0 +1,19 @@
+
+services:
+    service_container:
+        class: Symfony\Component\DependencyInjection\ContainerInterface
+        public: true
+        synthetic: true
+    listener_aggregator:
+        class: Bar\FooClass
+        public: true
+        arguments: [!tagged listener]
+    anon1:
+        class: stdClass
+        public: false
+        tags:
+            - { name: listener }
+    decorated:
+        class: Symfony\Component\DependencyInjection\Tests\Fixtures\StdClassDecorator
+        public: true
+        arguments: [!service { class: stdClass, public: false }]
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/config/anonymous.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/config/anonymous.php
@@ -0,0 +1,21 @@
+<?php
+
+namespace Symfony\Component\DependencyInjection\Loader\Configurator;
+
+use Bar\FooClass;
+use stdClass;
+use Symfony\Component\DependencyInjection\Tests\Fixtures\StdClassDecorator;
+
+return function (ContainerConfigurator $c) {
+    $s = $c->services();
+
+    $s->set('decorated', stdClass::class);
+
+    $s->anonymous(StdClassDecorator::class)
+        ->decorate('decorated', 'decorator42')
+        ->args(array(ref('decorator42')));
+
+    $s->set('listener_aggregator', FooClass::class)->public()->args(array(tagged('listener')));
+
+    $s->anonymous(stdClass::class)->tag('listener');
+};
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Loader/PhpFileLoaderTest.php b/src/Symfony/Component/DependencyInjection/Tests/Loader/PhpFileLoaderTest.php
@@ -71,6 +71,7 @@ public function provideConfig()
         yield array('instanceof');
         yield array('prototype');
         yield array('child');
+        yield array('anonymous');
 
         if (\PHP_VERSION_ID >= 70000) {
             yield array('php7');
