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

[DependencyInjection] Make exceptions consistent when ContainerBuilder is frozen

Browse Source 
Some methods previously threw LogicExceptions when the ContainerBuilder was frozen. Using BadMethodCallException (a descendant of LogicException) in all cases improves consistency and preserves BC.
This commit is contained in:
Jeremy Mikola 2011-12-04 16:09:11 -08:00
parent b7300d2e07
commit 47256ea76f
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -159,13 +159,14 @@ class ContainerBuilder extends Container implements TaggedContainerInterface
* @param array $values An array of values that customizes the extension
*
* @return ContainerBuilder The current instance
* @throws BadMethodCallException When this ContainerBuilder is frozen
*
* @api
*/
public function loadFromExtension($extension, array $values = array())
{
if (true === $this->isFrozen()) {
throw new LogicException('Cannot load from an extension on a frozen container.');
if ($this->isFrozen()) {
throw new BadMethodCallException('Cannot load from an extension on a frozen container.');
}
$namespace = $this->getExtension($extension)->getAlias();
@ -371,14 +372,15 @@ class ContainerBuilder extends Container implements TaggedContainerInterface
* constructor.
*
* @param ContainerBuilder $container The ContainerBuilder instance to merge.
* @throws LogicException when this ContainerBuilder is frozen
*
* @throws BadMethodCallException When this ContainerBuilder is frozen
*
* @api
*/
public function merge(ContainerBuilder $container)
{
if (true === $this->isFrozen()) {
throw new LogicException('Cannot merge on a frozen container.');
if ($this->isFrozen()) {
throw new BadMethodCallException('Cannot merge on a frozen container.');
}
$this->addDefinitions($container->getDefinitions());