[chain] FIx command register. (#2986)

Author: jmolivas

src/Application.php

@@ -106,6 +106,11 @@ private function registerCommands()
             );
         }
 
+//        // @TODO add auto-discovery of chain files
+//        $chainCommands['create:bulk:data'] = [
+//            'file' => '/Users/jmolivas/.console/chain/create-data.yml'
+//        ];
+//
 //        foreach ($chainCommands as $name => $chainCommand) {
 //            $file = $chainCommand['file'];
 //            $command = new ChainRegister($name, $file);
@@ -133,9 +138,11 @@ private function registerCommands()
             // Some commands call AnnotationRegistry::reset,
             // we need to ensure the AnnotationRegistry is correctly defined.
             AnnotationRegistry::reset();
-            AnnotationRegistry::registerLoader([
-                \Drupal::service('class_loader'),
-                "loadClass"]
+            AnnotationRegistry::registerLoader(
+                [
+                    \Drupal::service('class_loader'),
+                    "loadClass"
+                ]
             );
 
             if (!$this->container->has($name)) {

src/Command/Chain/ChainCommand.php

@@ -33,11 +33,6 @@ class ChainCommand extends Command
     use ChainFilesTrait;
     use InputTrait;
 
-    /**
-     * @var string
-     */
-    protected $file = null;
-
     /**
      * @var ChainQueue
      */
@@ -83,31 +78,21 @@ public function __construct(
      */
     protected function configure()
     {
-        if (is_null($this->getName())) {
-            $this
-                ->setName('chain')
-                ->setDescription($this->trans('commands.chain.description'));
-        }
-        else {
-            // ChainRegister passes name and file in the constructor.
-            $this
-              ->setName(sprintf('chain:%s', $this->getName()))
-              ->setDescription(sprintf('Custom chain: %s', $this->getName()));
-        }
-
         $this
-        ->addOption(
-            'file',
-            null,
-            InputOption::VALUE_OPTIONAL,
-            $this->trans('commands.chain.options.file')
-        )
-        ->addOption(
-            'placeholder',
-            null,
-            InputOption::VALUE_IS_ARRAY | InputOption::VALUE_OPTIONAL,
-            $this->trans('commands.chain.options.placeholder')
-        );
+            ->setName('chain')
+            ->setDescription($this->trans('commands.chain.description'))
+            ->addOption(
+                'file',
+                null,
+                InputOption::VALUE_OPTIONAL,
+                $this->trans('commands.chain.options.file')
+            )
+            ->addOption(
+                'placeholder',
+                null,
+                InputOption::VALUE_IS_ARRAY | InputOption::VALUE_OPTIONAL,
+                $this->trans('commands.chain.options.placeholder')
+            );
     }
 
     /**
@@ -117,7 +102,7 @@ protected function interact(InputInterface $input, OutputInterface $output)
     {
         $io = new DrupalStyle($input, $output);
         // Check if the constructor passed a value for file.
-        $file = !is_null($this->file) ? $this->file : $input->getOption('file');
+        $file = $input->getOption('file');
 
         if (!$file) {
             $files = $this->getChainFiles(true);
@@ -330,23 +315,15 @@ protected function execute(InputInterface $input, OutputInterface $output)
         return 0;
     }
 
-    /**
-     * Setter for $file.
-     *
-     * @param $file
-     */
-    public function setFile($file) {
-        $this->file = $file;
-    }
-
     /**
      * Helper to load and clean up the chain file.
      *
      * @param string $file The file name
      *
      * @return string $contents The contents of the file
      */
-    function getFileContents($file) {
+    public function getFileContents($file)
+    {
         $contents = file_get_contents($file);
 
         // Remove lines with comments.

src/Command/Chain/ChainRegister.php

@@ -18,76 +18,75 @@
 
 namespace Drupal\Console\Command\Chain;
 
-use Symfony\Component\Console\Input\InputArgument;
-use Symfony\Component\Console\Input\InputOption;
+use Symfony\Component\Console\Input\ArrayInput;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
-use Symfony\Component\Yaml\Parser;
-use Symfony\Component\Console\Application;
-use Drupal\Console\Utils\ConfigurationManager;
+use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Command\Command;
 use Drupal\Console\Command\Shared\ChainFilesTrait;
-use Drupal\Console\Style\DrupalStyle;
+use Drupal\Console\Command\Shared\CommandTrait;
+
 /**
  * Class ChainRegister
  *
  * @package Drupal\Console\Command\ChainRegister
  */
-class ChainRegister extends ChainCommand {
-  use ChainFilesTrait;
+class ChainRegister extends Command
+{
+    use CommandTrait;
+    use ChainFilesTrait;
 
-  /**
+    protected $name;
+
+    protected $file;
+
+    /**
    * ChainRegister constructor.
    *
-   * @param $name Chain name
-   * @param $file File name
+   * @param $name
+   * @param $file
    */
-  public function __construct($name, $file) {
-    $this->setName($name);
-    $this->setFile($file);
+    public function __construct($name, $file)
+    {
+        $this->name = $name;
+        $this->file = $file;
 
-    parent::__construct();
-  }
+        parent::__construct();
+    }
 
-  /**
+    /**
    * {@inheritdoc}
    */
-  protected function configure() {
-    parent::configure();
-  }
+    protected function configure()
+    {
+        $this
+            ->setName($this->name)
+            ->setDescription(sprintf('Custom chain command (%s)', $this->name))
+            ->addOption(
+                'placeholder',
+                null,
+                InputOption::VALUE_IS_ARRAY | InputOption::VALUE_OPTIONAL,
+                $this->trans('commands.chain.options.placeholder')
+            );
+    }
 
-  /**
+    /**
    * {@inheritdoc}
    */
-  protected function execute(InputInterface $input, OutputInterface $output) {
-    parent::interact($input, $output);
-
-    $io = new DrupalStyle($input, $output);
-
-    // Populate placeholders.
-    $placeholders = '';
-    foreach ($input->getOption('placeholder') as $placeholder) {
-      $placeholders .= sprintf('--placeholder="%s" ',
-        $placeholder
-      );
-    }
-
-    $command = sprintf('drupal chain --file %s %s',
-      $this->file,
-      $placeholders
-    );
+    protected function execute(InputInterface $input, OutputInterface $output)
+    {
+        $command = $this->getApplication()->find('chain');
 
-    // Run.
-    $shellProcess = $this->get('shell_process');
+        $arguments = [
+            'command' => 'chain',
+            '--file'  => $this->file,
+            '--placeholder'  => $input->getOption('placeholder'),
+            '--generate-inline'  => $input->hasOption('generate-inline'),
+            '--no-interaction'  => $input->hasOption('no-interaction')
+        ];
 
-    if (!$shellProcess->exec($command, TRUE)) {
-      $io->error(
-        sprintf(
-          $this->trans('commands.exec.messages.invalid-bin')
-        )
-      );
+        $commandInput = new ArrayInput($arguments);
 
-      return 1;
+        return $command->run($commandInput, $output);
     }
-  }
 }