hauke
/
Magallanes
mirror of https://github.com/hauke68/Magallanes
1
0
Fork 0
Code Issues Releases Wiki Activity
Browse Source

Boolean and Null should be compared strictly.

1.0
Andrés Montañez 10 years ago
parent
5d39e46d9e
commit
f20091afc6
11 changed files with 25 additions and 25 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 10
      Mage/Command/BuiltIn/DeployCommand.php
  2. 2
      Mage/Command/BuiltIn/UpdateCommand.php
  3. 4
      Mage/Console.php
  4. 4
      Mage/Task/AbstractTask.php
  5. 4
      Mage/Task/BuiltIn/Deployment/ReleaseTask.php
  6. 2
      Mage/Task/BuiltIn/Deployment/Strategy/BaseStrategyTaskAbstract.php
  7. 4
      Mage/Task/BuiltIn/Deployment/Strategy/GitRemoteCacheTask.php
  8. 6
      Mage/Task/BuiltIn/Deployment/Strategy/RsyncTask.php
  9. 6
      Mage/Task/BuiltIn/Deployment/Strategy/TarGzTask.php
  10. 2
      Mage/Task/BuiltIn/Releases/ListTask.php
  11. 6
      Mage/Task/BuiltIn/Releases/RollbackTask.php

10
Mage/Command/BuiltIn/DeployCommand.php
Unescape View File

@ -356,7 +356,7 @@ class DeployCommand extends AbstractCommand implements RequiresEnvironment
}
// Releasing
if (self::$deployStatus == self::SUCCEDED && $this->getConfig()->release('enabled', false) == true) {
if (self::$deployStatus == self::SUCCEDED && $this->getConfig()->release('enabled', false) === true) {
// Execute the Releases
Console::output('Starting the <dark_gray>Releasing</dark_gray>');
$completedTasks = 0;
@ -439,7 +439,7 @@ class DeployCommand extends AbstractCommand implements RequiresEnvironment
{
$task->init();
if ($title == null) {
if ($title === null) {
$title = 'Running <purple>' . $task->getName() . '</purple> ... ';
}
Console::output($title, 2, 0);
@ -449,11 +449,11 @@ class DeployCommand extends AbstractCommand implements RequiresEnvironment
$runTask = false;
}
if ($runTask == true) {
if ($runTask === true) {
try {
$result = $task->run();
if ($result == true) {
if ($result === true) {
Console::output('<green>OK</green>', 0);
$result = true;
@ -564,7 +564,7 @@ class DeployCommand extends AbstractCommand implements RequiresEnvironment
case self::DEPLOY_STRATEGY_GUESS:
default:
if ($this->getConfig()->release('enabled', false) == true) {
if ($this->getConfig()->release('enabled', false) === true) {
$deployStrategy = 'deployment/strategy/tar-gz';
} else {
$deployStrategy = 'deployment/strategy/rsync';

2
Mage/Command/BuiltIn/UpdateCommand.php
Unescape View File

@ -35,7 +35,7 @@ class UpdateCommand extends AbstractCommand
Console::output('Updating application via ' . $task->getName() . ' ... ', 1, 0);
$result = $task->run();
if ($result == true) {
if ($result === true) {
Console::output('<green>OK</green>' . PHP_EOL, 0);
$exitCode = 0;

4
Mage/Console.php
Unescape View File

@ -131,7 +131,7 @@ class Console
$command = Factory::get($commandName, $config);
if ($command instanceOf RequiresEnvironment) {
if ($config->getEnvironment() == false) {
if ($config->getEnvironment() === false) {
throw new Exception('You must specify an environment for this command.');
}
}
@ -222,7 +222,7 @@ class Console
public static function log($message)
{
if (self::$logEnabled) {
if (self::$log == null) {
if (self::$log === null) {
self::$logFile = realpath(getcwd() . '/.mage/logs') . '/log-' . date('Ymd-His') . '.log';
self::$log = fopen(self::$logFile, 'w');
}

4
Mage/Task/AbstractTask.php
Unescape View File

@ -181,7 +181,7 @@ abstract class AbstractTask
*/
protected final function runCommandRemote($command, &$output = null, $cdToDirectoryFirst = true)
{
if ($this->getConfig()->release('enabled', false) == true) {
if ($this->getConfig()->release('enabled', false) === true) {
if ($this instanceOf IsReleaseAware) {
$releasesDirectory = '';
@ -238,7 +238,7 @@ abstract class AbstractTask
*/
protected function getReleasesAwareCommand($command)
{
if ($this->getConfig()->release('enabled', false) == true) {
if ($this->getConfig()->release('enabled', false) === true) {
$releasesDirectory = $this->getConfig()->release('directory', 'releases');
$deployToDirectory = $releasesDirectory . '/' . $this->getConfig()->getReleaseId();

4
Mage/Task/BuiltIn/Deployment/ReleaseTask.php
Unescape View File

@ -37,7 +37,7 @@ class ReleaseTask extends AbstractTask implements IsReleaseAware, SkipOnOverride
public function run()
{
$resultFetch = false;
if ($this->getConfig()->release('enabled', false) == true) {
if ($this->getConfig()->release('enabled', false) === true) {
$releasesDirectory = $this->getConfig()->release('directory', 'releases');
$symlink = $this->getConfig()->release('symlink', 'current');
@ -107,7 +107,7 @@ class ReleaseTask extends AbstractTask implements IsReleaseAware, SkipOnOverride
protected function cleanUpReleases()
{
// Count Releases
if ($this->getConfig()->release('enabled', false) == true) {
if ($this->getConfig()->release('enabled', false) === true) {
$releasesDirectory = $this->getConfig()->release('directory', 'releases');
$symlink = $this->getConfig()->release('symlink', 'current');

2
Mage/Task/BuiltIn/Deployment/Strategy/BaseStrategyTaskAbstract.php
Unescape View File

@ -30,7 +30,7 @@ abstract class BaseStrategyTaskAbstract extends AbstractTask implements IsReleas
$overrideRelease = $this->getParameter('overrideRelease', false);
$symlink = $this->getConfig()->release('symlink', 'current');
if ($overrideRelease == true) {
if ($overrideRelease === true) {
$releaseToOverride = false;
$resultFetch = $this->runCommandRemote('ls -ld ' . $symlink . ' | cut -d"/" -f2', $releaseToOverride);
if ($resultFetch && is_numeric($releaseToOverride)) {

4
Mage/Task/BuiltIn/Deployment/Strategy/GitRemoteCacheTask.php
Unescape View File

@ -42,7 +42,7 @@ class GitRemoteCacheTask extends AbstractTask implements IsReleaseAware
{
$overrideRelease = $this->getParameter('overrideRelease', false);
if ($overrideRelease == true) {
if ($overrideRelease === true) {
$releaseToOverride = false;
$resultFetch = $this->runCommandRemote('ls -ld current | cut -d"/" -f2', $releaseToOverride);
if ($resultFetch && is_numeric($releaseToOverride)) {
@ -63,7 +63,7 @@ class GitRemoteCacheTask extends AbstractTask implements IsReleaseAware
$userExcludes = $this->getConfig()->deployment('excludes', array());
$deployToDirectory = $this->getConfig()->deployment('to');
if ($this->getConfig()->release('enabled', false) == true) {
if ($this->getConfig()->release('enabled', false) === true) {
$releasesDirectory = $this->getConfig()->release('directory', 'releases');
$deployToDirectory = rtrim($this->getConfig()->deployment('to'), '/')

6
Mage/Task/BuiltIn/Deployment/Strategy/RsyncTask.php
Unescape View File

@ -27,8 +27,8 @@ class RsyncTask extends BaseStrategyTaskAbstract implements IsReleaseAware
*/
public function getName()
{
if ($this->getConfig()->release('enabled', false) == true) {
if ($this->getConfig()->getParameter('overrideRelease', false) == true) {
if ($this->getConfig()->release('enabled', false) === true) {
if ($this->getConfig()->getParameter('overrideRelease', false) === true) {
return 'Deploy via Rsync (with Releases override) [built-in]';
} else {
$rsync_copy = $this->getConfig()->deployment("rsync");
@ -55,7 +55,7 @@ class RsyncTask extends BaseStrategyTaskAbstract implements IsReleaseAware
// If we are working with releases
$deployToDirectory = $this->getConfig()->deployment('to');
if ($this->getConfig()->release('enabled', false) == true) {
if ($this->getConfig()->release('enabled', false) === true) {
$releasesDirectory = $this->getConfig()->release('directory', 'releases');
$symlink = $this->getConfig()->release('symlink', 'current');

6
Mage/Task/BuiltIn/Deployment/Strategy/TarGzTask.php
Unescape View File

@ -27,8 +27,8 @@ class TarGzTask extends BaseStrategyTaskAbstract implements IsReleaseAware
*/
public function getName()
{
if ($this->getConfig()->release('enabled', false) == true) {
if ($this->getConfig()->getParameter('overrideRelease', false) == true) {
if ($this->getConfig()->release('enabled', false) === true) {
if ($this->getConfig()->getParameter('overrideRelease', false) === true) {
return 'Deploy via TarGz (with Releases override) [built-in]';
} else {
return 'Deploy via TarGz (with Releases) [built-in]';
@ -50,7 +50,7 @@ class TarGzTask extends BaseStrategyTaskAbstract implements IsReleaseAware
// If we are working with releases
$deployToDirectory = $this->getConfig()->deployment('to');
if ($this->getConfig()->release('enabled', false) == true) {
if ($this->getConfig()->release('enabled', false) === true) {
$releasesDirectory = $this->getConfig()->release('directory', 'releases');
$deployToDirectory = rtrim($this->getConfig()->deployment('to'), '/')
. '/' . $releasesDirectory

2
Mage/Task/BuiltIn/Releases/ListTask.php
Unescape View File

@ -34,7 +34,7 @@ class ListTask extends AbstractTask implements IsReleaseAware
*/
public function run()
{
if ($this->getConfig()->release('enabled', false) == true) {
if ($this->getConfig()->release('enabled', false) === true) {
$releasesDirectory = $this->getConfig()->release('directory', 'releases');
$symlink = $this->getConfig()->release('symlink', 'current');

6
Mage/Task/BuiltIn/Releases/RollbackTask.php
Unescape View File

@ -47,7 +47,7 @@ class RollbackTask extends AbstractTask implements IsReleaseAware
*/
public function run()
{
if ($this->getConfig()->release('enabled', false) == true) {
if ($this->getConfig()->release('enabled', false) === true) {
$releasesDirectory = $this->getConfig()->release('directory', 'releases');
$symlink = $this->getConfig()->release('symlink', 'current');
@ -111,7 +111,7 @@ class RollbackTask extends AbstractTask implements IsReleaseAware
$tasks++;
$result = $task->run();
if ($result == true) {
if ($result === true) {
Console::output('<green>OK</green>', 0);
$completedTasks++;
} else {
@ -161,7 +161,7 @@ class RollbackTask extends AbstractTask implements IsReleaseAware
$tasks++;
$result = $task->run();
if ($result == true) {
if ($result === true) {
Console::output('<green>OK</green>', 0);
$completedTasks++;
} else {

Write Preview
Loading…
Cancel
Save