silverstripe / deploynaut

code/model/jobs/DNDeployment.php

Spacing +19 added lines, -19 removed lines

@@ -118,9 +118,9 @@ 
         $status = new Resque_Job_Status($this->ResqueToken);
         $statusCode = $status->get();
         // The Resque job can no longer be found, fallback to the DNDeployment.Status
-        if ($statusCode === false) {
+        if($statusCode === false) {
             // Translate from the DNDeployment.Status to the Resque job status for UI purposes
-            switch ($this->Status) {
+            switch($this->Status) {
                 case 'Finished':
                     return 'Complete';
                 case 'Started':
@@ -140,7 +140,7 @@ 
      */
     public function getRepository()
     {
-        if (!$this->SHA) {
+        if(!$this->SHA) {
             return null;
         }
         return $this->Environment()->Project()->getRepository();
@@ -155,10 +155,10 @@ 
     public function getCommit()
     {
         $repo = $this->getRepository();
-        if ($repo) {
+        if($repo) {
             try {
                 return $repo->getCommit($this->SHA);
-            } catch (Gitonomy\Git\Exception\ReferenceNotFoundException $ex) {
+            } catch(Gitonomy\Git\Exception\ReferenceNotFoundException $ex) {
                 return null;
             }
         }
@@ -175,10 +175,10 @@ 
     public function getCommitMessage()
     {
         $commit = $this->getCommit();
-        if ($commit) {
+        if($commit) {
             try {
                 return Convert::raw2xml($commit->getMessage());
-            } catch (Gitonomy\Git\Exception\ReferenceNotFoundException $e) {
+            } catch(Gitonomy\Git\Exception\ReferenceNotFoundException $e) {
                 return null;
             }
         }
@@ -194,10 +194,10 @@ 
     {
         $returnTags = array();
         $repo = $this->getRepository();
-        if ($repo) {
+        if($repo) {
             $tags = $repo->getReferences()->resolveTags($this->SHA);
-            if (!empty($tags)) {
-                foreach ($tags as $tag) {
+            if(!empty($tags)) {
+                foreach($tags as $tag) {
                     $field = Varchar::create('Tag', '255');
                     $field->setValue($tag->getName());
                     $returnTags[] = $field;
@@ -216,14 +216,14 @@ 
     public function getFullDeployMessages()
     {
         $strategy = $this->getDeploymentStrategy();
-        if ($strategy->getActionCode()!=='full') {
+        if($strategy->getActionCode() !== 'full') {
             return null;
         }
 
         $changes = $strategy->getChangesModificationNeeded();
         $messages = [];
-        foreach ($changes as $change => $details) {
-            if ($change==='Code version') {
+        foreach($changes as $change => $details) {
+            if($change === 'Code version') {
                 continue;
             }
 
@@ -236,7 +236,7 @@ 
             ];
         }
 
-        if (empty($messages)) {
+        if(empty($messages)) {
             $messages[] = [
                 'Flag' => '',
                 'Text' => '<i>Environment changes have been made.</i>'
@@ -254,7 +254,7 @@ 
     public function getTag()
     {
         $tags = $this->getTags();
-        if ($tags->count() > 0) {
+        if($tags->count() > 0) {
             return $tags->last();
         }
         return null;
@@ -281,8 +281,8 @@ 
     {
         $list = new ArrayList();
         $strategy = $this->getDeploymentStrategy();
-        foreach ($strategy->getChanges() as $name => $change) {
-            if (empty($change['to'])) {
+        foreach($strategy->getChanges() as $name => $change) {
+            if(empty($change['to'])) {
                 continue;
             }
 
@@ -325,11 +325,11 @@ 
         // Make sure we use the SHA as it was written into this DNDeployment.
         $args['sha'] = $this->SHA;
 
-        if (!$this->DeployerID) {
+        if(!$this->DeployerID) {
             $this->DeployerID = Member::currentUserID();
         }
 
-        if ($this->DeployerID) {
+        if($this->DeployerID) {
             $deployer = $this->Deployer();
             $message = sprintf(
                 'Deploy to %s initiated by %s (%s), with IP address %s',

code/model/jobs/DNGitFetch.php

Spacing +4 added lines, -4 removed lines

@@ -57,11 +57,11 @@ 
         $project = $this->Project();
         $log = $this->log();
 
-        if (!$this->DeployerID) {
+        if(!$this->DeployerID) {
             $this->DeployerID = Member::currentUserID();
         }
 
-        if ($this->DeployerID) {
+        if($this->DeployerID) {
             $deployer = $this->Deployer();
             $message = sprintf(
                 'Update repository job for %s initiated by %s (%s)',
@@ -139,9 +139,9 @@ 
         $status = new Resque_Job_Status($this->ResqueToken);
         $statusCode = $status->get();
         // The Resque job can no longer be found, fallback to the DNDeployment.Status
-        if ($statusCode === false) {
+        if($statusCode === false) {
             // Translate from the DNDeployment.Status to the Resque job status for UI purposes
-            switch ($this->Status) {
+            switch($this->Status) {
                 case 'Finished':
                     return 'Complete';
                 case 'Started':

code/model/jobs/DNPing.php

Spacing +2 added lines, -2 removed lines

@@ -115,11 +115,11 @@
             'env' => $project->getProcessEnv()
         );
 
-        if (!$this->DeployerID) {
+        if(!$this->DeployerID) {
             $this->DeployerID = Member::currentUserID();
         }
 
-        if ($this->DeployerID) {
+        if($this->DeployerID) {
             $deployer = $this->Deployer();
             $message = sprintf(
                 'Ping to %s initiated by %s (%s)',

code/model/steps/DeploymentPipelineStep.php

Spacing +16 added lines, -16 removed lines

@@ -38,10 +38,10 @@ 
     {
         parent::start();
 
-        switch ($this->Status) {
+        switch($this->Status) {
             case 'Started':
                 // If we are doing a subtask, check which one to continue
-                switch ($this->Doing) {
+                switch($this->Doing) {
                     case 'Deployment':
                         return $this->continueDeploy();
                     case 'Snapshot':
@@ -74,20 +74,20 @@ 
         // Check environment and SHA
         $pipeline = $this->Pipeline();
         $environment = $pipeline->Environment();
-        if (empty($environment) || !$environment->exists()) {
+        if(empty($environment) || !$environment->exists()) {
             $this->log("No available environment for {$this->Title}");
             $this->markFailed();
             return false;
         }
 
-        if (empty($pipeline->SHA)) {
+        if(empty($pipeline->SHA)) {
             $this->log("No available SHA for {$this->Title}");
             $this->markFailed();
             return false;
         }
 
         // Skip deployment for dry run
-        if ($this->Pipeline()->DryRun) {
+        if($this->Pipeline()->DryRun) {
             $this->log("[Skipped] Create DNDeployment for SHA " . $pipeline->SHA);
             $this->write();
             return true;
@@ -125,13 +125,13 @@ 
         $this->write();
 
         // Skip deployment for dry run
-        if ($this->Pipeline()->DryRun) {
+        if($this->Pipeline()->DryRun) {
             $this->log("[Skipped] Create DNDataTransfer backup");
             return true;
         }
 
         // Skip snapshot for environments with no build
-        if (!$this->Pipeline()->Environment()->CurrentBuild()) {
+        if(!$this->Pipeline()->Environment()->CurrentBuild()) {
             $this->log('[Skipped] No current build, skipping snapshot');
             return true;
         }
@@ -161,19 +161,19 @@ 
         $this->log("Checking status of {$this->Title}...");
 
         // Skip snapshot for dry run
-        if ($this->Pipeline()->DryRun) {
+        if($this->Pipeline()->DryRun) {
             $this->log("[Skipped] Checking progress of snapshot backup");
             return $this->startDeploy();
         }
 
         // Skip snapshot for environments with no build
-        if (!$this->Pipeline()->Environment()->CurrentBuild()) {
+        if(!$this->Pipeline()->Environment()->CurrentBuild()) {
             return $this->startDeploy();
         }
 
         // Get related snapshot
         $snapshot = $this->Pipeline()->PreviousSnapshot();
-        if (empty($snapshot) || !$snapshot->exists()) {
+        if(empty($snapshot) || !$snapshot->exists()) {
             $this->log("Missing snapshot for in-progress {$this->Title}");
             $this->markFailed();
             return false;
@@ -181,7 +181,7 @@ 
 
         // Check finished state
         $status = $snapshot->ResqueStatus();
-        if ($this->checkResqueStatus($status)) {
+        if($this->checkResqueStatus($status)) {
             // After snapshot is done, switch to doing deployment
             return $this->startDeploy();
         }
@@ -197,7 +197,7 @@ 
         $this->log("Checking status of {$this->Title}...");
 
         // Skip deployment for dry run
-        if ($this->Pipeline()->DryRun) {
+        if($this->Pipeline()->DryRun) {
             $this->log("[Skipped] Checking progress of deployment");
             $this->finish();
             return !$this->isFailed();
@@ -205,7 +205,7 @@ 
 
         // Get related deployment
         $deployment = $this->Pipeline()->CurrentDeployment();
-        if (empty($deployment) || !$deployment->exists()) {
+        if(empty($deployment) || !$deployment->exists()) {
             $this->log("Missing deployment for in-progress {$this->Title}");
             $this->markFailed();
             return false;
@@ -213,7 +213,7 @@ 
 
         // Check finished state
         $status = $deployment->ResqueStatus();
-        if ($this->checkResqueStatus($status)) {
+        if($this->checkResqueStatus($status)) {
             $this->finish();
         }
         return !$this->isFailed();
@@ -227,7 +227,7 @@ 
      */
     protected function checkResqueStatus($status)
     {
-        switch ($status) {
+        switch($status) {
             case "Complete":
                 return true;
             case "Failed":
@@ -240,7 +240,7 @@ 
             default:
                 // For running or queued tasks ensure that we have not exceeded
                 // a reasonable time-elapsed to consider this job inactive
-                if ($this->isTimedOut()) {
+                if($this->isTimedOut()) {
                     $this->log("{$this->Title} took longer than {$this->MaxDuration} seconds to run and has timed out");
                     $this->markFailed();
                     return false;

code/model/steps/EmergencyRollbackStep.php

Spacing +10 added lines, -10 removed lines

@@ -47,7 +47,7 @@ 
     public function start()
     {
         // Just in case this step is being mistakenly restarted
-        if (!empty($this->RolledBack)) {
+        if(!empty($this->RolledBack)) {
             $this->log(_t('EmergencyRollbackStep.BEENROLLEDBACK',
                 "{$this->Title} has already been rolled back"));
             $this->markFailed();
@@ -55,7 +55,7 @@ 
         }
 
         // check if we have timed out
-        if ($this->isTimedOut()) {
+        if($this->isTimedOut()) {
             $this->log(sprintf(_t('EmergencyRollbackStep.ROLLBACKTIMEOUT',
                 "{$this->Title} is older than %s seconds and has timed out"),
                 $this->MaxDuration));
@@ -64,7 +64,7 @@ 
         }
 
         // Begin or process this step
-        switch ($this->Status) {
+        switch($this->Status) {
             case 'Started':
                 return true;
             case 'Queued':
@@ -96,7 +96,7 @@ 
     public function rollback()
     {
         // Check permission
-        if (!$this->canTriggerRollback()) {
+        if(!$this->canTriggerRollback()) {
             return Security::permissionFailure(
                 null,
                 _t("EmergencyRollbackStep.DENYROLLBACKED",
@@ -104,7 +104,7 @@ 
             );
         }
 
-        if ($this->Status == 'Queued') {
+        if($this->Status == 'Queued') {
             $this->start();
         }
 
@@ -115,7 +115,7 @@ 
         $this->write();
 
         // Rollback itself is handled by the Pipeline object. This step will be marked as failed.
-        if ($this->Pipeline()->isRunning()) {
+        if($this->Pipeline()->isRunning()) {
             $this->Pipeline()->markFailed();
             return true;
         } else {
@@ -129,7 +129,7 @@ 
     public function dismiss()
     {
         // Check permission
-        if (!$this->canTriggerRollback()) {
+        if(!$this->canTriggerRollback()) {
             return Security::permissionFailure(
                 null,
                 _t("EmergencyRollbackStep.DENYROLLBACKED",
@@ -148,7 +148,7 @@ 
     public function beginRollbackWindow()
     {
         $this->Status = 'Started';
-        if (!$this->Started) {
+        if(!$this->Started) {
             $this->Started = SS_Datetime::now()->Rfc2822();
         }
         $this->log(_t('EmergencyRollbackStep.BEGINROLLBACKWINDOW',
@@ -162,7 +162,7 @@ 
     public function getRunningDescription()
     {
         // Don't show options if this step has already been confirmed
-        if ($this->RolledBack) {
+        if($this->RolledBack) {
             return;
         }
 
@@ -173,7 +173,7 @@ 
     public function allowedActions()
     {
         // Don't show options if this step has already been confirmed or can't be confirmed
-        if (!$this->canTriggerRollback()) {
+        if(!$this->canTriggerRollback()) {
             return parent::allowedActions();
         }
 

code/model/steps/LongRunningPipelineStep.php

Spacing +3 added lines, -3 removed lines

@@ -48,10 +48,10 @@ 
      */
     public function getAge()
     {
-        if ($this->Started) {
+        if($this->Started) {
             $started = intval($this->dbObject('Started')->Format('U'));
             $now = intval(SS_Datetime::now()->Format('U'));
-            if ($started && $now) {
+            if($started && $now) {
                 return $now - $started;
             }
         }
@@ -61,7 +61,7 @@ 
     public function start()
     {
         // Ensure started date is set
-        if (!$this->Started) {
+        if(!$this->Started) {
             $this->Started = SS_Datetime::now()->Rfc2822();
             $this->write();
         }

code/model/steps/PipelineStep.php

Spacing +9 added lines, -9 removed lines

@@ -85,7 +85,7 @@ 
         $niceName = $this->getConfigSetting('NiceName')
             ?: ucwords(trim(strtolower(preg_replace('/_?([A-Z])/', ' $1', $this->getTitle()))));
 
-        if ($this->isFinished()) {
+        if($this->isFinished()) {
             $niceName = $this->getConfigSetting('NiceDone') ?: $niceName;
         }
 
@@ -102,14 +102,14 @@ 
      */
     public function getConfigData()
     {
-        if (!$this->Config) {
+        if(!$this->Config) {
             return array();
         }
 
         // Merge with defaults
-        if (!$this->mergedConfig) {
+        if(!$this->mergedConfig) {
             $this->mergedConfig = unserialize($this->Config);
-            if ($default = self::config()->default_config) {
+            if($default = self::config()->default_config) {
                 Config::merge_array_low_into_high($this->mergedConfig, $default);
             }
         }
@@ -141,8 +141,8 @@ 
     public function getConfigSetting($setting)
     {
         $source = $this->getConfigData();
-        foreach (func_get_args() as $setting) {
-            if (empty($source[$setting])) {
+        foreach(func_get_args() as $setting) {
+            if(empty($source[$setting])) {
                 return null;
             }
             $source = $source[$setting];
@@ -242,10 +242,10 @@ 
      */
     protected function getDependentEnvironment()
     {
-        if ($this->getConfigSetting('PerformTestOn') === 'DependentEnvironment') {
+        if($this->getConfigSetting('PerformTestOn') === 'DependentEnvironment') {
             try {
                 $environment = $this->Pipeline()->getDependentEnvironment();
-            } catch (Exception $e) {
+            } catch(Exception $e) {
                 $this->log($e->getMessage());
                 $this->markFailed();
                 return false;
@@ -280,7 +280,7 @@ 
      */
     public function abort()
     {
-        if ($this->isQueued() || $this->isRunning()) {
+        if($this->isQueued() || $this->isRunning()) {
             $this->Status = 'Aborted';
             $this->log('Step aborted');
             $this->write();

code/model/steps/RollbackStep.php

Spacing +16 added lines, -16 removed lines

@@ -56,10 +56,10 @@ 
     {
         parent::start();
 
-        switch ($this->Status) {
+        switch($this->Status) {
             case 'Started':
                 // If we are doing a subtask, check which one to continue
-                switch ($this->Doing) {
+                switch($this->Doing) {
                     case 'Deployment':
                         return $this->continueRevertDeploy();
                     case 'Snapshot':
@@ -91,7 +91,7 @@ 
         $this->log("{$this->Title} starting revert deployment");
 
         // Skip deployment for dry run
-        if ($this->Pipeline()->DryRun) {
+        if($this->Pipeline()->DryRun) {
             $this->log("[Skipped] Create DNDeployment");
             $this->write();
             return true;
@@ -100,7 +100,7 @@ 
         // Get old deployment from pipeline
         $pipeline = $this->Pipeline();
         $previous = $pipeline->PreviousDeployment();
-        if (empty($previous) || empty($previous->SHA)) {
+        if(empty($previous) || empty($previous->SHA)) {
             $this->log("No available SHA for {$this->Title}");
             $this->markFailed();
             return false;
@@ -136,7 +136,7 @@ 
         $this->log("{$this->Title} reverting database from snapshot");
 
         // Skip deployment for dry run
-        if ($this->Pipeline()->DryRun) {
+        if($this->Pipeline()->DryRun) {
             $this->write();
             $this->log("[Skipped] Create DNDataTransfer restore");
             return true;
@@ -145,7 +145,7 @@ 
         // Get snapshot
         $pipeline = $this->Pipeline();
         $backup = $pipeline->PreviousSnapshot();
-        if (empty($backup) || !$backup->exists()) {
+        if(empty($backup) || !$backup->exists()) {
             $this->log("No database to revert for {$this->Title}");
             $this->markFailed();
             return false;
@@ -176,14 +176,14 @@ 
         $this->log("Checking status of {$this->Title}...");
 
         // Skip snapshot for dry run
-        if ($this->Pipeline()->DryRun) {
+        if($this->Pipeline()->DryRun) {
             $this->log("[Skipped] Checking progress of snapshot restore");
             return $this->finish();
         }
 
         // Get related snapshot
         $transfer = $this->RollbackDatabase();
-        if (empty($transfer) || !$transfer->exists()) {
+        if(empty($transfer) || !$transfer->exists()) {
             $this->log("Missing database transfer for in-progress {$this->Title}");
             $this->markFailed();
             return false;
@@ -191,7 +191,7 @@ 
 
         // Check finished state
         $status = $transfer->ResqueStatus();
-        if ($this->checkResqueStatus($status)) {
+        if($this->checkResqueStatus($status)) {
             // Re-enable the site by disabling the maintenance, since the DB restored successfully
             $this->Pipeline()->Environment()->disableMaintenance($this->Pipeline()->getLogger());
 
@@ -210,9 +210,9 @@ 
         $this->log("Checking status of {$this->Title}...");
 
         // Skip deployment for dry run
-        if ($this->Pipeline()->DryRun) {
+        if($this->Pipeline()->DryRun) {
             $this->log("[Skipped] Checking progress of deployment");
-            if ($this->getConfigSetting('RestoreDB')) {
+            if($this->getConfigSetting('RestoreDB')) {
                 return $this->startRevertDatabase();
             } else {
                 $this->finish();
@@ -222,7 +222,7 @@ 
 
         // Get related deployment
         $deployment = $this->RollbackDeployment();
-        if (empty($deployment) || !$deployment->exists()) {
+        if(empty($deployment) || !$deployment->exists()) {
             $this->log("Missing deployment for in-progress {$this->Title}");
             $this->markFailed();
             return false;
@@ -230,9 +230,9 @@ 
 
         // Check finished state
         $status = $deployment->ResqueStatus();
-        if ($this->checkResqueStatus($status)) {
+        if($this->checkResqueStatus($status)) {
             // Since deployment is finished, check if we should also do a db restoration
-            if ($this->doRestoreDB()) {
+            if($this->doRestoreDB()) {
                 return $this->startRevertDatabase();
             } else {
                 $this->finish();
@@ -259,7 +259,7 @@ 
      */
     protected function checkResqueStatus($status)
     {
-        switch ($status) {
+        switch($status) {
             case "Complete":
                 return true;
             case "Failed":
@@ -272,7 +272,7 @@ 
             default:
                 // For running or queued tasks ensure that we have not exceeded
                 // a reasonable time-elapsed to consider this job inactive
-                if ($this->isTimedOut()) {
+                if($this->isTimedOut()) {
                     $this->log("{$this->Title} took longer than {$this->MaxDuration} seconds to run and has timed out");
                     $this->markFailed();
                     return false;

code/model/steps/SmokeTestPipelineStep.php

Spacing +18 added lines, -18 removed lines

@@ -71,12 +71,12 @@ 
 
         // Merge with default tests
         $defaultTests = $this->Pipeline()->getConfigSetting('PipelineConfig', 'Tests');
-        if ($tests && $defaultTests) {
+        if($tests && $defaultTests) {
             Config::merge_array_low_into_high($tests, $defaultTests);
-        } elseif (!$tests && $defaultTests) {
+        } elseif(!$tests && $defaultTests) {
             $tests = $defaultTests;
         }
-        if ($tests) {
+        if($tests) {
             return $tests;
         }
 
@@ -84,7 +84,7 @@ 
         // site's homepage by looking at the DNEnvironment fields.
         $environment = $this->getDependentEnvironment();
         $url = $environment->URL;
-        if ($url) {
+        if($url) {
             return array(
                 'default' => array(
                     'URL' => $url,
@@ -110,7 +110,7 @@ 
         // don't allow this to run for more than 10 seconds to avoid tying up webserver processes.
 
         // if we need to use a proxy, ensure that is configured
-        if (defined('SS_OUTBOUND_PROXY')) {
+        if(defined('SS_OUTBOUND_PROXY')) {
             curl_setopt($handle, CURLOPT_PROXY, SS_OUTBOUND_PROXY);
             curl_setopt($handle, CURLOPT_PROXYPORT, SS_OUTBOUND_PROXY_PORT);
         }
@@ -131,14 +131,14 @@ 
         curl_setopt($ch, CURLOPT_URL, $test['URL']);
 
         // Allow individual tests to override number of attempts
-        $attempts = (int) $this->getConfigSetting('Attempts');
-        if (!empty($test['Attempts'])) {
+        $attempts = (int)$this->getConfigSetting('Attempts');
+        if(!empty($test['Attempts'])) {
             $attempts = $test['Attempts'];
         }
 
         // Run through each attempt
-        for ($i = 0; $i < $attempts; $i++) {
-            if ($i > 0) {
+        for($i = 0; $i < $attempts; $i++) {
+            if($i > 0) {
                 $this->log("Request failed, performing reattempt (#{$i})");
 
                 // Ensure a non-zero delay between each request
@@ -148,7 +148,7 @@ 
 
             // Perform request
             $contents = curl_exec($ch);
-            if (curl_errno($ch)) {
+            if(curl_errno($ch)) {
                 $this->log(sprintf('Curl error: %s', curl_error($ch)));
                 continue;
             }
@@ -157,8 +157,8 @@ 
             $info = curl_getinfo($ch);
 
             // if an expected response time is specified, check that against the results
-            if (isset($test['ExpectResponse'])) {
-                if ($info['total_time'] > $test['ExpectResponse']) {
+            if(isset($test['ExpectResponse'])) {
+                if($info['total_time'] > $test['ExpectResponse']) {
                     $this->log(sprintf(
                         'Smoke test "%s" to URL %s failed. Expected response time %s seconds, actual was %s seconds',
                         $name,
@@ -171,7 +171,7 @@ 
             }
 
             // Check response code
-            if ($info['http_code'] != $test['ExpectStatus']) {
+            if($info['http_code'] != $test['ExpectStatus']) {
                 $this->log("=================================================================");
                 $this->log(sprintf(
                     "Printing output from smoke test '%s' (URL: '%s'):",
@@ -197,7 +197,7 @@ 
         }
 
         // Run out of re-attempts
-        if ($attempts > 1) {
+        if($attempts > 1) {
             $this->log("Failed after {$attempts} attempts");
         }
         return false;
@@ -211,7 +211,7 @@ 
 
         // Get tests to run
         $tests = $this->getTests();
-        if (empty($tests)) {
+        if(empty($tests)) {
             $this->log('No smoke tests available. Aborting');
             $this->markFailed();
             return false;
@@ -220,14 +220,14 @@ 
         // work through each of the configured tests and perform a web request and check the result
         $ch = $this->initCurl();
         $success = true;
-        foreach ($tests as $name => $test) {
+        foreach($tests as $name => $test) {
             $testSuccess = $this->runTest($ch, $name, $test);
             $success = $testSuccess && $success;
         }
         curl_close($ch);
 
         // Check result
-        if ($success) {
+        if($success) {
             $this->finish();
         } else {
             // At least one test failed, so mark the test as failed
@@ -238,7 +238,7 @@ 
 
     public function markFailed($notify = true)
     {
-        if ($this->getDryRun()) {
+        if($this->getDryRun()) {
             $this->log("[Skipped] Smoke testing failed: Putting up emergency maintenance page");
         } else {
             // Put up maintenance page after this fails