Remove default match from AbstractConfigCommand::findExtension

kix · fabpot · commit b85059a672cf · 2016-01-21T07:10:38.000+01:00
Previously, findExtension would return the first extension that might
not even match the $name parameter.
diff --git a/src/Symfony/Bundle/FrameworkBundle/Command/AbstractConfigCommand.php b/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)
