From c93194d1db2fb2195fc004ad1f16f48773fd0136 Mon Sep 17 00:00:00 2001 From: Teoh Han Hui Date: Thu, 18 Apr 2019 20:04:31 +0200 Subject: [PATCH] Fix name and phpdoc of ContainerBuilder::removeBindings --- .../Component/DependencyInjection/ContainerBuilder.php | 6 +++--- .../Loader/Configurator/ServiceConfigurator.php | 2 +- .../Component/DependencyInjection/Loader/FileLoader.php | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/Symfony/Component/DependencyInjection/ContainerBuilder.php b/src/Symfony/Component/DependencyInjection/ContainerBuilder.php index e6a2aa0531ea..c322b4357ad2 100644 --- 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 index 21b1669d09ec..897dedaac58e 100644 --- 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 index 0dd1a3d8bded..f0d920189240 100644 --- 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) {