[DependencyInjection] Add tests using expressions as service factories

jvasseur · nicolas-grekas · commit d4b53cd579aa · 2022-02-23T09:04:19.000+01:00
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/config/expression_factory.expected.yml b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/config/expression_factory.expected.yml
@@ -0,0 +1,13 @@
+
+services:
+    service_container:
+        class: Symfony\Component\DependencyInjection\ContainerInterface
+        public: true
+        synthetic: true
+    foo:
+        class: Bar\FooClass
+        public: true
+    bar:
+        class: Bar\FooClass
+        public: true
+        factory: '@=service("foo").getInstance()'
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/config/expression_factory.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/config/expression_factory.php
@@ -0,0 +1,10 @@
+<?php
+
+namespace Symfony\Component\DependencyInjection\Loader\Configurator;
+
+return function (ContainerConfigurator $c) {
+    $s = $c->services()->defaults()->public();
+
+    $s->set('foo', 'Bar\FooClass');
+    $s->set('bar', 'Bar\FooClass')->factory(expr('service("foo").getInstance()'));
+};
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/xml/services6.xml b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/xml/services6.xml
@@ -63,6 +63,9 @@
     <service id="new_factory5" class="FooBarClass">
       <factory service="baz" />
     </service>
+    <service id="factory_expression" class="FooClass">
+      <factory expression="service('foo').getInstance()" />
+    </service>
     <service id="alias_for_foo" alias="foo" />
     <service id="another_alias_for_foo" alias="foo" public="true"/>
     <service id="0" class="FooClass" />
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/yaml/services6.yml b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/yaml/services6.yml
@@ -40,6 +40,9 @@ services:
     new_factory3: { class: FooBarClass, factory: [BazClass, getInstance]}
     new_factory4: { class: BazClass, factory: [~, getInstance]}
     new_factory5: { class: FooBarClass, factory: '@baz' }
+    factory_expression:
+        class: FooClass
+        factory: "@=service('foo').getInstance()"
     Acme\WithShortCutArgs: [foo, '@baz']
     alias_for_foo: '@foo'
     another_alias_for_foo:
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Loader/PhpFileLoaderTest.php b/src/Symfony/Component/DependencyInjection/Tests/Loader/PhpFileLoaderTest.php
@@ -97,6 +97,7 @@ public function provideConfig()
         yield ['inline_binding'];
         yield ['remove'];
         yield ['config_builder'];
+        yield ['expression_factory'];
     }
 
     public function testAutoConfigureAndChildDefinition()

Original file line number	Diff line number	Diff line change
`@@ -97,6 +97,7 @@ public function provideConfig()`
`97`	`97`	`yield ['inline_binding'];`
`98`	`98`	`yield ['remove'];`
`99`	`99`	`yield ['config_builder'];`
	`100`	`+ yield ['expression_factory'];`
`100`	`101`	`}`
`101`	`102`
`102`	`103`	`public function testAutoConfigureAndChildDefinition()`