hauke/Magallanes
1
0
Fork 0
mirror of https://github.com/hauke68/Magallanes.git synced 2025-09-13 04:30:17 +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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/Runtime/Runtime.php
View File

@ -233,15 +233,14 @@ class Runtime
* Shortcut to get the the configuration option for a specific environment and merge it with * 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). * the global one (environment specific overrides the global one if present).
* *
* @param $key * @param $key
* @param null $defaultEnv * @param array $defaultEnv
* @param null $defaultConfig
* *
* @return array * @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); $userEnvOptions = $this->getEnvOption($key, $defaultEnv);
return array_merge( return array_merge(

2
src/Task/BuiltIn/Composer/DumpAutoloadTask.php
View File

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

2
src/Task/BuiltIn/Composer/InstallTask.php
View File

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

2
src/Task/BuiltIn/Symfony/AsseticDumpTask.php
View File

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

2
src/Task/BuiltIn/Symfony/AssetsInstallTask.php
View File

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

2
src/Task/BuiltIn/Symfony/CacheClearTask.php
View File

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

2
src/Task/BuiltIn/Symfony/CacheWarmupTask.php
View File

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