ContainerBuilder::removeDefinition() fixed keys in $classes [Closes #72]

nette · Jun 17, 2015 · 58ed2d8 · 58ed2d8
1 parent 94f96ad
commit 58ed2d8
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/src/DI/ContainerBuilder.php b/src/DI/ContainerBuilder.php
@@ -83,7 +83,7 @@ public function removeDefinition($name)
 		if ($this->classes) {
 			foreach ($this->classes as & $tmp) {
 				foreach ($tmp as & $names) {
-					$names = array_diff($names, [$name]);
+					$names = array_values(array_diff($names, [$name]));
 				}
 			}
 		}

diff --git a/tests/DI/ContainerBuilder.removeDefinition.phpt b/tests/DI/ContainerBuilder.removeDefinition.phpt
@@ -42,10 +42,10 @@ Assert::exception(function () use ($builder) {
 Assert::count( 4, $builder->findByType('stdClass') );
 
 
-$builder->removeDefinition('two');
+$builder->removeDefinition('one');
 $builder->removeDefinition('four');
 
-Assert::same( 'one', $builder->getByType('stdClass') );
+Assert::same( 'two', $builder->getByType('stdClass') );
 
 Assert::count( 2, $builder->findByType('stdClass') );