silverstripe / deploynaut

code/api/nouns/APINoun.php

Indentation +2 added lines, -2 removed lines

@@ -1,7 +1,7 @@
 <?php
 /**
- * Base class for the APINouns
- */
+	 * Base class for the APINouns
+	 */
 class APINoun extends Controller {
 
 	/**

Spacing +1 added lines, -1 removed lines

@@ -119,7 +119,7 @@
 	 * @return SS_HTTPResponse
 	 */
 	protected function message($message, $statusCode) {
-		$response =  $this->getAPIResponse(array(
+		$response = $this->getAPIResponse(array(
 			'message' => $message,
 			'statusCode' => $statusCode
 		));

code/model/DNEnvironment.php

Upper-Lower-Casing +1 added lines, -1 removed lines

@@ -954,7 +954,7 @@
 to other environments, alongside the "Who can restore" permission.<br>
 Should include all users with upload permissions, otherwise they can't download
 their own uploads.
-PHP
+php
 				),
 
 			// The Main.PipelineApprovers

Doc Comments +3 added lines

@@ -919,6 +919,9 @@
 		$fields->insertAfter($createConfigField, 'noDeployConfig');
 	}
 
+	/**
+	 * @param FieldList $fields
+	 */
 	protected function setPipelineConfigurationFields($fields) {
 		if(!$this->config()->get('allow_web_editing')) {
 			return;

Switch Indentation +13 added lines, -13 removed lines

@@ -180,19 +180,19 @@
 		$backends = array_keys($this->config()->get('allowed_backends', Config::FIRST_SET));
 		switch(sizeof($backends)) {
 		// Nothing allowed, use the default value "DeploymentBackend"
-		case 0:
-			$backend = "DeploymentBackend";
-			break;
-
-		// Only 1 thing allowed, use that
-		case 1:
-			$backend = $backends[0];
-			break;
-
-		// Multiple choices, use our choice if it's legal, otherwise default to the first item on the list
-		default:
-			$backend = $this->BackendIdentifier;
-			if(!in_array($backend, $backends)) $backend = $backends[0];
+			case 0:
+				$backend = "DeploymentBackend";
+				break;
+
+			// Only 1 thing allowed, use that
+			case 1:
+				$backend = $backends[0];
+				break;
+
+			// Multiple choices, use our choice if it's legal, otherwise default to the first item on the list
+			default:
+				$backend = $this->BackendIdentifier;
+				if(!in_array($backend, $backends)) $backend = $backends[0];
 		}
 
 		return Injector::inst()->get($backend);

Spacing +17 added lines, -17 removed lines

@@ -107,9 +107,9 @@ 
 		"CanBackupGroups"   => "Group",
 		"ArchiveUploaders"   => "Member", // Who can upload archive files linked to this environment
 		"ArchiveUploaderGroups" => "Group",
-		"ArchiveDownloaders" => "Member",  // Who can download archive files from this environment
+		"ArchiveDownloaders" => "Member", // Who can download archive files from this environment
 		"ArchiveDownloaderGroups" => "Group",
-		"ArchiveDeleters"    => "Member",  // Who can delete archive files from this environment,
+		"ArchiveDeleters"    => "Member", // Who can delete archive files from this environment,
 		"ArchiveDeleterGroups" => "Group",
 		"PipelineApprovers"  => "Member", // Who can approve / reject pipelines from this environment
 		"PipelineApproverGroups" => "Group",
@@ -291,7 +291,7 @@ 
 	 */
 	public function CanCancelPipeline() {
 		// do we have a current pipeline
-		if ($this->HasCurrentPipeline()) {
+		if($this->HasCurrentPipeline()) {
 			return $this->CurrentPipeline()->canAbort();
 		}
 		return false;
@@ -599,22 +599,22 @@ 
 		// The DeployHistory function is far too slow to use for this
 		$deploy = DNDeployment::get()->filter(array('EnvironmentID' => $this->ID, 'Status' => 'Finished'))->sort('LastEdited DESC')->first();
 
-		if (!$deploy || (!$deploy->SHA)) {
+		if(!$deploy || (!$deploy->SHA)) {
 			return false;
 		}
 
 		$repo = $this->Project()->getRepository();
-		if (!$repo) {
+		if(!$repo) {
 			return $deploy;
 		}
 
 		try {
 			$commit = $repo->getCommit($deploy->SHA);
-			if ($commit) {
+			if($commit) {
 				$deploy->Message = Convert::raw2xml($commit->getMessage());
 			}
 			// We can't find this SHA, so we ignore adding a commit message to the deployment
-		} catch (Exception $ex) { }
+		} catch(Exception $ex) { }
 
 		return $deploy;
 	}
@@ -644,7 +644,7 @@ 
 					$deploy->Message = Convert::raw2xml($commit->getMessage());
 				}
 				// We can't find this SHA, so we ignore adding a commit message to the deployment
-			} catch (Exception $ex) { }
+			} catch(Exception $ex) { }
 			$ammendedHistory->push($deploy);
 		}
 
@@ -682,7 +682,7 @@ 
 	 * @return string
 	 */
 	public function Link() {
-		return $this->Project()->Link()."/environment/" . $this->Name;
+		return $this->Project()->Link() . "/environment/" . $this->Name;
 	}
 
 
@@ -887,7 +887,7 @@ 
 		// Add actions
 		$action = new FormAction('check', 'Check Connection');
 		$action->setUseButtonTag(true);
-		$action->setAttribute('data-url', Director::absoluteBaseURL().'naut/api/'.$this->Project()->Name.'/'.$this->Name.'/ping');
+		$action->setAttribute('data-url', Director::absoluteBaseURL() . 'naut/api/' . $this->Project()->Name . '/' . $this->Name . '/ping');
 		$fields->insertBefore($action, 'Name');
 
 		// Allow extensions
@@ -950,8 +950,8 @@ 
 	 */
 	public function onBeforeWrite() {
 		parent::onBeforeWrite();
-		if($this->Name && $this->Name.'.rb' != $this->Filename) {
-			$this->Filename = $this->Name.'.rb';
+		if($this->Name && $this->Name . '.rb' != $this->Filename) {
+			$this->Filename = $this->Name . '.rb';
 		}
 		$this->checkEnvironmentPath();
 		$this->writeConfigFile();
@@ -976,11 +976,11 @@ 
 		if(!$this->config()->get('allow_web_editing')) return;
 
 		// Create a basic new environment config from a template
-		if( !$this->envFileExists()
+		if(!$this->envFileExists()
 			&& $this->Filename
 			&& $this->CreateEnvConfig
 		) {
-			$templateFile = $this->config()->template_file ?: BASE_PATH.'/deploynaut/environment.template';
+			$templateFile = $this->config()->template_file ?: BASE_PATH . '/deploynaut/environment.template';
 			file_put_contents($this->getConfigFilename(), file_get_contents($templateFile));
 		} else if($this->envFileExists() && $this->DeployConfig) {
 			file_put_contents($this->getConfigFilename(), $this->DeployConfig);
@@ -1047,7 +1047,7 @@ 
 		if(!$this->Filename) {
 			return '';
 		}
-		return $this->DNData()->getEnvironmentDir().'/'.$this->Project()->Name.'/'.$this->Filename;
+		return $this->DNData()->getEnvironmentDir() . '/' . $this->Project()->Name . '/' . $this->Filename;
 	}
 
 	/**
@@ -1126,10 +1126,10 @@ 
 		$filter = isset($config->PipelineConfig->FilteredCommits)
 			? $config->PipelineConfig->FilteredCommits
 			: null;
-		if (empty($filter)) return null;
+		if(empty($filter)) return null;
 
 		// Create and execute filter
-		if (!class_exists($filter)) throw new Exception(sprintf("Class %s does not exist", $filter));
+		if(!class_exists($filter)) throw new Exception(sprintf("Class %s does not exist", $filter));
 		$commitClass = $filter::create();
 		// setup the environment to check for commits
 		$commitClass->env = $dependsOnEnv;

Braces +121 added lines, -38 removed lines

@@ -192,7 +192,9 @@ 
 		// Multiple choices, use our choice if it's legal, otherwise default to the first item on the list
 		default:
 			$backend = $this->BackendIdentifier;
-			if(!in_array($backend, $backends)) $backend = $backends[0];
+			if(!in_array($backend, $backends)) {
+				$backend = $backends[0];
+			}
 		}
 
 		return Injector::inst()->get($backend);
@@ -304,10 +306,17 @@ 
 	 * @return boolean
 	 */
 	public function canView($member = null) {
-		if(!$member) $member = Member::currentUser();
-		if(!$member) return false; // Must be logged in to check permissions
+		if(!$member) {
+			$member = Member::currentUser();
+		}
+		if(!$member) {
+			return false;
+		}
+		// Must be logged in to check permissions
 
-		if(Permission::checkMember($member, 'ADMIN')) return true;
+		if(Permission::checkMember($member, 'ADMIN')) {
+			return true;
+		}
 
 		// if no Viewers or ViewerGroups defined, fallback to DNProject::canView permissions
 		if($this->Viewers()->exists() || $this->ViewerGroups()->exists()) {
@@ -325,10 +334,17 @@ 
 	 * @return boolean
 	 */
 	public function canDeploy($member = null) {
-		if(!$member) $member = Member::currentUser();
-		if(!$member) return false; // Must be logged in to check permissions
+		if(!$member) {
+			$member = Member::currentUser();
+		}
+		if(!$member) {
+			return false;
+		}
+		// Must be logged in to check permissions
 
-		if(Permission::checkMember($member, 'ADMIN')) return true;
+		if(Permission::checkMember($member, 'ADMIN')) {
+			return true;
+		}
 
 		return $this->Deployers()->byID($member->ID)
 			|| $member->inGroups($this->DeployerGroups());
@@ -342,10 +358,17 @@ 
 	 * @return boolean true if $member can restore, and false if they can't.
 	 */
 	public function canRestore($member = null) {
-		if(!$member) $member = Member::currentUser();
-		if(!$member) return false; // Must be logged in to check permissions
+		if(!$member) {
+			$member = Member::currentUser();
+		}
+		if(!$member) {
+			return false;
+		}
+		// Must be logged in to check permissions
 
-		if(Permission::checkMember($member, 'ADMIN')) return true;
+		if(Permission::checkMember($member, 'ADMIN')) {
+			return true;
+		}
 
 		return $this->CanRestoreMembers()->byID($member->ID)
 			|| $member->inGroups($this->CanRestoreGroups());
@@ -360,12 +383,21 @@ 
 	 */
 	public function canBackup($member = null) {
 		$project = $this->Project();
-		if($project->HasDiskQuota() && $project->HasExceededDiskQuota()) return false;
+		if($project->HasDiskQuota() && $project->HasExceededDiskQuota()) {
+			return false;
+		}
 
-		if(!$member) $member = Member::currentUser();
-		if(!$member) return false; // Must be logged in to check permissions
+		if(!$member) {
+			$member = Member::currentUser();
+		}
+		if(!$member) {
+			return false;
+		}
+		// Must be logged in to check permissions
 
-		if(Permission::checkMember($member, 'ADMIN')) return true;
+		if(Permission::checkMember($member, 'ADMIN')) {
+			return true;
+		}
 
 		return $this->CanBackupMembers()->byID($member->ID)
 			|| $member->inGroups($this->CanBackupGroups());
@@ -384,12 +416,21 @@ 
 	 */
 	public function canUploadArchive($member = null) {
 		$project = $this->Project();
-		if($project->HasDiskQuota() && $project->HasExceededDiskQuota()) return false;
+		if($project->HasDiskQuota() && $project->HasExceededDiskQuota()) {
+			return false;
+		}
 
-		if(!$member) $member = Member::currentUser();
-		if(!$member) return false; // Must be logged in to check permissions
+		if(!$member) {
+			$member = Member::currentUser();
+		}
+		if(!$member) {
+			return false;
+		}
+		// Must be logged in to check permissions
 
-		if(Permission::checkMember($member, 'ADMIN')) return true;
+		if(Permission::checkMember($member, 'ADMIN')) {
+			return true;
+		}
 
 		return $this->ArchiveUploaders()->byID($member->ID)
 			|| $member->inGroups($this->ArchiveUploaderGroups());
@@ -403,10 +444,17 @@ 
 	 * @return boolean true if $member can download archives from this environment, false if they can't.
 	 */
 	public function canDownloadArchive($member = null) {
-		if(!$member) $member = Member::currentUser();
-		if(!$member) return false; // Must be logged in to check permissions
+		if(!$member) {
+			$member = Member::currentUser();
+		}
+		if(!$member) {
+			return false;
+		}
+		// Must be logged in to check permissions
 
-		if(Permission::checkMember($member, 'ADMIN')) return true;
+		if(Permission::checkMember($member, 'ADMIN')) {
+			return true;
+		}
 		return $this->ArchiveDownloaders()->byID($member->ID)
 			|| $member->inGroups($this->ArchiveDownloaderGroups());
 	}
@@ -418,10 +466,16 @@ 
 	 * @return boolean
 	 */
 	public function canAbort($member = null) {
-		if(!$member) $member = Member::currentUser();
-		if(!$member) return false;
+		if(!$member) {
+			$member = Member::currentUser();
+		}
+		if(!$member) {
+			return false;
+		}
 
-		if(Permission::checkMember($member, 'ADMIN')) return true;
+		if(Permission::checkMember($member, 'ADMIN')) {
+			return true;
+		}
 
 		return $this->PipelineCancellers()->byID($member->ID)
 			|| $member->inGroups($this->PipelineCancellerGroups());
@@ -434,10 +488,16 @@ 
 	 * @return boolean
 	 */
 	public function canApprove($member = null) {
-		if(!$member) $member = Member::currentUser();
-		if(!$member) return false;
+		if(!$member) {
+			$member = Member::currentUser();
+		}
+		if(!$member) {
+			return false;
+		}
 
-		if(Permission::checkMember($member, 'ADMIN')) return true;
+		if(Permission::checkMember($member, 'ADMIN')) {
+			return true;
+		}
 		return $this->PipelineApprovers()->byID($member->ID)
 			|| $member->inGroups($this->PipelineApproverGroups());
 	}
@@ -450,10 +510,17 @@ 
 	 * @return boolean true if $member can delete archives from this environment, false if they can't.
 	 */
 	public function canDeleteArchive($member = null) {
-		if(!$member) $member = Member::currentUser();
-		if(!$member) return false; // Must be logged in to check permissions
+		if(!$member) {
+			$member = Member::currentUser();
+		}
+		if(!$member) {
+			return false;
+		}
+		// Must be logged in to check permissions
 
-		if(Permission::checkMember($member, 'ADMIN')) return true;
+		if(Permission::checkMember($member, 'ADMIN')) {
+			return true;
+		}
 
 		return $this->ArchiveDeleters()->byID($member->ID)
 			|| $member->inGroups($this->ArchiveDeleterGroups());
@@ -973,7 +1040,9 @@ 
 	 * Write the deployment config file to filesystem
 	 */
 	protected function writeConfigFile() {
-		if(!$this->config()->get('allow_web_editing')) return;
+		if(!$this->config()->get('allow_web_editing')) {
+			return;
+		}
 
 		// Create a basic new environment config from a template
 		if( !$this->envFileExists()
@@ -991,7 +1060,9 @@ 
 	 * Write the pipeline config file to filesystem
 	 */
 	protected function writePipelineFile() {
-		if(!$this->config()->get('allow_web_editing')) return;
+		if(!$this->config()->get('allow_web_editing')) {
+			return;
+		}
 		$path = $this->getPipelineFilename();
 		if($this->PipelineConfig) {
 			// Update file
@@ -1058,9 +1129,13 @@ 
 	 */
 	public function getPipelineFilename() {
 		$name = $this->getConfigFilename();
-		if(!$name) return null;
+		if(!$name) {
+			return null;
+		}
 		$path = pathinfo($name);
-		if($path) return $path['dirname'] . '/' . $path['filename'] . '.yml';
+		if($path) {
+			return $path['dirname'] . '/' . $path['filename'] . '.yml';
+		}
 	}
 
 	/**
@@ -1086,7 +1161,9 @@ 
 	 */
 	public static function array_to_viewabledata($array) {
 		// Don't transform non-arrays
-		if(!is_array($array)) return $array;
+		if(!is_array($array)) {
+			return $array;
+		}
 
 		// Figure out whether this is indexed or associative
 		$keys = array_keys($array);
@@ -1119,17 +1196,23 @@ 
 	public function getDependentFilteredCommits() {
 		// check if this environment depends on another environemnt
 		$dependsOnEnv = $this->DependsOnEnvironment();
-		if(empty($dependsOnEnv)) return null;
+		if(empty($dependsOnEnv)) {
+			return null;
+		}
 
 		// Check if there is a filter
 		$config = $this->GenericPipelineConfig();
 		$filter = isset($config->PipelineConfig->FilteredCommits)
 			? $config->PipelineConfig->FilteredCommits
 			: null;
-		if (empty($filter)) return null;
+		if (empty($filter)) {
+			return null;
+		}
 
 		// Create and execute filter
-		if (!class_exists($filter)) throw new Exception(sprintf("Class %s does not exist", $filter));
+		if (!class_exists($filter)) {
+			throw new Exception(sprintf("Class %s does not exist", $filter));
+		}
 		$commitClass = $filter::create();
 		// setup the environment to check for commits
 		$commitClass->env = $dependsOnEnv;

code/model/Pipeline.php

Upper-Lower-Casing +1 added lines, -1 removed lines

@@ -257,7 +257,7 @@
 	 * @return string
 	 */
 	public function getTitle() {
-		return "Pipeline {$this->ID} (Status: {$this->Status})";
+		return "pipeline {$this->ID} (Status: {$this->Status})";
 	}
 
 	/**

Doc Comments +6 added lines, -4 removed lines

@@ -368,7 +368,6 @@ 
 	 * Retrieve the value of a specific config setting
 	 *
 	 * @param string $setting Settings
-	 * @param string $setting,... Sub-settings
 	 * @return mixed Value of setting, or null if not set
 	 */
 	public function getConfigSetting($setting) {
@@ -773,7 +772,7 @@ 
 	 * Sends a specific message to all marked recipients, including the author of this pipeline
 	 *
 	 * @param string $messageID Message ID. One of 'Abort', 'Success', or 'Failure', or some custom message
-	 * @return boolean True if successful
+	 * @return boolean|null True if successful
 	 */
 	public function sendMessage($messageID) {
 		// Check message, subject, and additional arguments to include
@@ -922,7 +921,7 @@ 
 	/**
 	 * Finds the next {@link PipelineStep} that needs to execute. Relies on $this->CurrentStep() being a valid step.
 	 *
-	 * @return PipelineStep|null The next step in the pipeline, or null if none remain.
+	 * @return DataObject|null The next step in the pipeline, or null if none remain.
 	 */
 	protected function findNextStep() {
 		// otherwise get next step in chain
@@ -939,7 +938,7 @@ 
 	/**
 	 * Finds the previous {@link PipelineStep} that executed. Relies on $this->CurrentStep() being a valid step.
 	 *
-	 * @return PipelineStep|null The previous step in the pipeline, or null if this is the first.
+	 * @return DataObject|null The previous step in the pipeline, or null if this is the first.
 	 */
 	public function findPreviousStep() {
 		// otherwise get previous step in chain
@@ -1013,6 +1012,9 @@ 
 		return $this->getField('DryRun');
 	}
 
+	/**
+	 * @param string $action
+	 */
 	public function Link($action = null) {
 		return Controller::join_links($this->Environment()->Link(), 'pipeline', $this->ID, $action);
 	}

Spacing +15 added lines, -15 removed lines

@@ -301,8 +301,8 @@ 
 
 		// Get logs from rollback steps (only for RollbackSteps).
 		$rollbackSteps = array($this->RollbackStep1(), $this->RollbackStep2());
-		foreach ($rollbackSteps as $rollback) {
-			if($rollback->exists() && $rollback->ClassName=='RollbackStep') {
+		foreach($rollbackSteps as $rollback) {
+			if($rollback->exists() && $rollback->ClassName == 'RollbackStep') {
 				if($rollback->RollbackDeploymentID > 0) {
 					$logs[] = array(
 						'ButtonText' => 'Rollback Log',
@@ -598,11 +598,11 @@ 
 		$success = true;
 		$rollback1 = $this->RollbackStep1();
 		$rollback2 = $this->RollbackStep2();
-		if (!empty($rollback1) && $rollback1->Status=='Failed') $success = false;
-		if (!empty($rollback2) && $rollback2->Status=='Failed') $success = false;
+		if(!empty($rollback1) && $rollback1->Status == 'Failed') $success = false;
+		if(!empty($rollback2) && $rollback2->Status == 'Failed') $success = false;
 
 		// Send messages.
-		if ($success) {
+		if($success) {
 			$this->log("Pipeline failed, but rollback completed successfully.");
 			$this->sendMessage(self::ALERT_ROLLBACK_SUCCESS);
 		} else {
@@ -632,7 +632,7 @@ 
 
 		// Add smoke test step, if available, for later processing.
 		$configRollback2 = $this->getConfigSetting('RollbackStep2');
-		if ($configRollback2) {
+		if($configRollback2) {
 			$stepRollback2 = $this->pushPipelineStep('RollbackStep2', $configRollback2);
 			$this->RollbackStep2ID = $stepRollback2->ID;
 		}
@@ -648,10 +648,10 @@ 
 	 */
 	protected function canStartRollback() {
 		// The rollback cannot run twice.
-		if ($this->isRollback()) return false;
+		if($this->isRollback()) return false;
 
 		// Rollbacks must be configured.
-		if (!$this->getConfigSetting('RollbackStep1')) return false;
+		if(!$this->getConfigSetting('RollbackStep1')) return false;
 
 		// On dryrun let rollback run
 		if($this->DryRun) return true;
@@ -659,7 +659,7 @@ 
 		// Pipeline must have ran a deployment to be able to rollback.
 		$deploy = $this->CurrentDeployment();
 		$previous = $this->PreviousDeployment();
-		if (!$deploy->exists() || !$previous->exists()) return false;
+		if(!$deploy->exists() || !$previous->exists()) return false;
 
 		return true;
 	}
@@ -675,12 +675,12 @@ 
 		// Abort all running or queued steps.
 		$steps = $this->Steps();
 		foreach($steps as $step) {
-			if ($step->isQueued() || $step->isRunning()) $step->abort();
+			if($step->isQueued() || $step->isRunning()) $step->abort();
 		}
 
 		if($this->canStartRollback()) {
 			$this->beginRollback();
-		} else if ($this->isRollback()) {
+		} else if($this->isRollback()) {
 			$this->finaliseRollback();
 		} else {
 			// Not able to roll back - fail immediately.
@@ -723,7 +723,7 @@ 
 		// Abort all running or queued steps.
 		$steps = $this->Steps();
 		foreach($steps as $step) {
-			if ($step->isQueued() || $step->isRunning()) $step->abort();
+			if($step->isQueued() || $step->isRunning()) $step->abort();
 		}
 
 		// Send notification to users about this event
@@ -738,7 +738,7 @@ 
 	 */
 	protected function generateMessageTemplate($messageID) {
 		$subject = $this->getConfigSetting('PipelineConfig', 'Subjects', $messageID);
-		$message = $this->getConfigSetting('PipelineConfig', 'Messages',  $messageID);
+		$message = $this->getConfigSetting('PipelineConfig', 'Messages', $messageID);
 		$substitutions = $this->getReplacements();
 		return $this->injectMessageReplacements($message, $subject, $substitutions);
 	}
@@ -887,7 +887,7 @@ 
 			if(!$nextStep) {
 
 				// Special handling, since the main pipeline has already failed at this stage.
-				if ($this->isRollback()) {
+				if($this->isRollback()) {
 					$this->finaliseRollback();
 					return false;
 				}
@@ -897,7 +897,7 @@ 
 					'PipelineID' => $this->ID,
 					'Status' => 'Failed'
 				))->count();
-				if ($failedSteps) {
+				if($failedSteps) {
 					$this->log('At least one of the steps has failed marking the pipeline as failed');
 					$this->markFailed();
 					return false;

Braces +59 added lines, -19 removed lines

@@ -198,7 +198,9 @@ 
 	public function __isset($property) {
 		// Workaround fixed in https://github.com/silverstripe/silverstripe-framework/pull/3201
 		// Remove this once we update to a version of framework which supports this
-		if($property === 'MessagingService') return !empty($this->messagingService);
+		if($property === 'MessagingService') {
+			return !empty($this->messagingService);
+		}
 		return parent::__isset($property);
 	}
 
@@ -234,8 +236,12 @@ 
 	public function canAbort($member = null) {
 		// Owner can abort
 		$member = $member ?: Member::currentUser();
-		if(!$member) return false;
-		if($member->ID == $this->AuthorID) return true;
+		if(!$member) {
+			return false;
+		}
+		if($member->ID == $this->AuthorID) {
+			return true;
+		}
 
 		// Check environment permission
 		return $this->Environment()->canAbort($member);
@@ -263,7 +269,9 @@ 
 	 * @return ArrayList List of items with a Link and Title attribute
 	 */
 	public function RunningOptions() {
-		if(!$this->isActive()) return null;
+		if(!$this->isActive()) {
+			return null;
+		}
 		$actions = array();
 
 		// Let current step update the current list of options
@@ -279,7 +287,9 @@ 
 	 * @return ArrayList List of logs with a Link and Title attribute
 	 */
 	public function LogOptions() {
-		if(!$this->isActive()) return null;
+		if(!$this->isActive()) {
+			return null;
+		}
 		$logs[] = array(
 			'ButtonText' => 'Pipeline Log',
 			'Link' => $this->Link()
@@ -374,7 +384,9 @@ 
 	public function getConfigSetting($setting) {
 		$source = $this->getConfigData();
 		foreach(func_get_args() as $setting) {
-			if(empty($source[$setting])) return null;
+			if(empty($source[$setting])) {
+				return null;
+			}
 			$source = $source[$setting];
 		}
 		return $source;
@@ -598,8 +610,12 @@ 
 		$success = true;
 		$rollback1 = $this->RollbackStep1();
 		$rollback2 = $this->RollbackStep2();
-		if (!empty($rollback1) && $rollback1->Status=='Failed') $success = false;
-		if (!empty($rollback2) && $rollback2->Status=='Failed') $success = false;
+		if (!empty($rollback1) && $rollback1->Status=='Failed') {
+			$success = false;
+		}
+		if (!empty($rollback2) && $rollback2->Status=='Failed') {
+			$success = false;
+		}
 
 		// Send messages.
 		if ($success) {
@@ -648,18 +664,26 @@ 
 	 */
 	protected function canStartRollback() {
 		// The rollback cannot run twice.
-		if ($this->isRollback()) return false;
+		if ($this->isRollback()) {
+			return false;
+		}
 
 		// Rollbacks must be configured.
-		if (!$this->getConfigSetting('RollbackStep1')) return false;
+		if (!$this->getConfigSetting('RollbackStep1')) {
+			return false;
+		}
 
 		// On dryrun let rollback run
-		if($this->DryRun) return true;
+		if($this->DryRun) {
+			return true;
+		}
 
 		// Pipeline must have ran a deployment to be able to rollback.
 		$deploy = $this->CurrentDeployment();
 		$previous = $this->PreviousDeployment();
-		if (!$deploy->exists() || !$previous->exists()) return false;
+		if (!$deploy->exists() || !$previous->exists()) {
+			return false;
+		}
 
 		return true;
 	}
@@ -675,7 +699,9 @@ 
 		// Abort all running or queued steps.
 		$steps = $this->Steps();
 		foreach($steps as $step) {
-			if ($step->isQueued() || $step->isRunning()) $step->abort();
+			if ($step->isQueued() || $step->isRunning()) {
+				$step->abort();
+			}
 		}
 
 		if($this->canStartRollback()) {
@@ -687,7 +713,9 @@ 
 			$this->Status = 'Failed';
 			$this->log("Pipeline failed, not running rollback (not configured or not applicable yet).");
 			$this->write();
-			if($notify) $this->sendMessage(self::ALERT_FAILURE);
+			if($notify) {
+				$this->sendMessage(self::ALERT_FAILURE);
+			}
 		}
 	}
 
@@ -723,7 +751,9 @@ 
 		// Abort all running or queued steps.
 		$steps = $this->Steps();
 		foreach($steps as $step) {
-			if ($step->isQueued() || $step->isRunning()) $step->abort();
+			if ($step->isQueued() || $step->isRunning()) {
+				$step->abort();
+			}
 		}
 
 		// Send notification to users about this event
@@ -753,7 +783,9 @@ 
 	 */
 	public function injectMessageReplacements($message, $subject, $substitutions) {
 		// Handle empty messages
-		if(empty($subject) && empty($message)) return array(null, null);
+		if(empty($subject) && empty($message)) {
+			return array(null, null);
+		}
 
 		// Check if there's a role specific message
 		$subjectText = str_replace(
@@ -977,8 +1009,14 @@ 
 		$caller = $bt[$index];
 		$caller['line'] = $bt[($index - 1)]['line']; // Overwrite line and file to be the the line/file that actually
 		$caller['file'] = $bt[($index - 1)]['file']; // called the function, not where the function is defined.
-		if(!isset($caller['class'])) $caller['class'] = ''; // In case it wasn't called from a class
-		if(!isset($caller['type'])) $caller['type'] = ''; // In case it doesn't have a type (wasn't called from class)
+		if(!isset($caller['class'])) {
+			$caller['class'] = '';
+		}
+		// In case it wasn't called from a class
+		if(!isset($caller['type'])) {
+			$caller['type'] = '';
+		}
+		// In case it doesn't have a type (wasn't called from class)
 
 		$log->write(sprintf("[%s::%s() (line %d)] %s", $caller['class'], $caller['function'], $caller['line'], $message));
 	}
@@ -1038,7 +1076,9 @@ 
 	public function LogContent() {
 		if($this->exists() && $this->Environment()) {
 			$logger = $this->getLogger();
-			if($logger->exists()) return $logger->content();
+			if($logger->exists()) {
+				return $logger->content();
+			}
 		}
 	}
 

code/model/steps/UserConfirmationStep.php

Upper-Lower-Casing +1 added lines, -1 removed lines

@@ -282,7 +282,7 @@
 	 */
 	public function startApproval() {
 		$this->Status = 'Started';
-		$this->log("Starting {$this->Title}...");
+		$this->log("starting {$this->Title}...");
 		// Determine if we should use delayed notification
 		$recipientGroup = 'all';
 		if($this->getConfigSetting('RecipientsDelay')) {

Doc Comments +1 added lines, -1 removed lines

@@ -319,7 +319,7 @@
 	 * @param string $messageID Message ID. One of 'Reject', 'Approve', 'TimeOut' or 'Request'
 	 * @param mixed $recipientGroup Either a numeric index of the next recipient to send to, or "all" for all
 	 * This is used for delayed notification so that failover recipients can be notified.
-	 * @return boolean True if successful
+	 * @return boolean|null True if successful
 	 */
 	protected function sendMessage($messageID, $recipientGroup = 'all') {
 		// Add additionally configured arguments

Braces +9 added lines, -3 removed lines

@@ -179,7 +179,9 @@ 
 		}
 
 		// Skip subsequent approvals if already approved / rejected
-		if($this->hasResponse()) return;
+		if($this->hasResponse()) {
+			return;
+		}
 
 		// Approve
 		$this->Approval = 'Approved';
@@ -205,7 +207,9 @@ 
 		}
 
 		// Skip subsequent approvals if already approved / rejected
-		if($this->hasResponse()) return;
+		if($this->hasResponse()) {
+			return;
+		}
 
 		// Reject
 		$this->Approval = 'Rejected';
@@ -363,7 +367,9 @@ 
 	public function getRunningDescription() {
 
 		// Don't show options if this step has already been confirmed
-		if($this->hasResponse() || !$this->isRunning()) return;
+		if($this->hasResponse() || !$this->isRunning()) {
+			return;
+		}
 
 		return 'This deployment is currently awaiting approval before it can complete.';
 	}

code/tasks/DNMigrate1_1to1_2.php

Indentation +3 added lines, -3 removed lines

@@ -1,8 +1,8 @@
 <?php
 /**
- * Will convert the Filename to the version 1.2 of deploynaut where it
- * more or less is exactly is the same as the Name but with .rb
- */
+	 * Will convert the Filename to the version 1.2 of deploynaut where it
+	 * more or less is exactly is the same as the Name but with .rb
+	 */
 class DNMigrate1_1to1_2 extends BuildTask {
 	/**
 	 * @param SS_HTTPRequest $request

Spacing +2 added lines, -2 removed lines

@@ -14,7 +14,7 @@ 
 			foreach($environments as $environment) {
 				$newFilename = basename($environment->Filename);
 				if($environment->Filename != $newFilename) {
-					echo 'Migrating "'.$environment->Filename.'" to '.$newFilename.PHP_EOL;
+					echo 'Migrating "' . $environment->Filename . '" to ' . $newFilename . PHP_EOL;
 					$environment->Filename = $newFilename;
 					$environment->write();
 				}
@@ -26,7 +26,7 @@ 
 		foreach($projects as $project) {
 			if(!$project->projectFolderExists()) {
 				$warnings = true;
-				echo 'Project '.$project->Name.' don\'t have a cap project folder'.PHP_EOL;
+				echo 'Project ' . $project->Name . ' don\'t have a cap project folder' . PHP_EOL;
 			}
 		}
 		if($warnings) {

code/tasks/FilesystemSyncTask.php

Indentation +2 added lines, -2 removed lines

@@ -1,7 +1,7 @@
 <?php
 /**
- * Surface Filesystem::sync() as a dev task in case CMS has not been included.
- */
+	 * Surface Filesystem::sync() as a dev task in case CMS has not been included.
+	 */
 class CMSFilesystemSyncTask extends BuildTask {
 	public function run($request = null) {
 		Filesystem::sync();

code/model/steps/SmokeTestPipelineStep.php

Upper-Lower-Casing +1 added lines, -1 removed lines

@@ -282,7 +282,7 @@
 	 */
 	public function startApproval() {
 		$this->Status = 'Started';
-		$this->log("Starting {$this->Title}...");
+		$this->log("starting {$this->Title}...");
 		// Determine if we should use delayed notification
 		$recipientGroup = 'all';
 		if($this->getConfigSetting('RecipientsDelay')) {

Spacing +2 added lines, -2 removed lines

@@ -125,7 +125,7 @@ 
 		curl_setopt($ch, CURLOPT_URL, $test['URL']);
 
 		// Allow individual tests to override number of attempts
-		$attempts = (int) $this->getConfigSetting('Attempts');
+		$attempts = (int)$this->getConfigSetting('Attempts');
 		if(!empty($test['Attempts'])) $attempts = $test['Attempts'];
 
 		// Run through each attempt
@@ -146,7 +146,7 @@ 
 			}
 
 			// Check response
-			$info =	curl_getinfo($ch);
+			$info = curl_getinfo($ch);
 
 			// if an expected response time is specified, check that against the results
 			if(isset($test['ExpectResponse'])) {

Braces +9 added lines, -3 removed lines

@@ -74,7 +74,9 @@ 
 		} elseif(!$tests && $defaultTests) {
 			$tests = $defaultTests;
 		}
-		if($tests) return $tests;
+		if($tests) {
+			return $tests;
+		}
 
 		// if there's no tests to check for, fallback to trying to find the
 		// site's homepage by looking at the DNEnvironment fields.
@@ -126,7 +128,9 @@ 
 
 		// Allow individual tests to override number of attempts
 		$attempts = (int) $this->getConfigSetting('Attempts');
-		if(!empty($test['Attempts'])) $attempts = $test['Attempts'];
+		if(!empty($test['Attempts'])) {
+			$attempts = $test['Attempts'];
+		}
 
 		// Run through each attempt
 		for($i = 0; $i < $attempts; $i++) {
@@ -189,7 +193,9 @@ 
 		}
 
 		// Run out of re-attempts
-		if($attempts > 1) $this->log("Failed after {$attempts} attempts");
+		if($attempts > 1) {
+			$this->log("Failed after {$attempts} attempts");
+		}
  		return false;
 	}
 

code/model/steps/TriggerDeployStep.php

Upper-Lower-Casing +1 added lines, -1 removed lines

@@ -282,7 +282,7 @@
 	 */
 	public function startApproval() {
 		$this->Status = 'Started';
-		$this->log("Starting {$this->Title}...");
+		$this->log("starting {$this->Title}...");
 		// Determine if we should use delayed notification
 		$recipientGroup = 'all';
 		if($this->getConfigSetting('RecipientsDelay')) {

Spacing +3 added lines, -3 removed lines

@@ -39,7 +39,7 @@ 
 		}
 
 		// check if we have timed out
-		if ($this->isTimedOut()) {
+		if($this->isTimedOut()) {
 			$this->log(sprintf(_t('TriggerDeployStep.DEPLOYTIMEOUT',
 				'Deployment step is older then %s seconds and has timed out'),
 				$this->MaxDuration));
@@ -86,7 +86,7 @@ 
 			);
 		}
 
-		if ($this->Status == 'Queued') {
+		if($this->Status == 'Queued') {
 			$this->start();
 		}
 		// Trigger deployment
@@ -103,7 +103,7 @@ 
 	 */
 	public function StartDeployment() {
 		$this->Status = 'Started';
-		if (!$this->Started) $this->Started = SS_Datetime::now()->Rfc2822();
+		if(!$this->Started) $this->Started = SS_Datetime::now()->Rfc2822();
 		$this->log("Starting {$this->Title}...");
 		$this->write();
 		return true;

Braces +6 added lines, -2 removed lines

@@ -103,7 +103,9 @@ 
 	 */
 	public function StartDeployment() {
 		$this->Status = 'Started';
-		if (!$this->Started) $this->Started = SS_Datetime::now()->Rfc2822();
+		if (!$this->Started) {
+			$this->Started = SS_Datetime::now()->Rfc2822();
+		}
 		$this->log("Starting {$this->Title}...");
 		$this->write();
 		return true;
@@ -111,7 +113,9 @@ 
 
 	public function getRunningDescription() {
 		// Don't show options if this step has already been confirmed
-		if($this->Deployed) return;
+		if($this->Deployed) {
+			return;
+		}
 
 		return _t('TriggerDeployStep.RUNNINGDESCRIPTION',
 			'Please press the "Deploy" button to continue deployment');

code/api/DeploynautAPI.php

Doc Comments +1 added lines, -1 removed lines

@@ -41,7 +41,7 @@
 	/**
 	 *
 	 * @param SS_HTTPRequest $request
-	 * @return string
+	 * @return SS_HTTPResponse
 	 */
 	public function listProjects(SS_HTTPRequest $request) {
 		$response = array(

Spacing +1 added lines, -1 removed lines

@@ -49,7 +49,7 @@
 			'projects' => array(),
 		);
 
-		if($request->httpMethod() != 'GET') return $this->message('API not found', 404);;
+		if($request->httpMethod() != 'GET') return $this->message('API not found', 404); ;
 
 		foreach(DNProject::get() as $item) {
 			if($item->canView($this->getMember())) {

Braces +4 added lines, -1 removed lines

@@ -49,7 +49,10 @@
 			'projects' => array(),
 		);
 
-		if($request->httpMethod() != 'GET') return $this->message('API not found', 404);;
+		if($request->httpMethod() != 'GET') {
+			return $this->message('API not found', 404);
+		}
+		;
 
 		foreach(DNProject::get() as $item) {
 			if($item->canView($this->getMember())) {