diogo
/
symfony
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

minor #31173 Fix name and phpdoc of ContainerBuilder::removeBindings (teohhanhui) 

This PR was merged into the 3.4 branch.

Discussion
----------

Fix name and phpdoc of ContainerBuilder::removeBindings

| Q             | A
| ------------- | ---
| Branch?       | 3.4
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no     <!-- see https://symfony.com/bc -->
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | https://github.com/symfony/symfony/pull/29944#discussion_r276718323
| License       | MIT
| Doc PR        | N/A

<!--
Write a short README entry for your feature/bugfix here (replace this comment block.)
This will help people understand your PR and can be used as a start of the Doc PR.
Additionally:
 - Bug fixes must be submitted against the lowest branch where they apply
   (lowest branches are regularly merged to upper ones so they get the fixes too).
 - Features and deprecations must be submitted against the master branch.
-->

Commits
-------

c93194d1db Fix name and phpdoc of ContainerBuilder::removeBindings
This commit is contained in:
Nicolas Grekas 2019-04-27 10:44:00 +02:00
parent f033ea4ab8 c93194d1db
commit eaba717956
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/Symfony/Component/DependencyInjection/ContainerBuilder.php
View File

@ -1527,13 +1527,13 @@ class ContainerBuilder extends Container implements TaggedContainerInterface
}
/**
* 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) {

2
src/Symfony/Component/DependencyInjection/Loader/Configurator/ServiceConfigurator.php
View File

@ -59,7 +59,7 @@ class ServiceConfigurator extends AbstractServiceConfigurator
{
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));

2
src/Symfony/Component/DependencyInjection/Loader/FileLoader.php
View File

@ -91,7 +91,7 @@ abstract class FileLoader extends BaseFileLoader
*/
protected function setDefinition($id, Definition $definition)
{
$this->container->addRemovedBindingIds($id);
$this->container->removeBindings($id);
if ($this->isLoadingInstanceof) {
if (!$definition instanceof ChildDefinition) {