hauke/Magallanes
1
0
Fork 0
mirror of https://github.com/hauke68/Magallanes.git synced 2026-08-29 10:38:57 +02:00
Code Issues Releases Wiki Activity

Renamed method

Browse Source
This commit is contained in:
Yanick Witschi
2017-02-03 08:43:24 +01:00
parent b2099105fc
commit 532a3146b0
7 changed files with 10 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Runtime/Runtime.php
+4 -5
View File
@@ -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(