review

dunglas · dunglas · commit 0540c6fead55 · 2021-01-13T22:41:03.000+01:00
diff --git a/src/Symfony/Component/DependencyInjection/CHANGELOG.md b/src/Symfony/Component/DependencyInjection/CHANGELOG.md
@@ -4,7 +4,7 @@ CHANGELOG
 5.3.0
 -----
 
-* added `ServicesConfigurator::remove()` in the PHP-DSL
+ * added `ServicesConfigurator::remove()` in the PHP-DSL
 
 5.2.0
 -----
diff --git a/src/Symfony/Component/DependencyInjection/Loader/Configurator/AbstractServiceConfigurator.php b/src/Symfony/Component/DependencyInjection/Loader/Configurator/AbstractServiceConfigurator.php
@@ -84,11 +84,11 @@ final public function get(string $id): ServiceConfigurator
     /**
      * Removes an already defined service definition or alias.
      */
-    final public function remove(string $id)
+    final public function remove(string $id): ServicesConfigurator
     {
         $this->__destruct();
 
-        $this->parent->remove($id);
+        return $this->parent->remove($id);
     }
 
     /**
diff --git a/src/Symfony/Component/DependencyInjection/Loader/Configurator/ServiceConfigurator.php b/src/Symfony/Component/DependencyInjection/Loader/Configurator/ServiceConfigurator.php
@@ -45,6 +45,7 @@ class ServiceConfigurator extends AbstractServiceConfigurator
     private $instanceof;
     private $allowParent;
     private $path;
+    private $destructed = false;
 
     public function __construct(ContainerBuilder $container, array $instanceof, bool $allowParent, ServicesConfigurator $parent, Definition $definition, $id, array $defaultTags, string $path = null)
     {
@@ -58,6 +59,11 @@ public function __construct(ContainerBuilder $container, array $instanceof, bool
 
     public function __destruct()
     {
+        if ($this->destructed) {
+            return;
+        }
+        $this->destructed = true;
+
         parent::__destruct();
 
         $this->container->removeBindings($this->id);
diff --git a/src/Symfony/Component/DependencyInjection/Loader/Configurator/ServicesConfigurator.php b/src/Symfony/Component/DependencyInjection/Loader/Configurator/ServicesConfigurator.php
@@ -93,16 +93,18 @@ final public function set(?string $id, string $class = null): ServiceConfigurato
 
         $configurator = new ServiceConfigurator($this->container, $this->instanceof, true, $this, $definition, $id, $defaults->getTags(), $this->path);
 
-        return null === $class ? $configurator : $configurator->class($class);
+        return null !== $class ? $configurator->class($class) : $configurator;
     }
 
     /**
      * Removes an already defined service definition or alias.
      */
-    final public function remove(string $id)
+    final public function remove(string $id): self
     {
         $this->container->removeDefinition($id);
         $this->container->removeAlias($id);
+
+        return $this;
     }
 
     /**
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/config/remove.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/config/remove.php
@@ -5,13 +5,13 @@
 return function (ContainerConfigurator $c) {
     $services = $c->services()->defaults()->public();
 
-    $services->set('foo', FooService::class);
-    $services->remove('foo');
+    $services
+        ->set('foo', FooService::class)
+        ->remove('foo')
 
-    $services->set('baz', BazService::class);
-    $services->alias('baz-alias', 'baz');
-    $services->remove('baz-alias');
+        ->set('baz', BazService::class)
+        ->alias('baz-alias', 'baz')
+        ->remove('baz-alias')
 
-    $services->remove('bat'); // noop
+        ->remove('bat'); // noop
 };
-

Original file line number	Diff line number	Diff line change
`@@ -84,11 +84,11 @@ final public function get(string $id): ServiceConfigurator`
`84`	`84`	`/**`
`85`	`85`	`* Removes an already defined service definition or alias.`
`86`	`86`	`*/`
`87`		`- final public function remove(string $id)`
	`87`	`+ final public function remove(string $id): ServicesConfigurator`
`88`	`88`	`{`
`89`	`89`	`$this->__destruct();`
`90`	`90`
`91`		`- $this->parent->remove($id);`
	`91`	`+ return $this->parent->remove($id);`
`92`	`92`	`}`
`93`	`93`
`94`	`94`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -93,16 +93,18 @@ final public function set(?string $id, string $class = null): ServiceConfigurato`
`93`	`93`
`94`	`94`	`$configurator = new ServiceConfigurator($this->container, $this->instanceof, true, $this, $definition, $id, $defaults->getTags(), $this->path);`
`95`	`95`
`96`		`- return null === $class ? $configurator : $configurator->class($class);`
	`96`	`+ return null !== $class ? $configurator->class($class) : $configurator;`
`97`	`97`	`}`
`98`	`98`
`99`	`99`	`/**`
`100`	`100`	`* Removes an already defined service definition or alias.`
`101`	`101`	`*/`
`102`		`- final public function remove(string $id)`
	`102`	`+ final public function remove(string $id): self`
`103`	`103`	`{`
`104`	`104`	`$this->container->removeDefinition($id);`
`105`	`105`	`$this->container->removeAlias($id);`
	`106`	`+`
	`107`	`+ return $this;`
`106`	`108`	`}`
`107`	`109`
`108`	`110`	`/**`