Change alternatives from string to array

Fix phpcs errors
ChromaticHQ · Sep 15, 2023 · 0ade565 · 0ade565
1 parent 34f60d1
commit 0ade565
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 14 deletions.
diff --git a/src/Robo/Plugin/Commands/DevelopmentModeBaseCommands.php b/src/Robo/Plugin/Commands/DevelopmentModeBaseCommands.php
@@ -132,6 +132,7 @@ public function databaseRefreshTugboat(): ResultData
             try {
                 $dbPath = $this->databaseDownload($siteName);
             } catch (TaskException $te) {
+                $this->yell("$siteName: No database configured. Download/import skipped.");
                 $result_data->append($te->getMessage());
                 // @todo: Should we run a site-install by default?
                 continue;

diff --git a/src/Robo/Task/Discovery/Alternatives.php b/src/Robo/Task/Discovery/Alternatives.php
@@ -4,6 +4,7 @@
 
 use Robo\Task\BaseTask;
 use Robo\Result;
+use Robo\ResultData;
 
 /**
  * Use this to figure out which binary to use from a series of alternatives.
@@ -21,9 +22,9 @@
 class Alternatives extends BaseTask
 {
     /**
-     * @var string
+     * @var array
      */
-    protected string $alternatives;
+    protected array $alternatives;
 
     /**
      * @var string
@@ -40,11 +41,11 @@ class Alternatives extends BaseTask
      *
      * @param string $command
      *   The preferred binary or path to binary to execute.
-     * @param string $alternatives
-     *   A comma-separated list of alternative binaries or paths to binaries to
+     * @param array $alternatives
+     *   A list of alternative binaries or paths to binaries to
      *   execute.
      */
-    public function __construct(string $command, string $alternatives)
+    public function __construct(string $command, array $alternatives)
     {
         $this->command = $command;
         $this->alternatives = $alternatives;
@@ -56,17 +57,17 @@ public function __construct(string $command, string $alternatives)
      * The array returned by Result::getData() will always contain a 'path'
      *   property, even if empty.
      */
-    public function run(): Result
+    public function run(): Result|ResultData
     {
         $this->printTaskInfo("Resolving binary for {$this->command}...");
         if (@file_exists($this->command) && is_executable($this->command)) {
             return Result::success($this, "Found {$this->command}", ['path' => $this->command]);
         }
         $output = [];
-        $result_code = NULL;
-        $alternatives = explode(',', $this->alternatives);
-        array_unshift($alternatives, $this->command);
-        foreach ($alternatives as $alternative) {
+        $result_code = null;
+
+        array_unshift($this->alternatives, $this->command);
+        foreach ($this->alternatives as $alternative) {
             $arg = escapeshellarg($alternative);
             exec("which $arg", $output, $result_code);
             if ($result_code === static::SHELL_SUCCESS) {
@@ -76,5 +77,4 @@ public function run(): Result
         $this->printTaskWarning('Could not resolve any of the executables suggested.');
         return Result::cancelled('Could not resolve any of the executables suggested.', ['path' => '']);
     }
-
 }
diff --git a/src/Robo/Task/Discovery/Tasks.php b/src/Robo/Task/Discovery/Tasks.php
@@ -5,12 +5,13 @@
 trait Tasks
 {
     /**
-     * @param string|string[] $dirs
+     * @param string $command
+     * @param array $alternatives
      *
      * @return \Usher\Robo\Task\Discovery\Alternatives|\Robo\Collection\CollectionBuilder
      */
-    protected function taskAlternatives($dirs)
+    protected function taskAlternatives(string $command, array $alternatives)
     {
-        return $this->task(Alternatives::class, $dirs);
+        return $this->task(Alternatives::class, $command, $alternatives);
     }
 }