From 532a3146b07ea9eeeaf979e8b0228c4d0d4895d3 Mon Sep 17 00:00:00 2001
From: Yanick Witschi <yanick.witschi@terminal42.ch>
Date: Fri, 3 Feb 2017 08:43:24 +0100
Subject: [PATCH] Renamed method

---
 src/Runtime/Runtime.php                        | 9 ++++-----
 src/Task/BuiltIn/Composer/DumpAutoloadTask.php | 2 +-
 src/Task/BuiltIn/Composer/InstallTask.php      | 2 +-
 src/Task/BuiltIn/Symfony/AsseticDumpTask.php   | 2 +-
 src/Task/BuiltIn/Symfony/AssetsInstallTask.php | 2 +-
 src/Task/BuiltIn/Symfony/CacheClearTask.php    | 2 +-
 src/Task/BuiltIn/Symfony/CacheWarmupTask.php   | 2 +-
 7 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/src/Runtime/Runtime.php b/src/Runtime/Runtime.php
index 8952c37..a9b2c24 100644
--- a/src/Runtime/Runtime.php
+++ b/src/Runtime/Runtime.php
@@ -233,15 +233,14 @@ class Runtime
      * Shortcut to get the the configuration option for a specific environment and merge it with
      * the global one (environment specific overrides the global one if present).
      *
-     * @param      $key
-     * @param null $defaultEnv
-     * @param null $defaultConfig
+     * @param       $key
+     * @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(
diff --git a/src/Task/BuiltIn/Composer/DumpAutoloadTask.php b/src/Task/BuiltIn/Composer/DumpAutoloadTask.php
index 39e44da..9078283 100644
--- a/src/Task/BuiltIn/Composer/DumpAutoloadTask.php
+++ b/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
         );
 
diff --git a/src/Task/BuiltIn/Composer/InstallTask.php b/src/Task/BuiltIn/Composer/InstallTask.php
index 5596864..7a63672 100644
--- a/src/Task/BuiltIn/Composer/InstallTask.php
+++ b/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
         );
 
diff --git a/src/Task/BuiltIn/Symfony/AsseticDumpTask.php b/src/Task/BuiltIn/Symfony/AsseticDumpTask.php
index 3229721..3f23d19 100644
--- a/src/Task/BuiltIn/Symfony/AsseticDumpTask.php
+++ b/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
         );
 
diff --git a/src/Task/BuiltIn/Symfony/AssetsInstallTask.php b/src/Task/BuiltIn/Symfony/AssetsInstallTask.php
index 8f313ef..001d100 100644
--- a/src/Task/BuiltIn/Symfony/AssetsInstallTask.php
+++ b/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
         );
 
diff --git a/src/Task/BuiltIn/Symfony/CacheClearTask.php b/src/Task/BuiltIn/Symfony/CacheClearTask.php
index f9df326..a0b6475 100644
--- a/src/Task/BuiltIn/Symfony/CacheClearTask.php
+++ b/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
         );
 
diff --git a/src/Task/BuiltIn/Symfony/CacheWarmupTask.php b/src/Task/BuiltIn/Symfony/CacheWarmupTask.php
index f0b6229..8584beb 100644
--- a/src/Task/BuiltIn/Symfony/CacheWarmupTask.php
+++ b/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
         );