hauke/Magallanes
1
0
Fork 0
mirror of https://github.com/hauke68/Magallanes.git synced 2026-09-05 00:48:57 +02:00
Code Issues Releases Wiki Activity

PSR-2 Fixer

Browse Source
This commit is contained in:
Andrés Montañez
2015-04-12 16:13:06 -03:00
parent 288d7304be
commit a0f4920333
30 changed files with 68 additions and 131 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Mage/Task/BuiltIn/Deployment/ReleaseTask.php
-1
View File
@@ -98,7 +98,6 @@ class ReleaseTask extends AbstractTask implements IsReleaseAware, SkipOnOverride
}
return $result;
} else {
return false;
}
Mage/Task/BuiltIn/Deployment/Strategy/RsyncTask.php
+2 -2
View File
@@ -100,7 +100,7 @@ class RsyncTask extends BaseStrategyTaskAbstract implements IsReleaseAware
. $this->excludes($excludes) . ' '
. $this->excludesListFile($excludesListFilePath) . ' '
. $this->getConfig()->deployment('from') . ' '
. ( $this->getConfig()->deployment('user') ? $this->getConfig()->deployment('user') . '@' : '' )
. ($this->getConfig()->deployment('user') ? $this->getConfig()->deployment('user') . '@' : '')
. $this->getConfig()->getHostName() . ':' . $deployToDirectory;
$result = $this->runCommandLocal($command);
@@ -132,7 +132,7 @@ class RsyncTask extends BaseStrategyTaskAbstract implements IsReleaseAware
protected function excludesListFile($excludesFile)
{
$excludesListFileRsync = '';
if(!empty($excludesFile) && file_exists($excludesFile) && is_file($excludesFile) && is_readable($excludesFile)) {
if (!empty($excludesFile) && file_exists($excludesFile) && is_file($excludesFile) && is_readable($excludesFile)) {
$excludesListFileRsync = ' --exclude-from=' . $excludesFile;
}
return $excludesListFileRsync;
Mage/Task/BuiltIn/Deployment/Strategy/TarGzTask.php
+3 -2
View File
@@ -46,7 +46,8 @@ class TarGzTask extends BaseStrategyTaskAbstract implements IsReleaseAware
$this->checkOverrideRelease();
$excludes = $this->getExcludes();
$excludesListFilePath = $this->getConfig()->deployment('excludes_file', '');;
$excludesListFilePath = $this->getConfig()->deployment('excludes_file', '');
;
// If we are working with releases
$deployToDirectory = $this->getConfig()->deployment('to');
@@ -131,7 +132,7 @@ class TarGzTask extends BaseStrategyTaskAbstract implements IsReleaseAware
protected function excludesListFile($excludesFile)
{
$excludesListFileRsync = '';
if(!empty($excludesFile) && file_exists($excludesFile) && is_file($excludesFile) && is_readable($excludesFile)) {
if (!empty($excludesFile) && file_exists($excludesFile) && is_file($excludesFile) && is_readable($excludesFile)) {
$excludesListFileRsync = ' --exclude-from=' . $excludesFile;
}
return $excludesListFileRsync;