From 193265e4240842536b8316b22a78de17264b1878 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9s=20Monta=C3=B1ez?= Date: Sat, 7 Jan 2017 18:44:28 -0300 Subject: [PATCH] [Nostromo] Mess Detector: naming rule --- src/Mage/Command/BuiltIn/Releases/RollbackCommand.php | 6 +++--- src/Mage/Task/BuiltIn/FS/CopyTask.php | 6 +++--- src/Mage/Task/BuiltIn/FS/LinkTask.php | 6 +++--- src/Mage/Task/BuiltIn/FS/MoveTask.php | 6 +++--- src/Mage/Task/BuiltIn/Symfony/AsseticDumpTask.php | 4 ++-- src/Mage/Task/BuiltIn/Symfony/AssetsInstallTask.php | 4 ++-- src/Mage/Task/BuiltIn/Symfony/CacheClearTask.php | 4 ++-- src/Mage/Task/BuiltIn/Symfony/CacheWarmupTask.php | 4 ++-- 8 files changed, 20 insertions(+), 20 deletions(-) diff --git a/src/Mage/Command/BuiltIn/Releases/RollbackCommand.php b/src/Mage/Command/BuiltIn/Releases/RollbackCommand.php index e954c9c..4f5b212 100644 --- a/src/Mage/Command/BuiltIn/Releases/RollbackCommand.php +++ b/src/Mage/Command/BuiltIn/Releases/RollbackCommand.php @@ -104,7 +104,7 @@ class RollbackCommand extends DeployCommand $hosts = $this->runtime->getEnvironmentConfig('hosts'); $hostPath = rtrim($this->runtime->getEnvironmentConfig('host_path'), '/'); - $releaseAvailableInHosts = 0; + $availableInHosts = 0; foreach ($hosts as $host) { $this->runtime->setWorkingHost($host); @@ -121,13 +121,13 @@ class RollbackCommand extends DeployCommand } if (in_array($releaseToRollback, $releases)) { - $releaseAvailableInHosts++; + $availableInHosts++; } $this->runtime->setWorkingHost(null); } - if ($releaseAvailableInHosts === count($hosts)) { + if ($availableInHosts === count($hosts)) { return $releaseToRollback; } diff --git a/src/Mage/Task/BuiltIn/FS/CopyTask.php b/src/Mage/Task/BuiltIn/FS/CopyTask.php index 3c6049f..fc7eaf4 100644 --- a/src/Mage/Task/BuiltIn/FS/CopyTask.php +++ b/src/Mage/Task/BuiltIn/FS/CopyTask.php @@ -36,10 +36,10 @@ class CopyTask extends AbstractFileTask public function execute() { - $from = $this->getFile('from'); - $to = $this->getFile('to'); + $copyFrom = $this->getFile('from'); + $copyTo = $this->getFile('to'); - $cmd = sprintf('cp -p %s %s', $from, $to); + $cmd = sprintf('cp -p %s %s', $copyFrom, $copyTo); /** @var Process $process */ $process = $this->runtime->runCommand($cmd); diff --git a/src/Mage/Task/BuiltIn/FS/LinkTask.php b/src/Mage/Task/BuiltIn/FS/LinkTask.php index cde7641..9cf6994 100644 --- a/src/Mage/Task/BuiltIn/FS/LinkTask.php +++ b/src/Mage/Task/BuiltIn/FS/LinkTask.php @@ -36,10 +36,10 @@ class LinkTask extends AbstractFileTask public function execute() { - $from = $this->getFile('from'); - $to = $this->getFile('to'); + $linkFrom = $this->getFile('from'); + $linkTo = $this->getFile('to'); - $cmd = sprintf('ln -snf %s %s', $from, $to); + $cmd = sprintf('ln -snf %s %s', $linkFrom, $linkTo); /** @var Process $process */ $process = $this->runtime->runCommand($cmd); diff --git a/src/Mage/Task/BuiltIn/FS/MoveTask.php b/src/Mage/Task/BuiltIn/FS/MoveTask.php index 388f8b6..4da7146 100644 --- a/src/Mage/Task/BuiltIn/FS/MoveTask.php +++ b/src/Mage/Task/BuiltIn/FS/MoveTask.php @@ -36,10 +36,10 @@ class MoveTask extends AbstractFileTask public function execute() { - $from = $this->getFile('from'); - $to = $this->getFile('to'); + $moveFrom = $this->getFile('from'); + $moveTo = $this->getFile('to'); - $cmd = sprintf('mv %s %s', $from, $to); + $cmd = sprintf('mv %s %s', $moveFrom, $moveTo); /** @var Process $process */ $process = $this->runtime->runCommand($cmd); diff --git a/src/Mage/Task/BuiltIn/Symfony/AsseticDumpTask.php b/src/Mage/Task/BuiltIn/Symfony/AsseticDumpTask.php index 471a8af..933a19e 100644 --- a/src/Mage/Task/BuiltIn/Symfony/AsseticDumpTask.php +++ b/src/Mage/Task/BuiltIn/Symfony/AsseticDumpTask.php @@ -44,11 +44,11 @@ class AsseticDumpTask extends AbstractTask protected function getOptions() { $userGlobalOptions = $this->runtime->getConfigOptions('symfony', []); - $userEnvironmentOptions = $this->runtime->getEnvironmentConfig('symfony', []); + $userEnvOptions = $this->runtime->getEnvironmentConfig('symfony', []); $options = array_merge( ['console' => 'bin/console', 'env' => 'dev', 'flags' => ''], (is_array($userGlobalOptions) ? $userGlobalOptions : []), - (is_array($userEnvironmentOptions) ? $userEnvironmentOptions : []), + (is_array($userEnvOptions) ? $userEnvOptions : []), $this->options ); diff --git a/src/Mage/Task/BuiltIn/Symfony/AssetsInstallTask.php b/src/Mage/Task/BuiltIn/Symfony/AssetsInstallTask.php index 7506aca..7cd272b 100644 --- a/src/Mage/Task/BuiltIn/Symfony/AssetsInstallTask.php +++ b/src/Mage/Task/BuiltIn/Symfony/AssetsInstallTask.php @@ -44,11 +44,11 @@ class AssetsInstallTask extends AbstractTask protected function getOptions() { $userGlobalOptions = $this->runtime->getConfigOptions('symfony', []); - $userEnvironmentOptions = $this->runtime->getEnvironmentConfig('symfony', []); + $userEnvOptions = $this->runtime->getEnvironmentConfig('symfony', []); $options = array_merge( ['console' => 'bin/console', 'env' => 'dev', 'target' => 'web', 'flags' => '--symlink --relative'], (is_array($userGlobalOptions) ? $userGlobalOptions : []), - (is_array($userEnvironmentOptions) ? $userEnvironmentOptions : []), + (is_array($userEnvOptions) ? $userEnvOptions : []), $this->options ); diff --git a/src/Mage/Task/BuiltIn/Symfony/CacheClearTask.php b/src/Mage/Task/BuiltIn/Symfony/CacheClearTask.php index d712958..b81c20e 100644 --- a/src/Mage/Task/BuiltIn/Symfony/CacheClearTask.php +++ b/src/Mage/Task/BuiltIn/Symfony/CacheClearTask.php @@ -44,11 +44,11 @@ class CacheClearTask extends AbstractTask protected function getOptions() { $userGlobalOptions = $this->runtime->getConfigOptions('symfony', []); - $userEnvironmentOptions = $this->runtime->getEnvironmentConfig('symfony', []); + $userEnvOptions = $this->runtime->getEnvironmentConfig('symfony', []); $options = array_merge( ['console' => 'bin/console', 'env' => 'dev', 'flags' => ''], (is_array($userGlobalOptions) ? $userGlobalOptions : []), - (is_array($userEnvironmentOptions) ? $userEnvironmentOptions : []), + (is_array($userEnvOptions) ? $userEnvOptions : []), $this->options ); diff --git a/src/Mage/Task/BuiltIn/Symfony/CacheWarmupTask.php b/src/Mage/Task/BuiltIn/Symfony/CacheWarmupTask.php index bdea5ca..65f34ec 100644 --- a/src/Mage/Task/BuiltIn/Symfony/CacheWarmupTask.php +++ b/src/Mage/Task/BuiltIn/Symfony/CacheWarmupTask.php @@ -44,11 +44,11 @@ class CacheWarmupTask extends AbstractTask protected function getOptions() { $userGlobalOptions = $this->runtime->getConfigOptions('symfony', []); - $userEnvironmentOptions = $this->runtime->getEnvironmentConfig('symfony', []); + $userEnvOptions = $this->runtime->getEnvironmentConfig('symfony', []); $options = array_merge( ['console' => 'bin/console', 'env' => 'dev', 'flags' => ''], (is_array($userGlobalOptions) ? $userGlobalOptions : []), - (is_array($userEnvironmentOptions) ? $userEnvironmentOptions : []), + (is_array($userEnvOptions) ? $userEnvOptions : []), $this->options );