From 0bb6944c42971c7675543365064b24c87409dd31 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9s=20Monta=C3=B1ez?= <andresmontanez@gmail.com>
Date: Sat, 31 Dec 2016 17:35:16 -0300
Subject: [PATCH] [Nostromo] Tweak Tasks

---
 src/Mage/Task/AbstractTask.php                          | 3 +++
 src/Mage/Task/BuiltIn/Composer/GenerateAutoloadTask.php | 3 ++-
 src/Mage/Task/BuiltIn/Composer/InstallTask.php          | 3 ++-
 src/Mage/Task/BuiltIn/Symfony/AsseticDumpTask.php       | 3 ++-
 src/Mage/Task/BuiltIn/Symfony/AssetsInstallTask.php     | 3 ++-
 src/Mage/Task/BuiltIn/Symfony/CacheClearTask.php        | 3 ++-
 src/Mage/Task/BuiltIn/Symfony/CacheWarmupTask.php       | 3 ++-
 7 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/src/Mage/Task/AbstractTask.php b/src/Mage/Task/AbstractTask.php
index 645da30..0ee7c2f 100644
--- a/src/Mage/Task/AbstractTask.php
+++ b/src/Mage/Task/AbstractTask.php
@@ -58,6 +58,9 @@ abstract class AbstractTask
      */
     public function setOptions($options = [])
     {
+        if (!is_array($options)) {
+            $options = [];
+        }
         $this->options = $options;
         return $this;
     }
diff --git a/src/Mage/Task/BuiltIn/Composer/GenerateAutoloadTask.php b/src/Mage/Task/BuiltIn/Composer/GenerateAutoloadTask.php
index d0a9255..4ce0e4d 100644
--- a/src/Mage/Task/BuiltIn/Composer/GenerateAutoloadTask.php
+++ b/src/Mage/Task/BuiltIn/Composer/GenerateAutoloadTask.php
@@ -35,9 +35,10 @@ class GenerateAutoloadTask extends AbstractTask
 
     protected function getOptions()
     {
+        $userOptions = $this->runtime->getConfigOptions('composer', []);
         $options = array_merge(
             ['path' => 'composer', 'flags' => '--optimize'],
-            $this->runtime->getConfigOptions('composer', []),
+            (is_array($userOptions) ? $userOptions : []),
             $this->options
         );
 
diff --git a/src/Mage/Task/BuiltIn/Composer/InstallTask.php b/src/Mage/Task/BuiltIn/Composer/InstallTask.php
index 74f1cab..51fd266 100644
--- a/src/Mage/Task/BuiltIn/Composer/InstallTask.php
+++ b/src/Mage/Task/BuiltIn/Composer/InstallTask.php
@@ -35,9 +35,10 @@ class InstallTask extends AbstractTask
 
     protected function getOptions()
     {
+        $userOptions = $this->runtime->getConfigOptions('composer', []);
         $options = array_merge(
             ['path' => 'composer', 'flags' => '--dev'],
-            $this->runtime->getConfigOptions('composer', []),
+            (is_array($userOptions) ? $userOptions : []),
             $this->options
         );
 
diff --git a/src/Mage/Task/BuiltIn/Symfony/AsseticDumpTask.php b/src/Mage/Task/BuiltIn/Symfony/AsseticDumpTask.php
index 6f7eadc..9d5de74 100644
--- a/src/Mage/Task/BuiltIn/Symfony/AsseticDumpTask.php
+++ b/src/Mage/Task/BuiltIn/Symfony/AsseticDumpTask.php
@@ -43,9 +43,10 @@ class AsseticDumpTask extends AbstractTask
 
     protected function getOptions()
     {
+        $userOptions = $this->runtime->getConfigOptions('symfony', []);
         $options = array_merge(
             ['path' => 'bin/console', 'env' => 'dev', 'flags' => ''],
-            $this->runtime->getConfigOptions('symfony', []),
+            (is_array($userOptions) ? $userOptions : []),
             $this->options
         );
 
diff --git a/src/Mage/Task/BuiltIn/Symfony/AssetsInstallTask.php b/src/Mage/Task/BuiltIn/Symfony/AssetsInstallTask.php
index 2f0b994..42d5293 100644
--- a/src/Mage/Task/BuiltIn/Symfony/AssetsInstallTask.php
+++ b/src/Mage/Task/BuiltIn/Symfony/AssetsInstallTask.php
@@ -43,9 +43,10 @@ class AssetsInstallTask extends AbstractTask
 
     protected function getOptions()
     {
+        $userOptions = $this->runtime->getConfigOptions('symfony', []);
         $options = array_merge(
             ['path' => 'bin/console', 'env' => 'dev', 'target' => 'web', 'flags' => '--symlink --relative'],
-            $this->runtime->getConfigOptions('symfony', []),
+            (is_array($userOptions) ? $userOptions : []),
             $this->options
         );
 
diff --git a/src/Mage/Task/BuiltIn/Symfony/CacheClearTask.php b/src/Mage/Task/BuiltIn/Symfony/CacheClearTask.php
index a781ab4..3bda724 100644
--- a/src/Mage/Task/BuiltIn/Symfony/CacheClearTask.php
+++ b/src/Mage/Task/BuiltIn/Symfony/CacheClearTask.php
@@ -43,9 +43,10 @@ class CacheClearTask extends AbstractTask
 
     protected function getOptions()
     {
+        $userOptions = $this->runtime->getConfigOptions('symfony', []);
         $options = array_merge(
             ['path' => 'bin/console', 'env' => 'dev', 'flags' => ''],
-            $this->runtime->getConfigOptions('symfony', []),
+            (is_array($userOptions) ? $userOptions : []),
             $this->options
         );
 
diff --git a/src/Mage/Task/BuiltIn/Symfony/CacheWarmupTask.php b/src/Mage/Task/BuiltIn/Symfony/CacheWarmupTask.php
index ad0de15..fbf051f 100644
--- a/src/Mage/Task/BuiltIn/Symfony/CacheWarmupTask.php
+++ b/src/Mage/Task/BuiltIn/Symfony/CacheWarmupTask.php
@@ -43,9 +43,10 @@ class CacheWarmupTask extends AbstractTask
 
     protected function getOptions()
     {
+        $userOptions = $this->runtime->getConfigOptions('symfony', []);
         $options = array_merge(
             ['path' => 'bin/console', 'env' => 'dev', 'flags' => ''],
-            $this->runtime->getConfigOptions('symfony', []),
+            (is_array($userOptions) ? $userOptions : []),
             $this->options
         );