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

Added a a helper method to the runtime that merges env specific options with global ones

Browse Source
This commit is contained in:
Yanick Witschi
2017-02-01 15:23:31 +01:00
parent b7ecc97523
commit dc48f19b26
5 changed files with 25 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Task/BuiltIn/Symfony/AsseticDumpTask.php
+1 -4
View File
@@ -43,12 +43,9 @@ class AsseticDumpTask extends AbstractTask
protected function getOptions()
{
$userGlobalOptions = $this->runtime->getConfigOption('symfony', []);
$userEnvOptions = $this->runtime->getEnvOption('symfony', []);
$options = array_merge(
['console' => 'bin/console', 'env' => 'dev', 'flags' => ''],
(is_array($userGlobalOptions) ? $userGlobalOptions : []),
(is_array($userEnvOptions) ? $userEnvOptions : []),
$this->runtime->getMergedEnvAndConfigOption('symfony', [], []),
$this->options
);
src/Task/BuiltIn/Symfony/AssetsInstallTask.php
+1 -4
View File
@@ -43,12 +43,9 @@ class AssetsInstallTask extends AbstractTask
protected function getOptions()
{
$userGlobalOptions = $this->runtime->getConfigOption('symfony', []);
$userEnvOptions = $this->runtime->getEnvOption('symfony', []);
$options = array_merge(
['console' => 'bin/console', 'env' => 'dev', 'target' => 'web', 'flags' => '--symlink --relative'],
(is_array($userGlobalOptions) ? $userGlobalOptions : []),
(is_array($userEnvOptions) ? $userEnvOptions : []),
$this->runtime->getMergedEnvAndConfigOption('symfony', [], []),
$this->options
);
src/Task/BuiltIn/Symfony/CacheClearTask.php
+1 -4
View File
@@ -43,12 +43,9 @@ class CacheClearTask extends AbstractTask
protected function getOptions()
{
$userGlobalOptions = $this->runtime->getConfigOption('symfony', []);
$userEnvOptions = $this->runtime->getEnvOption('symfony', []);
$options = array_merge(
['console' => 'bin/console', 'env' => 'dev', 'flags' => ''],
(is_array($userGlobalOptions) ? $userGlobalOptions : []),
(is_array($userEnvOptions) ? $userEnvOptions : []),
$this->runtime->getMergedEnvAndConfigOption('symfony', [], []),
$this->options
);
src/Task/BuiltIn/Symfony/CacheWarmupTask.php
+1 -4
View File
@@ -43,12 +43,9 @@ class CacheWarmupTask extends AbstractTask
protected function getOptions()
{
$userGlobalOptions = $this->runtime->getConfigOption('symfony', []);
$userEnvOptions = $this->runtime->getEnvOption('symfony', []);
$options = array_merge(
['console' => 'bin/console', 'env' => 'dev', 'flags' => ''],
(is_array($userGlobalOptions) ? $userGlobalOptions : []),
(is_array($userEnvOptions) ? $userEnvOptions : []),
$this->runtime->getMergedEnvAndConfigOption('symfony', [], []),
$this->options
);