mirror of
https://github.com/andres-montanez/Magallanes
synced 2024-06-19 22:15:05 +02:00
Code refactoring.
This commit is contained in:
parent
12f42dc110
commit
d17dd0eb27
|
@ -22,13 +22,13 @@ abstract class AbstractCommand
|
|||
/**
|
||||
* Instance of the loaded Configuration.
|
||||
*
|
||||
* @var Mage\Config
|
||||
* @var \Mage\Config
|
||||
*/
|
||||
protected $config = null;
|
||||
|
||||
/**
|
||||
* Runs the Command
|
||||
* @throws Exception
|
||||
* @throws \Exception
|
||||
*/
|
||||
public abstract function run();
|
||||
|
||||
|
|
|
@ -456,7 +456,6 @@ class DeployCommand extends AbstractCommand implements RequiresEnvironment
|
|||
$runTask = false;
|
||||
}
|
||||
|
||||
$result = false;
|
||||
if ($runTask == true) {
|
||||
try {
|
||||
$result = $task->run();
|
||||
|
|
|
@ -39,7 +39,7 @@ class Compiler
|
|||
$phar->startBuffering();
|
||||
|
||||
$iterator = new RecursiveIteratorIterator(new RecursiveDirectoryIterator(__DIR__), RecursiveIteratorIterator::CHILD_FIRST);
|
||||
/** @var $path SplFileInfo */
|
||||
/** @var $path \SplFileInfo */
|
||||
foreach ($iterator as $path) {
|
||||
if ($path->isFile()) {
|
||||
$phar->addFromString(str_replace(dirname(__DIR__).'/', '', $path->getPathname()), file_get_contents($path));
|
||||
|
|
|
@ -255,9 +255,8 @@ class Config
|
|||
|
||||
if (isset($config[$configStage])) {
|
||||
$tasksData = ($config[$configStage] ? (array) $config[$configStage] : array());
|
||||
foreach ($tasksData as $taskName => $taskData) {
|
||||
foreach ($tasksData as $taskData) {
|
||||
if (is_array($taskData)) {
|
||||
;
|
||||
$tasks[] = array(
|
||||
'name' => key($taskData),
|
||||
'parameters' => current($taskData),
|
||||
|
|
|
@ -26,7 +26,7 @@ class Console
|
|||
{
|
||||
/**
|
||||
* Handler to the current Log File.
|
||||
* @var handler
|
||||
* @var mixed
|
||||
*/
|
||||
private static $log = null;
|
||||
|
||||
|
@ -56,7 +56,7 @@ class Console
|
|||
|
||||
/**
|
||||
* Configuration
|
||||
* @var Mage/Config
|
||||
* @var \Mage\Config
|
||||
*/
|
||||
private static $config;
|
||||
|
||||
|
|
|
@ -21,7 +21,7 @@ class LinkSharedFilesTask extends AbstractTask implements IsReleaseAware
|
|||
* Runs the task
|
||||
*
|
||||
* @return boolean
|
||||
* @throws Exception
|
||||
* @throws \Exception
|
||||
* @throws \Mage\Task\ErrorWithMessageException
|
||||
* @throws SkipException
|
||||
*/
|
||||
|
|
|
@ -321,7 +321,7 @@ class EncryptTask extends AbstractTask
|
|||
*
|
||||
* @see \Mage\Task\AbstractTask::run()
|
||||
*
|
||||
* @return boolan
|
||||
* @return bool
|
||||
* @throws \Mage\Task\ErrorWithMessageException
|
||||
*/
|
||||
public function run() {
|
||||
|
|
|
@ -37,7 +37,7 @@ class ListTask extends AbstractTask implements IsReleaseAware
|
|||
if ($this->getConfig()->release('enabled', false) == true) {
|
||||
$releasesDirectory = $this->getConfig()->release('directory', 'releases');
|
||||
$symlink = $this->getConfig()->release('symlink', 'current');
|
||||
|
||||
|
||||
Console::output('Releases available on <dark_gray>' . $this->getConfig()->getHost() . '</dark_gray>');
|
||||
|
||||
// Get Releases
|
||||
|
@ -46,7 +46,7 @@ class ListTask extends AbstractTask implements IsReleaseAware
|
|||
$releases = ($output == '') ? array() : explode(PHP_EOL, $output);
|
||||
|
||||
// Get Current
|
||||
$result = $this->runCommandRemote('ls -l ' . $symlink, $output);
|
||||
$result = $this->runCommandRemote('ls -l ' . $symlink, $output) && $result;
|
||||
$currentRelease = explode('/', $output);
|
||||
$currentRelease = trim(array_pop($currentRelease));
|
||||
|
||||
|
|
|
@ -87,7 +87,7 @@ class ChangeBranchTask extends AbstractTask
|
|||
|
||||
$branch = $this->getParameter('branch', $scmData['branch']);
|
||||
$command = 'git checkout ' . $branch;
|
||||
$result = $this->runCommandLocal($command);
|
||||
$result = $this->runCommandLocal($command) && $result;
|
||||
|
||||
self::$startingBranch = $currentBranch;
|
||||
} else {
|
||||
|
|
Loading…
Reference in a new issue