[DI] Renamed some PHP-DSL functions

Author: javiereguiluz

CHANGELOG.md

@@ -4,6 +4,7 @@ CHANGELOG
 5.1.0
 -----
 
+ * deprecated `inline()` in favor of `inline_service()` and `ref()` in favor of `service()` when using the PHP-DSL
  * allow decorators to reference their decorated service using the special `.inner` id
  * added support to autowire public typed properties in php 7.4
  * added support for defining method calls, a configurator, and property setters in `InlineServiceConfigurator`

Loader/Configurator/ContainerConfigurator.php

@@ -84,28 +84,40 @@ final public function withPath(string $path): self
 
 /**
  * Creates a service reference.
+ *
+ * @deprecated since Symfony 5.1, use service() instead.
  */
 function ref(string $id): ReferenceConfigurator
 {
+    trigger_deprecation('symfony/dependency-injection', '5.1', '"%s()" is deprecated, use "service()" instead.', __FUNCTION__);
+
     return new ReferenceConfigurator($id);
 }
 
+/**
+ * Creates a reference to a service.
+ */
+function service(string $serviceId): ReferenceConfigurator
+{
+    return new ReferenceConfigurator($serviceId);
+}
+
 /**
  * Creates an inline service.
  *
- * @deprecated since Symfony 5.1, use service() instead.
+ * @deprecated since Symfony 5.1, use inline_service() instead.
  */
 function inline(string $class = null): InlineServiceConfigurator
 {
-    trigger_deprecation('symfony/dependency-injection', '5.1', '"%s()" is deprecated, use "service()" instead.', __FUNCTION__);
+    trigger_deprecation('symfony/dependency-injection', '5.1', '"%s()" is deprecated, use "inline_service()" instead.', __FUNCTION__);
 
     return new InlineServiceConfigurator(new Definition($class));
 }
 
 /**
  * Creates an inline service.
  */
-function service(string $class = null): InlineServiceConfigurator
+function inline_service(string $class = null): InlineServiceConfigurator
 {
     return new InlineServiceConfigurator(new Definition($class));
 }

Loader/Configurator/Traits/FactoryTrait.php

@@ -27,7 +27,7 @@ final public function factory($factory): self
         if (\is_string($factory) && 1 === substr_count($factory, ':')) {
             $factoryParts = explode(':', $factory);
 
-            throw new InvalidArgumentException(sprintf('Invalid factory "%s": the "service:method" notation is not available when using PHP-based DI configuration. Use "[ref(\'%s\'), \'%s\']" instead.', $factory, $factoryParts[0], $factoryParts[1]));
+            throw new InvalidArgumentException(sprintf('Invalid factory "%s": the "service:method" notation is not available when using PHP-based DI configuration. Use "[service(\'%s\'), \'%s\']" instead.', $factory, $factoryParts[0], $factoryParts[1]));
         }
 
         $this->definition->setFactory(static::processValue($factory, true));

Tests/Fixtures/config/anonymous.php

@@ -13,7 +13,7 @@
 
     $s->set(null, StdClassDecorator::class)
         ->decorate('decorated', 'decorator42')
-        ->args([ref('decorator42')]);
+        ->args([service('decorator42')]);
 
     $s->set('listener_aggregator', FooClass::class)->public()->args([tagged_iterator('listener')]);
 

Tests/Fixtures/config/basic.php

@@ -7,5 +7,5 @@
 return function (ContainerConfigurator $c) {
     $s = $c->services()->defaults()->public();
     $s->set(BarService::class)
-        ->args([service('FooClass')]);
+        ->args([inline_service('FooClass')]);
 };

Tests/Fixtures/config/child.php

@@ -15,7 +15,7 @@
             ->parent(BarService::class)
             ->public()
             ->decorate('bar', 'b', 1)
-            ->args([ref('b')])
+            ->args([service('b')])
             ->class('Class2')
             ->file('file.php')
             ->parent('bar')

Tests/Fixtures/config/defaults.php

@@ -13,9 +13,9 @@
         ->autoconfigure()
         ->autowire()
         ->tag('t', ['a' => 'b'])
-        ->bind(Foo::class, ref('bar'))
+        ->bind(Foo::class, service('bar'))
         ->public();
 
-    $s->set(Foo::class)->args([ref('bar')])->public();
+    $s->set(Foo::class)->args([service('bar')])->public();
     $s->set('bar', Foo::class)->call('setFoo')->autoconfigure(false);
 };

Tests/Fixtures/config/instanceof.php

@@ -9,7 +9,7 @@
     $s = $c->services()->defaults()->public();
     $s->instanceof(Prototype\Foo::class)
         ->property('p', 0)
-        ->call('setFoo', [ref('foo')])
+        ->call('setFoo', [service('foo')])
         ->tag('tag', ['k' => 'v'])
         ->share(false)
         ->lazy()

Tests/Fixtures/config/object.php

@@ -9,6 +9,6 @@ public function __invoke(ContainerConfigurator $c)
     {
         $s = $c->services()->defaults()->public();
         $s->set(BarService::class)
-            ->args([service('FooClass')]);
+            ->args([inline_service('FooClass')]);
     }
 };

Tests/Fixtures/config/php7.php

@@ -11,7 +11,7 @@
     ;
     $c->services()->defaults()->public()
         (Foo::class)
-            ->arg('$bar', ref('bar'))
+            ->arg('$bar', service('bar'))
             ->public()
         ('bar', Foo::class)
             ->call('setFoo')