silverstripe / deploynaut

code/model/DNData.php

Braces +12 added lines, -4 removed lines

@@ -52,7 +52,9 @@ 
 		parent::__construct();
 
 		// Better to use injector to set these
-		if(func_num_args() == 0) return;
+		if(func_num_args() == 0) {
+			return;
+		}
 		Deprecation::notice(
 			'1.2.0',
 			"Don't construct DNData with parameters. Assign settings via properties instead"
@@ -78,7 +80,9 @@ 
 	 * @param string $environmentDir
 	 */
 	public function setEnvironmentDir($environmentDir) {
-		if($environmentDir[0] != "/") $environmentDir = BASE_PATH . '/' . $environmentDir;
+		if($environmentDir[0] != "/") {
+			$environmentDir = BASE_PATH . '/' . $environmentDir;
+		}
 		$this->environmentDir = realpath($environmentDir) ?: $environmentDir;
 	}
 
@@ -97,7 +101,9 @@ 
 	 * @param string $keyDir
 	 */
 	public function setKeyDir($keyDir) {
-		if($keyDir[0] != "/") $keyDir = BASE_PATH . '/' . $keyDir;
+		if($keyDir[0] != "/") {
+			$keyDir = BASE_PATH . '/' . $keyDir;
+		}
 		$this->keyDir = realpath($keyDir) ?: $keyDir;
 	}
 
@@ -137,7 +143,9 @@ 
 	 * @param string $transferDir
 	 */
 	public function setDataTransferDir($transferDir) {
-		if($transferDir[0] != "/") $transferDir = BASE_PATH . '/' . $transferDir;
+		if($transferDir[0] != "/") {
+			$transferDir = BASE_PATH . '/' . $transferDir;
+		}
 		if(strpos($transferDir, ASSETS_PATH) === false) {
 			throw new LogicException(sprintf(
 				'DNData::dataTransferDir needs to be located within <webroot>assets/ (location: %s)',

code/model/DNDataArchive.php

Braces +19 added lines, -6 removed lines

@@ -207,7 +207,9 @@ 
 	 */
 	public function canRestore($member = null) {
 		$memberID = $member ? $member->ID : Member::currentUserID();
-		if(!$memberID) return false;
+		if(!$memberID) {
+			return false;
+		}
 
 		$key = $memberID . '-' . $this->EnvironmentID;
 		if(!isset(self::$_cache_can_restore[$key])) {
@@ -226,7 +228,9 @@ 
 	 */
 	public function canDownload($member = null) {
 		$memberID = $member ? $member->ID : Member::currentUserID();
-		if(!$memberID) return false;
+		if(!$memberID) {
+			return false;
+		}
 
 		$key = $memberID . '-' . $this->EnvironmentID;
 		if(!isset(self::$_cache_can_download[$key])) {
@@ -259,14 +263,23 @@ 
 			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
 
 		// Admin can always move.
-		if(Permission::checkMember($member, 'ADMIN')) return true;
+		if(Permission::checkMember($member, 'ADMIN')) {
+			return true;
+		}
 
 		// Checks if the user can actually access the archive.
-		if (!$this->canDownload($member)) return false;
+		if (!$this->canDownload($member)) {
+			return false;
+		}
 
 		// Hooks into ArchiveUploaders permission to prevent proliferation of permission checkboxes.
 		// Bypasses the quota check - we don't need to check for it as long as we move the snapshot within the project.

code/model/DNEnvironment.php

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/DNProject.php

Braces +9 added lines, -3 removed lines

@@ -181,9 +181,13 @@ 
 	 * @return boolean
 	 */
 	public function canView($member = null) {
-		if(!$member) $member = Member::currentUser();
+		if(!$member) {
+			$member = Member::currentUser();
+		}
 
-		if(Permission::checkMember($member, 'ADMIN')) return true;
+		if(Permission::checkMember($member, 'ADMIN')) {
+			return true;
+		}
 
 		return $member->inGroups($this->Viewers());
 	}
@@ -553,7 +557,9 @@ 
 	 */
 	public function getKeyDir() {
 		$keyDir = $this->DNData()->getKeyDir();
-		if(!$keyDir) return null;
+		if(!$keyDir) {
+			return null;
+		}
 
 		$filter = FileNameFilter::create();
 		$name = $filter->filter($this->Name);

code/model/DNReferenceList.php

Braces +6 added lines, -2 removed lines

@@ -61,7 +61,9 @@ 
 	protected function getReferences() {
 		$repository = new Gitonomy\Git\Repository($this->project->LocalCVSPath);
 		if($this->getTags) {
-			if($this->reference) throw new LogicException("Can't have \$reference and \$getTags both set");
+			if($this->reference) {
+				throw new LogicException("Can't have \$reference and \$getTags both set");
+			}
 			$log = $repository->getReferences()->getTags();
 
 		} else if($this->reference) {
@@ -140,7 +142,9 @@ 
 			$this->loaded = true;
 		}
 		foreach($this->items as $i => $item) {
-			if(is_array($item)) $this->items[$i] = new ArrayData($item);
+			if(is_array($item)) {
+				$this->items[$i] = new ArrayData($item);
+			}
 		}
 		return new ArrayIterator($this->items);
 	}

code/model/Pipeline.php

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/EmergencyRollbackStep.php

Braces +6 added lines, -2 removed lines

@@ -127,7 +127,9 @@ 
 	 */
 	public function beginRollbackWindow() {
 		$this->Status = 'Started';
-		if (!$this->Started) $this->Started = SS_Datetime::now()->Rfc2822();
+		if (!$this->Started) {
+			$this->Started = SS_Datetime::now()->Rfc2822();
+		}
 		$this->log(_t('EmergencyRollbackStep.BEGINROLLBACKWINDOW',
 			"{$this->Title} is beginning a rollback window..."));
 		$this->write();
@@ -138,7 +140,9 @@ 
 
 	public function getRunningDescription() {
 		// Don't show options if this step has already been confirmed
-		if($this->RolledBack) return;
+		if($this->RolledBack) {
+			return;
+		}
 
 		return _t('EmergencyRollbackStep.RUNNINGDESCRIPTION',
 			'You may now roll back to the previous version, if needed.');

code/model/steps/LongRunningPipelineStep.php

Braces +3 added lines, -1 removed lines

@@ -41,7 +41,9 @@
 		if($this->Started) {
 			$started = intval($this->dbObject('Started')->Format('U'));
 			$now = intval(SS_Datetime::now()->Format('U'));
-			if($started && $now) return $now - $started;
+			if($started && $now) {
+				return $now - $started;
+			}
 		}
 		return 0;
 	}

code/model/steps/PipelineStep.php

Braces +6 added lines, -2 removed lines

@@ -89,7 +89,9 @@ 
 	 * @return array
 	 */
 	public function getConfigData() {
-		if(!$this->Config) return array();
+		if(!$this->Config) {
+			return array();
+		}
 
 		// Merge with defaults
 		if(!$this->mergedConfig) {
@@ -125,7 +127,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;