Skip to content
Permalink
Browse files

Remove default match from AbstractConfigCommand::findExtension

Previously, findExtension would return the first extension that might
not even match the $name parameter.
  • Loading branch information...
kix authored and fabpot committed Jan 20, 2016
1 parent a4f7fbf commit b85059a672cffb192aa1df2f7d8c33244cc82f44
Showing with 10 additions and 11 deletions.
  1. +10 −11 src/Symfony/Bundle/FrameworkBundle/Command/AbstractConfigCommand.php
@@ -48,26 +48,25 @@ protected function listBundles(OutputInterface $output)
protected function findExtension($name)
{
$extension = null;
$bundles = $this->initializeBundles();
foreach ($bundles as $bundle) {
$extension = $bundle->getContainerExtension();
if ($name === $bundle->getName()) {
return $bundle->getContainerExtension();
}
if ($extension && ($name === $extension->getAlias() || $name === $bundle->getName())) {
break;
$extension = $bundle->getContainerExtension();
if ($extension && $name === $extension->getAlias()) {
return $extension;
}
}
if (!$extension) {
if ('Bundle' !== substr($name, -6)) {
$message = sprintf('No extensions with configuration available for "%s"', $name);
} else {
$message = sprintf('No extension with alias "%s" is enabled', $name);
if (preg_match('/Bundle$/', $name)) {
$message = sprintf('No extensions with configuration available for "%s"', $name);
}
throw new \LogicException($message);
}
return $extension;
throw new \LogicException($message);
}
public function validateConfiguration(ExtensionInterface $extension, $configuration)

0 comments on commit b85059a

Please sign in to comment.
You can’t perform that action at this time.