Fix name and phpdoc of ContainerBuilder::removeBindings

teohhanhui · teohhanhui · commit c93194d1db2f · 2019-04-20T17:32:49.000+02:00
diff --git a/src/Symfony/Component/DependencyInjection/ContainerBuilder.php b/src/Symfony/Component/DependencyInjection/ContainerBuilder.php
@@ -1527,13 +1527,13 @@ public function getRemovedBindingIds()
     }
 
     /**
-     * Adds a removed binding id.
+     * Removes bindings for a service.
      *
-     * @param int $id
+     * @param string $id The service identifier
      *
      * @internal
      */
-    public function addRemovedBindingIds($id)
+    public function removeBindings($id)
     {
         if ($this->hasDefinition($id)) {
             foreach ($this->getDefinition($id)->getBindings() as $key => $binding) {
diff --git a/src/Symfony/Component/DependencyInjection/Loader/Configurator/ServiceConfigurator.php b/src/Symfony/Component/DependencyInjection/Loader/Configurator/ServiceConfigurator.php
@@ -59,7 +59,7 @@ public function __destruct()
     {
         parent::__destruct();
 
-        $this->container->addRemovedBindingIds($this->id);
+        $this->container->removeBindings($this->id);
 
         if (!$this->definition instanceof ChildDefinition) {
             $this->container->setDefinition($this->id, $this->definition->setInstanceofConditionals($this->instanceof));
diff --git a/src/Symfony/Component/DependencyInjection/Loader/FileLoader.php b/src/Symfony/Component/DependencyInjection/Loader/FileLoader.php
@@ -91,7 +91,7 @@ public function registerClasses(Definition $prototype, $namespace, $resource, $e
      */
     protected function setDefinition($id, Definition $definition)
     {
-        $this->container->addRemovedBindingIds($id);
+        $this->container->removeBindings($id);
 
         if ($this->isLoadingInstanceof) {
             if (!$definition instanceof ChildDefinition) {

Original file line number	Diff line number	Diff line change
`@@ -1527,13 +1527,13 @@ public function getRemovedBindingIds()`
`1527`	`1527`	`}`
`1528`	`1528`
`1529`	`1529`	`/**`
`1530`		`- * Adds a removed binding id.`
	`1530`	`+ * Removes bindings for a service.`
`1531`	`1531`	`*`
`1532`		`- * @param int $id`
	`1532`	`+ * @param string $id The service identifier`
`1533`	`1533`	`*`
`1534`	`1534`	`* @internal`
`1535`	`1535`	`*/`
`1536`		`- public function addRemovedBindingIds($id)`
	`1536`	`+ public function removeBindings($id)`
`1537`	`1537`	`{`
`1538`	`1538`	`if ($this->hasDefinition($id)) {`
`1539`	`1539`	`foreach ($this->getDefinition($id)->getBindings() as $key => $binding) {`
Original file line number	Diff line number	Diff line change
`@@ -59,7 +59,7 @@ public function __destruct()`
`59`	`59`	`{`
`60`	`60`	`parent::__destruct();`
`61`	`61`
`62`		`- $this->container->addRemovedBindingIds($this->id);`
	`62`	`+ $this->container->removeBindings($this->id);`
`63`	`63`
`64`	`64`	`if (!$this->definition instanceof ChildDefinition) {`
`65`	`65`	`$this->container->setDefinition($this->id, $this->definition->setInstanceofConditionals($this->instanceof));`
Original file line number	Diff line number	Diff line change
`@@ -91,7 +91,7 @@ public function registerClasses(Definition $prototype, $namespace, $resource, $e`
`91`	`91`	`*/`
`92`	`92`	`protected function setDefinition($id, Definition $definition)`
`93`	`93`	`{`
`94`		`- $this->container->addRemovedBindingIds($id);`
	`94`	`+ $this->container->removeBindings($id);`
`95`	`95`
`96`	`96`	`if ($this->isLoadingInstanceof) {`
`97`	`97`	`if (!$definition instanceof ChildDefinition) {`