mirror of
https://github.com/andres-montanez/Magallanes
synced 2024-06-09 09:12:16 +02:00
Renamed method
This commit is contained in:
parent
b2099105fc
commit
532a3146b0
|
@ -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(
|
||||
|
|
|
@ -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
|
||||
);
|
||||
|
||||
|
|
|
@ -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
|
||||
);
|
||||
|
||||
|
|
|
@ -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
|
||||
);
|
||||
|
||||
|
|
|
@ -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
|
||||
);
|
||||
|
||||
|
|
|
@ -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
|
||||
);
|
||||
|
||||
|
|
|
@ -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
|
||||
);
|
||||
|
||||
|
|
Loading…
Reference in a new issue