[chain] Improve chain discovery strategy. (#297)

dist/chain/create-data.yml

@@ -1,3 +1,6 @@
+command:
+  name: create:data
+  description: 'Create dummy data'
 commands:
   # Create dummy data
   - command: create:users

dist/chain/form-sample.yml

@@ -1,3 +1,6 @@
+command:
+  name: generate:form:example
+  description: 'Generate form example'
 commands:
   - command: generate:form:config
     options:

dist/chain/sample.yml

@@ -1,3 +1,6 @@
+command:
+  name: generate:example:module
+  description: 'Generate example module'
 commands:
   - command: generate:module
     options:

dist/chain/site-install-placeholers-env.yml

@@ -1,14 +1,17 @@
+command:
+  name: site:install:env
+  description: 'Install site using environment placeholders'
 commands:
   # Install Drupal
   - command: site:install
     options:
       langcode: en
-      db-type: '%env(DATABASE_TYPE)%'
-      db-host: '%env(DATABASE_HOST)%'
-      db-name: '%env(DATABASE_NAME)%'
-      db-user: '%env(DATABASE_USER)%'
-      db-pass: '%env(DATABASE_PASSWORD)%'
-      db-port: '%env(DATABASE_PORT)%'
+      db-type: '{{ env("DATABASE_TYPE") }}'
+      db-host: '{{ env("DATABASE_HOST") }}'
+      db-name: '{{ env("DATABASE_NAME") }}'
+      db-user: '{{ env("DATABASE_USER") }}'
+      db-pass: '{{ env("DATABASE_PASSWORD") }}'
+      db-port: '{{ env("DATABASE_PORT") }}'
       site-name: 'Drupal 8 site'
       site-mail: admin@example.org # default email
       account-name: admin # default account

dist/chain/site-install-placeholers.yml

@@ -1,3 +1,6 @@
+command:
+  name: site:install:inline
+  description: 'Install site using inline placeholders'
 vars:
   db_type: mysql
   db_host: 127.0.0.1

dist/chain/site-install.yml

@@ -1,3 +1,6 @@
+command:
+  name: site:install:sqlite
+  description: 'Install site using sqlite'
 commands:
   # Install Drupal
   - command: site:install

dist/chain/site-update.yml

@@ -1,3 +1,6 @@
+command:
+  name: site:update
+  description: 'Execute update commands'
 commands:
   # Backup current database
   - command: database:dump
@@ -9,6 +12,8 @@ commands:
   - command: update:execute
     arguments:
         module: 'all'
+  # Run pending update entities
+  - command: update:entities
   # Rebuild caches
   - command: cache:rebuild
     arguments:

services.yml

@@ -26,7 +26,7 @@ services:
       class: Drupal\Console\Core\Utils\StringConverter
   console.chain_discovery:
     class: Drupal\Console\Core\Utils\ChainDiscovery
-    arguments: ['@console.root', '@console.configuration_manager']
+    arguments: ['@console.root', '@console.configuration_manager', '@console.message_manager', '@console.translator_manager']
   console.count_code_lines:
     class: Drupal\Console\Core\Utils\CountCodeLines
   console.message_manager:

src/Application.php

@@ -199,7 +199,6 @@ public function doRun(InputInterface $input, OutputInterface $output)
             $input,
             $output
         );
-
         if ($this->showMessages($input)) {
             $messages = $messageManager->getMessages();
 
@@ -209,6 +208,7 @@ public function doRun(InputInterface $input, OutputInterface $output)
             }
         }
 
+
         return $code;
     }
 

src/Command/Chain/BaseCommand.php

@@ -31,6 +31,7 @@ public function __construct(
     ) {
         $this->chainDiscovery = $chainDiscovery;
         parent::__construct();
+        $this->ignoreValidationErrors();
     }
 
     protected function initialize(
@@ -93,11 +94,11 @@ protected function getFileOption()
         $file = $input->getOption('file');
 
         if (!$file) {
-            $files = $this->chainDiscovery->getChainFiles(true);
+            $files = array_keys($this->chainDiscovery->getFiles());
 
             $file = $this->getIo()->choice(
                 $this->trans('commands.chain.questions.chain-file'),
-                array_values($files)
+                $files
             );
         }
 

src/Command/Chain/ChainCommand.php

@@ -102,6 +102,17 @@ protected function interact(InputInterface $input, OutputInterface $output)
                     $inlinePlaceHolderValue
                 );
             }
+
+            if (!$input->hasOption($inlinePlaceHolder)) {
+                $this->addOption(
+                    $inlinePlaceHolder,
+                    null,
+                    InputOption::VALUE_OPTIONAL,
+                    null,
+                    null
+                );
+            }
+
             $input->setOption($inlinePlaceHolder, $placeHolderValue);
         }
     }

src/Command/Debug/ChainCommand.php

@@ -53,19 +53,24 @@ protected function configure()
      */
     protected function execute(InputInterface $input, OutputInterface $output)
     {
-        $files = $this->chainDiscovery->getChainFiles();
+        $files = $this->chainDiscovery->getFiles();
+        $filesPerDirectory = $this->chainDiscovery->getFilesPerDirectory();
 
-        foreach ($files as $directory => $chainFiles) {
-            $this->getIo()->info($this->trans('commands.debug.chain.messages.directory'), false);
+        foreach ($filesPerDirectory as $directory => $fileNames) {
+            $this->getIo()->info(' ' . $this->trans('commands.debug.chain.messages.directory'), false);
             $this->getIo()->comment($directory);
 
             $tableHeader = [
-                $this->trans('commands.debug.chain.messages.file')
+                $this->trans('commands.debug.chain.messages.file'),
+                $this->trans('commands.debug.chain.messages.command')
             ];
 
             $tableRows = [];
-            foreach ($chainFiles as $file) {
-                $tableRows[] = $file;
+            foreach ($fileNames as $file) {
+                $tableRows[] = [
+                    'file'  => $file,
+                    'command' => $files[$directory.$file]['command']
+                ];
             }
 
             $this->getIo()->table($tableHeader, $tableRows);

src/Command/ListCommand.php

@@ -64,6 +64,8 @@ protected function execute(InputInterface $input, OutputInterface $output)
                 'command' => $this->getApplication()->find($commandName)
             ]
         );
+
+        $this->getIo()->newLine();
     }
 
     /**