Renamed method

src/Runtime/Runtime.php

@@ -234,14 +234,13 @@ class Runtime
      * the global one (environment specific overrides the global one if present).
      *
      * @param       $key
-     * @param null $defaultEnv
-     * @param null $defaultConfig
+     * @param array $defaultEnv
      *
      * @return array
      */
-    public function getMergedEnvAndConfigOption($key, $defaultEnv = null, $defaultConfig = null)
+    public function getMergedOption($key, $defaultEnv = [])
     {
-        $userGlobalOptions = $this->getConfigOption($key, $defaultConfig);
+        $userGlobalOptions = $this->getConfigOption($key, $defaultEnv);
         $userEnvOptions = $this->getEnvOption($key, $defaultEnv);
 
         return array_merge(

src/Task/BuiltIn/Composer/DumpAutoloadTask.php

@@ -45,7 +45,7 @@ class DumpAutoloadTask extends AbstractTask
     {
         $options = array_merge(
             ['path' => 'composer', 'flags' => '--optimize'],
-            $this->runtime->getMergedEnvAndConfigOption('composer', [], []),
+            $this->runtime->getMergedOption('composer'),
             $this->options
         );
 

src/Task/BuiltIn/Composer/InstallTask.php

@@ -45,7 +45,7 @@ class InstallTask extends AbstractTask
     {
         $options = array_merge(
             ['path' => 'composer', 'flags' => '--optimize-autoloader'],
-            $this->runtime->getMergedEnvAndConfigOption('composer', [], []),
+            $this->runtime->getMergedOption('composer'),
             $this->options
         );
 

src/Task/BuiltIn/Symfony/AsseticDumpTask.php

@@ -45,7 +45,7 @@ class AsseticDumpTask extends AbstractTask
     {
         $options = array_merge(
             ['console' => 'bin/console', 'env' => 'dev', 'flags' => ''],
-            $this->runtime->getMergedEnvAndConfigOption('symfony', [], []),
+            $this->runtime->getMergedOption('symfony'),
             $this->options
         );
 

src/Task/BuiltIn/Symfony/AssetsInstallTask.php

@@ -45,7 +45,7 @@ class AssetsInstallTask extends AbstractTask
     {
         $options = array_merge(
             ['console' => 'bin/console', 'env' => 'dev', 'target' => 'web', 'flags' => '--symlink --relative'],
-            $this->runtime->getMergedEnvAndConfigOption('symfony', [], []),
+            $this->runtime->getMergedOption('symfony'),
             $this->options
         );
 

src/Task/BuiltIn/Symfony/CacheClearTask.php

@@ -45,7 +45,7 @@ class CacheClearTask extends AbstractTask
     {
         $options = array_merge(
             ['console' => 'bin/console', 'env' => 'dev', 'flags' => ''],
-            $this->runtime->getMergedEnvAndConfigOption('symfony', [], []),
+            $this->runtime->getMergedOption('symfony'),
             $this->options
         );
 

src/Task/BuiltIn/Symfony/CacheWarmupTask.php

@@ -45,7 +45,7 @@ class CacheWarmupTask extends AbstractTask
     {
         $options = array_merge(
             ['console' => 'bin/console', 'env' => 'dev', 'flags' => ''],
-            $this->runtime->getMergedEnvAndConfigOption('symfony', [], []),
+            $this->runtime->getMergedOption('symfony'),
             $this->options
         );