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

bug #40167 [DependencyInjection] Definition::removeMethodCall should remove all matching calls (ruudk)

Browse Source 
This PR was submitted for the 5.x branch but it was merged into the 4.4 branch instead.

Discussion
----------

[DependencyInjection] Definition::removeMethodCall should remove all matching calls

It would only remove the first match, leaving the other method call(s) there to exist. This leads to unexpected situations.

| Q             | A
| ------------- | ---
| Branch?       | 4.4
| Bug fix?      | yes
| New feature?  | no
| Deprecations? | no
| Tickets       | None
| License       | MIT
| Doc PR        |

I found out that `Definition::removeMethodCall` only removes the first method call and stops. It should remove all method calls named `$method`.

Commits
-------

944ba23b58 Definition::removeMethodCall should remove all matching calls
This commit is contained in:
Fabien Potencier 2021-02-14 12:22:38 +01:00
commit aad1d094a5
2 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/Symfony/Component/DependencyInjection/Definition.php
View File

@ -392,7 +392,6 @@ class Definition
foreach ($this->calls as $i => $call) {
if ($call[0] === $method) {
unset($this->calls[$i]);
break;
}
}

16
src/Symfony/Component/DependencyInjection/Tests/DefinitionTest.php
View File

@ -425,4 +425,20 @@ class DefinitionTest extends TestCase
$def->addError('Second error');
$this->assertSame(['First error', 'Second error'], $def->getErrors());
}
public function testMultipleMethodCalls()
{
$def = new Definition('stdClass');
$def->addMethodCall('configure', ['arg1']);
$this->assertTrue($def->hasMethodCall('configure'));
$this->assertCount(1, $def->getMethodCalls());
$def->addMethodCall('configure', ['arg2']);
$this->assertTrue($def->hasMethodCall('configure'));
$this->assertCount(2, $def->getMethodCalls());
$def->removeMethodCall('configure');
$this->assertFalse($def->hasMethodCall('configure'));
}
}