included changes requested by @chalasr

przemyslaw-bogusz · przemyslaw-bogusz · commit 3bf08067197e · 2019-01-17T10:00:46.000+01:00
diff --git a/src/Symfony/Bundle/FrameworkBundle/EventListener/SuggestMissingPackageSubscriber.php b/src/Symfony/Bundle/FrameworkBundle/EventListener/SuggestMissingPackageSubscriber.php
@@ -13,7 +13,7 @@
 
 use Symfony\Component\Console\ConsoleEvents;
 use Symfony\Component\Console\Event\ConsoleErrorEvent;
-use Symfony\Component\Console\Exception\NamespaceNotFoundException;
+use Symfony\Component\Console\Exception\CommandNotFoundException;
 use Symfony\Component\EventDispatcher\EventSubscriberInterface;
 
 /**
@@ -24,46 +24,57 @@
  */
 final class SuggestMissingPackageSubscriber implements EventSubscriberInterface
 {
-    /**
-     * Mappings between namespaces of Symfony commands and packages required to run these commands.
-     *
-     * @var array
-     */
-    private static $suggestedPackages = [
+    private const PACKAGES = [
         'doctrine' => [
-            'Doctrine ORM',
-            'symfony/orm-pack',
+            'fixtures' => ['DoctrineFixturesBundle', 'doctrine/doctrine-fixtures-bundle --dev'],
+            'mongodb' => ['DoctrineMongoDBBundle', 'doctrine/mongodb-odm-bundle'],
+            '_default' => ['Doctrine ORM', 'symfony/orm-pack'],
         ],
         'generate' => [
-            'SensioGeneratorBundle',
-            'sensio/generator-bundle',
+            '_default' => ['SensioGeneratorBundle', 'sensio/generator-bundle'],
         ],
         'make' => [
-            'MakerBundle',
-            'symfony/maker-bundle --dev',
+            '_default' => ['MakerBundle', 'symfony/maker-bundle --dev'],
         ],
         'server' => [
-            'Symfony Web Server',
-            'symfony/web-server-bundle --dev',
+            'dump' => ['VarDumper Component', 'symfony/var-dumper --dev'],
+            '_default' => ['WebServerBundle', 'symfony/web-server-bundle --dev'],
         ],
     ];
 
-    public function onConsoleError(ConsoleErrorEvent $event)
+    public function onConsoleError(ConsoleErrorEvent $event): void
     {
-        if ($event->getError() instanceof NamespaceNotFoundException) {
-            if (null !== $event->getInput()->getFirstArgument()) {
-                $namespace = explode(':', $event->getInput()->getFirstArgument())[0];
+        if (!$event->getError() instanceof CommandNotFoundException || empty($input = $event->getInput()->getFirstArgument())) {
+            return;
+        }
+
+        $input = explode(':', $input);
+        $namespace = $input[0];
+        $command = $input[1] ?? '';
+
+        if (!isset(self::PACKAGES[$namespace])) {
+            return;
+        }
 
-                if (isset(self::$suggestedPackages[$namespace])) {
-                    $suggestion = self::$suggestedPackages[$namespace];
-                    $message = sprintf("It seems that you are trying to run a command from '%s' bundle/package, but you do not have it installed. You may try installing the missing bundle/package by running:\n\n    composer require %s", $suggestion[0], $suggestion[1]);
-                    $event->setError(new NamespaceNotFoundException($message));
-                }
-            }
+        if (isset(self::PACKAGES[$namespace][$command]) && '' !== $command) {
+            $suggestion = self::PACKAGES[$namespace][$command];
+            $exact = true;
+        } else {
+            $suggestion = self::PACKAGES[$namespace]['_default'];
+            $exact = false;
         }
+
+        $error = $event->getError();
+
+        if (!empty($error->getAlternatives()) && !$exact) {
+            return;
+        }
+
+        $message = sprintf("%s\n\nYou may be looking for a command provided by the \"%s\" which is currently not installed. Try running \"composer require %s\".", $error->getMessage(), $suggestion[0], $suggestion[1]);
+        $event->setError(new CommandNotFoundException($message));
     }
 
-    public static function getSubscribedEvents()
+    public static function getSubscribedEvents(): array
     {
         return [
             ConsoleEvents::ERROR => ['onConsoleError', 0],
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/config/console.xml b/src/Symfony/Bundle/FrameworkBundle/Resources/config/console.xml
@@ -13,8 +13,7 @@
             <tag name="monolog.logger" channel="console" />
         </service>
 
-        <service id="console.suggest_missing_package_subscriber"
-                 class="Symfony\Bundle\FrameworkBundle\EventListener\SuggestMissingPackageSubscriber">
+        <service id="console.suggest_missing_package_subscriber" class="Symfony\Bundle\FrameworkBundle\EventListener\SuggestMissingPackageSubscriber">
             <tag name="kernel.event_subscriber" />
         </service>
 
