DQA-0: Cover command options configs.

resources/git/hooks/pre-commit

@@ -3,7 +3,7 @@
 # Called by "git commit" with no arguments. The hook should exit with non-zero
 # status after issuing an appropriate message if it wants to stop the commit.
 #
-# This hook should execute the PHPcs agaisnt the modified files.
+# This hook should execute the PHPcs against the modified files.
 #
 
 ./vendor/bin/run toolkit:hooks-run `basename "$0"`

src/TaskRunner/AbstractCommands.php

@@ -32,16 +32,6 @@ public function getConfigurationFile()
         return Toolkit::getToolkitRoot() . '/config/base.yml';
     }
 
-    /**
-     * Command initialization.
-     *
-     * @hook pre-command-event *
-     */
-    public function initializeRuntimeConfiguration()
-    {
-        Robo::loadConfiguration([$this->getConfigurationFile()], $this->getConfig());
-    }
-
     /**
      * Validate and return the path to given bin.
      *

src/TaskRunner/Runner.php

@@ -34,7 +34,6 @@ class Runner
 
     public const APPLICATION_NAME = 'Toolkit Runner';
     public const REPOSITORY = 'ec-europa/toolkit';
-    public const CONFIG_DIR_KEY = 'runner.config_dir';
 
     /**
      * The input.
@@ -85,6 +84,13 @@ class Runner
      */
     private $workingDir;
 
+    /**
+     * The loaded command classes.
+     *
+     * @var array
+     */
+    private array $commandClasses;
+
     /**
      * Configurations that can be replaced by a project.
      *
@@ -147,8 +153,8 @@ public function __construct(ClassLoader $classLoader, InputInterface $input, Out
      */
     public function run()
     {
-        $classes = $this->discoverCommandClasses();
-        $this->runner->registerCommandClasses($this->application, $classes);
+        $this->commandClasses = $this->discoverCommandClasses();
+        $this->runner->registerCommandClasses($this->application, $this->commandClasses);
         $this->prepareConfigurations();
         $this->registerConfigurationCommands();
         return $this->runner->run($this->input, $this->output, $this->application);
@@ -233,6 +239,12 @@ private function prepareConfigurations()
         $files = $this->getConfigDirFilesPaths($tkConfigDir);
         $config = $this->parseConfigFiles($files, $config);
 
+        // Get the command options configurations from loaded command classes.
+        foreach ($this->commandClasses as $commandClass) {
+            $f = $this->runner->getContainer()->get("{$commandClass}Commands")->getConfigurationFile() ?? '';
+            $config = $this->parseConfigFiles([$f], $config);
+        }
+
         // Save the project configurations separately to allow the overrides.
         $projectConfig = [];
         // Load the Project configuration.

src/Toolkit.php

@@ -105,9 +105,9 @@ public static function getNextcloudPass(): string
      */
     public static function filterFolders(array &$files)
     {
-        $files = array_filter($files, function ($folder) {
+        $files = array_values(array_filter($files, function ($folder) {
             return file_exists($folder);
-        });
+        }));
     }
 
     /**

tests/fixtures/commands/configuration.yml

@@ -360,3 +360,49 @@
         - file1
         - file2
     - not_string_contains: src
+
+- command: 'toolkit:test-behat --simulate'
+  configuration: []
+  resources:
+    - file: runner.yml.dist
+      content: |
+        toolkit:
+          test:
+            behat:
+              from: test-behat.yml.dist
+  expectations:
+    - contains: |
+        [Simulator] Simulating Exec('./vendor/bin/run toolkit:install-dependencies')
+        [Simulator] Running ./vendor/bin/run toolkit:install-dependencies
+        [Simulator] Simulating EcEuropa\Toolkit\Task\File\Process('test-behat.yml.dist', 'behat.yml')
+        [Simulator] Running ./vendor/bin/behat --profile=default --strict --dry-run
+        [Simulator] Simulating Exec('./vendor/bin/behat')
+          ->options(array (
+            'profile' => 'default',
+            'strict' => NULL,
+          ), '=')
+        [Simulator] Running ./vendor/bin/behat --profile=default --strict
+
+- command: 'toolkit:test-behat --simulate'
+  configuration: []
+  resources:
+    - touch: test-behat.yml.dist
+    - file: runner.yml.dist
+      content: |
+        command:
+          toolkit:
+            test-behat:
+              options:
+                from: test-behat.yml.dist
+  expectations:
+    - contains: |
+        [Simulator] Simulating Exec('./vendor/bin/run toolkit:install-dependencies')
+        [Simulator] Running ./vendor/bin/run toolkit:install-dependencies
+        [Simulator] Simulating EcEuropa\Toolkit\Task\File\Process('test-behat.yml.dist', 'behat.yml')
+        [Simulator] Running ./vendor/bin/behat --profile=default --strict --dry-run
+        [Simulator] Simulating Exec('./vendor/bin/behat')
+          ->options(array (
+            'profile' => 'default',
+            'strict' => NULL,
+          ), '=')
+        [Simulator] Running ./vendor/bin/behat --profile=default --strict