Applied ro0NL comments and fixed

przemyslaw-bogusz · przemyslaw-bogusz · commit ba3f40439fc5 · 2019-02-14T14:55:02.000+01:00
diff --git a/src/Symfony/Bundle/FrameworkBundle/CHANGELOG.md b/src/Symfony/Bundle/FrameworkBundle/CHANGELOG.md
@@ -16,7 +16,6 @@ CHANGELOG
  * Added php ini session options `sid_length` and `sid_bits_per_character` 
    to the `session` section of the configuration
  * Added support for Translator paths, Twig paths in translation commands.
- * Added `SuggestMissingPackageSubscriber` for suggesting missing packages when using console commands
 
 4.2.0
 -----
diff --git a/src/Symfony/Bundle/FrameworkBundle/EventListener/SuggestMissingPackageSubscriber.php b/src/Symfony/Bundle/FrameworkBundle/EventListener/SuggestMissingPackageSubscriber.php
@@ -46,19 +46,17 @@ final class SuggestMissingPackageSubscriber implements EventSubscriberInterface
 
     public function onConsoleError(ConsoleErrorEvent $event): void
     {
-        if (!$event->getError() instanceof CommandNotFoundException || $input = $event->getInput()->getFirstArgument()) {
+        if (!$event->getError() instanceof CommandNotFoundException) {
             return;
         }
 
-        $input = explode(':', $input);
-        $namespace = $input[0];
-        $command = $input[1] ?? '';
+        [$namespace, $command] = explode(':', $event->getInput()->getFirstArgument()) + [1 => ''];
 
         if (!isset(self::PACKAGES[$namespace])) {
             return;
         }
 
-        if (isset(self::PACKAGES[$namespace][$command]) && '' !== $command) {
+        if (isset(self::PACKAGES[$namespace][$command])) {
             $suggestion = self::PACKAGES[$namespace][$command];
             $exact = true;
         } else {

Original file line number	Diff line number	Diff line change
`@@ -46,19 +46,17 @@ final class SuggestMissingPackageSubscriber implements EventSubscriberInterface`
`46`	`46`
`47`	`47`	`public function onConsoleError(ConsoleErrorEvent $event): void`
`48`	`48`	`{`
`49`		`- if (!$event->getError() instanceof CommandNotFoundException \|\| $input = $event->getInput()->getFirstArgument()) {`
	`49`	`+ if (!$event->getError() instanceof CommandNotFoundException) {`
`50`	`50`	`return;`
`51`	`51`	`}`
`52`	`52`
`53`		`- $input = explode(':', $input);`
`54`		`- $namespace = $input[0];`
`55`		`- $command = $input[1] ?? '';`
	`53`	`+ [$namespace, $command] = explode(':', $event->getInput()->getFirstArgument()) + [1 => ''];`
`56`	`54`
`57`	`55`	`if (!isset(self::PACKAGES[$namespace])) {`
`58`	`56`	`return;`
`59`	`57`	`}`
`60`	`58`
`61`		`- if (isset(self::PACKAGES[$namespace][$command]) && '' !== $command) {`
	`59`	`+ if (isset(self::PACKAGES[$namespace][$command])) {`
`62`	`60`	`$suggestion = self::PACKAGES[$namespace][$command];`
`63`	`61`	`$exact = true;`
`64`	`62`	`} else {`