Fixes #3595: Remove non-default options in REPL commands, Fix help command grouping (#3667)

Author: damiankloip

src/Drupal/Commands/core/CliCommands.php

@@ -15,6 +15,7 @@
 
 class CliCommands extends DrushCommands
 {
+
     /**
      * Drush's PHP Shell.
      *
@@ -94,14 +95,13 @@ protected function getDrushCommands()
         $ignored_commands = [
             'help',
             'php:cli',
-                'core:cli',
-                'core-cli',
-                'php',
+            'core:cli',
+            'php',
             'php:eval',
-                'eval',
-                'ev',
+            'eval',
+            'ev',
             'php:script',
-                'scr',
+            'scr',
         ];
         $php_keywords = $this->getPhpKeywords();
 

src/Psysh/DrushCommand.php

@@ -43,7 +43,7 @@ public function __construct(AnnotatedCommand $command)
      */
     public function getNamespace()
     {
-        $parts = explode('-', $this->getName());
+        $parts = explode(':', $this->getName());
         return count($parts) >= 2 ? array_shift($parts) : 'global';
     }
 
@@ -53,11 +53,11 @@ public function getNamespace()
     protected function configure()
     {
         $this
-        ->setName($this->command->getName())
-        ->setAliases($this->command->getAliases())
-        ->setDefinition($this->command->getDefinition())
-        ->setDescription($this->command->getDescription())
-        ->setHelp($this->buildHelpFromCommand());
+            ->setName($this->command->getName())
+            ->setAliases($this->command->getAliases())
+            ->setDefinition($this->command->getDefinition())
+            ->setDescription($this->command->getDescription())
+            ->setHelp($this->buildHelpFromCommand());
     }
 
     /**
@@ -73,20 +73,20 @@ protected function execute(InputInterface $input, OutputInterface $output)
         if (strpos($first, '@') === 0) {
             $alias = $first;
             $command = array_shift($args);
-        } // Otherwise, default the alias to '@self' and use the first argument as the
-        // command.
-        else {
+        } else {
+            // Otherwise, default the alias to '@self' and use the first argument as the
+            // command.
             $alias = '@self';
             $command = $first;
         }
 
-        $options = $input->getOptions();
+        $options = array_diff_assoc($input->getOptions(), $this->getDefinition()->getOptionDefaults());
         // Force the 'backend' option to TRUE.
         $options['backend'] = true;
 
         $return = drush_invoke_process($alias, $command, array_values($args), $options, ['interactive' => true]);
 
-        if ($return['error_status'] > 0) {
+        if (($return['error_status'] > 0) && !empty($return['error_log'])) {
             foreach ($return['error_log'] as $error_type => $errors) {
                 $output->write($errors);
             }