[DependencyInjection] renamed ContainerBuilder::remove() as removeDef…

…inition() to be more consistent with other definition-related methods
symfony · Apr 20, 2011 · 470baaa · 470baaa
1 parent cdf706d
commit 470baaa
Show file tree

Hide file tree

Showing 8 changed files with 14 additions and 14 deletions.
diff --git a/src/Symfony/Bundle/AsseticBundle/DependencyInjection/AsseticExtension.php b/src/Symfony/Bundle/AsseticBundle/DependencyInjection/AsseticExtension.php
@@ -76,12 +76,12 @@ public function load(array $configs, ContainerBuilder $container)
             $loader->load('controller.xml');
             $container->setParameter('assetic.twig_extension.class', '%assetic.twig_extension.dynamic.class%');
             $container->getDefinition('assetic.helper.dynamic')->addTag('templating.helper', array('alias' => 'assetic'));
-            $container->remove('assetic.helper.static');
+            $container->removeDefinition('assetic.helper.static');
         } else {
             $loader->load('asset_writer.xml');
             $container->setParameter('assetic.twig_extension.class', '%assetic.twig_extension.static.class%');
             $container->getDefinition('assetic.helper.static')->addTag('templating.helper', array('alias' => 'assetic'));
-            $container->remove('assetic.helper.dynamic');
+            $container->removeDefinition('assetic.helper.dynamic');
         }
 
         // register config resources

diff --git a/src/Symfony/Bundle/AsseticBundle/DependencyInjection/Compiler/CheckClosureFilterPass.php b/src/Symfony/Bundle/AsseticBundle/DependencyInjection/Compiler/CheckClosureFilterPass.php
@@ -25,9 +25,9 @@ public function process(ContainerBuilder $container)
     {
         if ($container->hasDefinition('assetic.filter.closure.jar') &&
             $container->getParameterBag()->resolveValue($container->getParameter('assetic.filter.closure.jar'))) {
-            $container->remove('assetic.filter.closure.api');
+            $container->removeDefinition('assetic.filter.closure.api');
         } elseif ($container->hasDefinition('assetic.filter.closure.api')) {
-            $container->remove('assetic.filter.closure.jar');
+            $container->removeDefinition('assetic.filter.closure.jar');
         }
     }
 }
diff --git a/src/Symfony/Bundle/AsseticBundle/DependencyInjection/Compiler/TemplatingPass.php b/src/Symfony/Bundle/AsseticBundle/DependencyInjection/Compiler/TemplatingPass.php
@@ -31,13 +31,13 @@ public function process(ContainerBuilder $container)
 
         if (!in_array('twig', $engines)) {
             foreach ($container->findTaggedServiceIds('assetic.templating.twig') as $id => $attr) {
-                $container->remove($id);
+                $container->removeDefinition($id);
             }
         }
 
         if (!in_array('php', $engines)) {
             foreach ($container->findTaggedServiceIds('assetic.templating.php') as $id => $attr) {
-                $container->remove($id);
+                $container->removeDefinition($id);
             }
         }
     }

diff --git a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/SecurityExtension.php b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/SecurityExtension.php
@@ -138,13 +138,13 @@ private function aclLoad($config, ContainerBuilder $container)
     private function createRoleHierarchy($config, ContainerBuilder $container)
     {
         if (!isset($config['role_hierarchy'])) {
-            $container->remove('security.access.role_hierarchy_voter');
+            $container->removeDefinition('security.access.role_hierarchy_voter');
 
             return;
         }
 
         $container->setParameter('security.role_hierarchy.roles', $config['role_hierarchy']);
-        $container->remove('security.access.simple_role_voter');
+        $container->removeDefinition('security.access.simple_role_voter');
     }
 
     private function createAuthorization($config, ContainerBuilder $container)

diff --git a/src/Symfony/Component/DependencyInjection/Compiler/RemoveAbstractDefinitionsPass.php b/src/Symfony/Component/DependencyInjection/Compiler/RemoveAbstractDefinitionsPass.php
@@ -22,7 +22,7 @@ public function process(ContainerBuilder $container)
 
         foreach ($container->getDefinitions() as $id => $definition) {
             if ($definition->isAbstract()) {
-                $container->remove($id);
+                $container->removeDefinition($id);
                 $compiler->addLogMessage($formatter->formatRemoveService($this, $id, 'abstract'));
             }
         }

diff --git a/src/Symfony/Component/DependencyInjection/Compiler/RemoveUnusedDefinitionsPass.php b/src/Symfony/Component/DependencyInjection/Compiler/RemoveUnusedDefinitionsPass.php
@@ -72,10 +72,10 @@ public function process(ContainerBuilder $container)
             if (1 === count($referencingAliases) && false === $isReferenced) {
                 $container->setDefinition((string) reset($referencingAliases), $definition);
                 $definition->setPublic(true);
-                $container->remove($id);
+                $container->removeDefinition($id);
                 $compiler->addLogMessage($formatter->formatRemoveService($this, $id, 'replaces alias '.reset($referencingAliases)));
             } else if (0 === count($referencingAliases) && false === $isReferenced) {
-                $container->remove($id);
+                $container->removeDefinition($id);
                 $compiler->addLogMessage($formatter->formatRemoveService($this, $id, 'unused'));
                 $hasChanged = true;
             }

diff --git a/src/Symfony/Component/DependencyInjection/Compiler/ReplaceAliasByActualDefinitionPass.php b/src/Symfony/Component/DependencyInjection/Compiler/ReplaceAliasByActualDefinitionPass.php
@@ -47,7 +47,7 @@ public function process(ContainerBuilder $container)
 
             $definition->setPublic(true);
             $container->setDefinition($id, $definition);
-            $container->remove($aliasId);
+            $container->removeDefinition($aliasId);
 
             $this->updateReferences($container, $aliasId, $id);
 

diff --git a/src/Symfony/Component/DependencyInjection/ContainerBuilder.php b/src/Symfony/Component/DependencyInjection/ContainerBuilder.php
@@ -241,11 +241,11 @@ public function set($id, $service, $scope = self::SCOPE_CONTAINER)
     }
 
     /**
-     * Removes a service.
+     * Removes a service definition.
      *
      * @param string $id The service identifier
      */
-    public function remove($id)
+    public function removeDefinition($id)
     {
         unset($this->definitions[strtolower($id)]);
     }