hauke/Magallanes
1
0
Fork 0
mirror of https://github.com/hauke68/Magallanes.git synced 2026-09-08 22:38:56 +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/Releases/ListTask.php
+4 -10
View File
@@ -13,7 +13,6 @@ namespace Mage\Task\BuiltIn\Releases;
use Mage\Console;
use Mage\Task\AbstractTask;
use Mage\Task\Releases\IsReleaseAware;
use DateTime;
/**
@@ -87,7 +86,6 @@ class ListTask extends AbstractTask implements IsReleaseAware
Console::output('');
return $result;
} else {
Console::output('');
return false;
@@ -109,32 +107,28 @@ class ListTask extends AbstractTask implements IsReleaseAware
if ($diff->format('%a') <= 7) {
if ($diff->format('%d') == 7) {
$textDiff = ' [a week ago] ';
} else if ($diff->format('%d') > 0 && $diff->format('%d') < 7) {
} elseif ($diff->format('%d') > 0 && $diff->format('%d') < 7) {
$days = $diff->format('%d');
if ($days <= 1) {
$textDiff = ' [one day ago] ';
} else {
$textDiff = ' [' . $days . ' days ago] ';
}
} else if ($diff->format('%d') == 0 && $diff->format('%h') > 0) {
} elseif ($diff->format('%d') == 0 && $diff->format('%h') > 0) {
$hours = $diff->format('%h');
if ($hours <= 1) {
$textDiff = ' [one hour ago] ';
} else {
$textDiff = ' [' . $hours . ' hours ago] ';
}
} else if ($diff->format('%d') == 0 && $diff->format('%h') == 0) {
} elseif ($diff->format('%d') == 0 && $diff->format('%h') == 0) {
$minutes = $diff->format('%i');
if ($minutes <= 1) {
$textDiff = ' [one minute ago] ';
} else {
$textDiff = ' [' . $minutes . ' minutes ago] ';
}
} else if ($diff->format('%d') == 0 && $diff->format('%h') == 0 && $diff->format('%i') == 0) {
} elseif ($diff->format('%d') == 0 && $diff->format('%h') == 0 && $diff->format('%i') == 0) {
$seconds = $diff->format('%s');
if ($seconds < 10) {
$textDiff = ' [just now!] ';
Mage/Task/BuiltIn/Releases/RollbackTask.php
+4 -8
View File
@@ -61,12 +61,11 @@ class RollbackTask extends AbstractTask implements IsReleaseAware
if (count($releases) == 0) {
Console::output('Release are not available for <bold>' . $this->getConfig()->getHost() . '</bold> ... <red>FAIL</red>');
} else {
rsort($releases);
$deleteCurrent = $this->getConfig()->getParameter('deleteCurrent',
$this->getConfig()->deployment('delete-on-rollback',
$this->getConfig()->general('delete-on-rollback',false)
$this->getConfig()->general('delete-on-rollback', false)
)
);
@@ -74,8 +73,7 @@ class RollbackTask extends AbstractTask implements IsReleaseAware
if ($this->getReleaseId() == '') {
$releaseId = $releases[0];
$releaseIsAvailable = true;
} else if ($this->getReleaseId() <= 0) {
} elseif ($this->getReleaseId() <= 0) {
$index = $this->getReleaseId() * -1;
if (isset($releases[$index])) {
$releaseId = $releases[$index];
@@ -92,7 +90,6 @@ class RollbackTask extends AbstractTask implements IsReleaseAware
if (!$releaseIsAvailable) {
Console::output('Release <bold>' . $this->getReleaseId() . '</bold> is invalid or unavailable for <bold>' . $this->getConfig()->getHost() . '</bold> ... <red>FAIL</red>');
} else {
Console::output('Rollback release on <bold>' . $this->getConfig()->getHost() . '</bold>');
$rollbackTo = $releasesDirectory . '/' . $releaseId;
@@ -116,7 +113,7 @@ class RollbackTask extends AbstractTask implements IsReleaseAware
$task->init();
Console::output('Running <purple>' . $task->getName() . '</purple> ... ', 2, false);
if ($task instanceOf RollbackAware) {
if ($task instanceof RollbackAware) {
/* @var $task AbstractTask */
$tasks++;
$result = $task->run();
@@ -166,7 +163,7 @@ class RollbackTask extends AbstractTask implements IsReleaseAware
$task->init();
Console::output('Running <purple>' . $task->getName() . '</purple> ... ', 2, false);
if ($task instanceOf RollbackAware) {
if ($task instanceof RollbackAware) {
/* @var $task AbstractTask */
$tasks++;
$result = $task->run();
@@ -193,7 +190,6 @@ class RollbackTask extends AbstractTask implements IsReleaseAware
}
return $result;
} else {
return false;
}