silverstripe / deploynaut

code/backends/DeploymentStrategy.php

Doc Comments +2 added lines

@@ -75,6 +75,7 @@ 
 	}
 
 	/**
+	 * @param string $code
 	 */
 	public function setActionCode($code) {
 		$this->actionCode = $code;
@@ -89,6 +90,7 @@ 
 
 	/**
 	 * @param int
+	 * @param string $seconds
 	 */
 	public function setEstimatedTime($seconds) {
 		$this->estimatedTime = $seconds;

Spacing +3 added lines, -3 removed lines

@@ -130,10 +130,10 @@
 	 */
 	public function getChangesModificationNeeded() {
 		$filtered = [];
-		foreach ($this->changes as $change => $details) {
-			if (array_key_exists('description', $details)) {
+		foreach($this->changes as $change => $details) {
+			if(array_key_exists('description', $details)) {
 				$filtered[$change] = $details;
-			} else if (
+			} else if(
 				(array_key_exists('from', $details) || array_key_exists('to', $details))
 				&& $details['from'] !== $details['to']
 			) {

Braces +6 added lines, -2 removed lines

@@ -110,8 +110,12 @@
 		// Normalise "empty" values into dashes so comparisons are done properly.
 		// This means there is no diference between an empty string and a null
 		// but "0" is considered to be non-empty.
-		if(empty($from) && !strlen($from)) $from = '-';
-		if(empty($to) && !strlen($to)) $to = '-';
+		if(empty($from) && !strlen($from)) {
+			$from = '-';
+		}
+		if(empty($to) && !strlen($to)) {
+			$to = '-';
+		}
 
 		return $this->changes[$title] = array(
 			'from' => $from,

code/extensions/FrontendLink.php

Spacing +1 added lines, -1 removed lines

@@ -3,7 +3,7 @@
 class FrontendLink extends DataExtension {
 
 	public function updateItemEditForm($form) {
-		if ($this->owner->record->hasMethod('Link')) {
+		if($this->owner->record->hasMethod('Link')) {
 			$link = sprintf(
 				'<a style="margin: 0.5em" target="deploynaut-frontend" href="%s">Preview &raquo;</a>',
 				$this->owner->record->Link()

code/model/DNEnvironment.php

Braces +36 added lines, -12 removed lines

@@ -386,9 +386,13 @@ 
 		// Must be logged in to check permissions
 
 		if ($this->Usage==='Production' || $this->Usage==='Unspecified') {
-			if ($this->Project()->allowed(DNRoot::ALLOW_PROD_DEPLOYMENT, $member)) return true;
+			if ($this->Project()->allowed(DNRoot::ALLOW_PROD_DEPLOYMENT, $member)) {
+				return true;
+			}
 		} else {
-			if ($this->Project()->allowed(DNRoot::ALLOW_NON_PROD_DEPLOYMENT, $member)) return true;
+			if ($this->Project()->allowed(DNRoot::ALLOW_NON_PROD_DEPLOYMENT, $member)) {
+				return true;
+			}
 		}
 
 		return $this->Deployers()->byID($member->ID)
@@ -412,9 +416,13 @@ 
 		// Must be logged in to check permissions
 
 		if ($this->Usage==='Production' || $this->Usage==='Unspecified') {
-			if ($this->Project()->allowed(DNRoot::ALLOW_PROD_SNAPSHOT, $member)) return true;
+			if ($this->Project()->allowed(DNRoot::ALLOW_PROD_SNAPSHOT, $member)) {
+				return true;
+			}
 		} else {
-			if ($this->Project()->allowed(DNRoot::ALLOW_NON_PROD_SNAPSHOT, $member)) return true;
+			if ($this->Project()->allowed(DNRoot::ALLOW_NON_PROD_SNAPSHOT, $member)) {
+				return true;
+			}
 		}
 
 		return $this->CanRestoreMembers()->byID($member->ID)
@@ -443,9 +451,13 @@ 
 		}
 
 		if ($this->Usage==='Production' || $this->Usage==='Unspecified') {
-			if ($this->Project()->allowed(DNRoot::ALLOW_PROD_SNAPSHOT, $member)) return true;
+			if ($this->Project()->allowed(DNRoot::ALLOW_PROD_SNAPSHOT, $member)) {
+				return true;
+			}
 		} else {
-			if ($this->Project()->allowed(DNRoot::ALLOW_NON_PROD_SNAPSHOT, $member)) return true;
+			if ($this->Project()->allowed(DNRoot::ALLOW_NON_PROD_SNAPSHOT, $member)) {
+				return true;
+			}
 		}
 
 		return $this->CanBackupMembers()->byID($member->ID)
@@ -478,9 +490,13 @@ 
 		// Must be logged in to check permissions
 
 		if ($this->Usage==='Production' || $this->Usage==='Unspecified') {
-			if ($this->Project()->allowed(DNRoot::ALLOW_PROD_SNAPSHOT, $member)) return true;
+			if ($this->Project()->allowed(DNRoot::ALLOW_PROD_SNAPSHOT, $member)) {
+				return true;
+			}
 		} else {
-			if ($this->Project()->allowed(DNRoot::ALLOW_NON_PROD_SNAPSHOT, $member)) return true;
+			if ($this->Project()->allowed(DNRoot::ALLOW_NON_PROD_SNAPSHOT, $member)) {
+				return true;
+			}
 		}
 
 		return $this->ArchiveUploaders()->byID($member->ID)
@@ -504,9 +520,13 @@ 
 		// Must be logged in to check permissions
 
 		if ($this->Usage==='Production' || $this->Usage==='Unspecified') {
-			if ($this->Project()->allowed(DNRoot::ALLOW_PROD_SNAPSHOT, $member)) return true;
+			if ($this->Project()->allowed(DNRoot::ALLOW_PROD_SNAPSHOT, $member)) {
+				return true;
+			}
 		} else {
-			if ($this->Project()->allowed(DNRoot::ALLOW_NON_PROD_SNAPSHOT, $member)) return true;
+			if ($this->Project()->allowed(DNRoot::ALLOW_NON_PROD_SNAPSHOT, $member)) {
+				return true;
+			}
 		}
 
 		return $this->ArchiveDownloaders()->byID($member->ID)
@@ -573,9 +593,13 @@ 
 		// Must be logged in to check permissions
 
 		if ($this->Usage==='Production' || $this->Usage==='Unspecified') {
-			if ($this->Project()->allowed(DNRoot::ALLOW_PROD_SNAPSHOT, $member)) return true;
+			if ($this->Project()->allowed(DNRoot::ALLOW_PROD_SNAPSHOT, $member)) {
+				return true;
+			}
 		} else {
-			if ($this->Project()->allowed(DNRoot::ALLOW_NON_PROD_SNAPSHOT, $member)) return true;
+			if ($this->Project()->allowed(DNRoot::ALLOW_NON_PROD_SNAPSHOT, $member)) {
+				return true;
+			}
 		}
 
 		return $this->ArchiveDeleters()->byID($member->ID)

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

Spacing +24 added lines, -24 removed lines

@@ -311,10 +311,10 @@ 
 		}
 		// Must be logged in to check permissions
 
-		if ($this->Usage === self::PRODUCTION || $this->Usage === self::UNSPECIFIED) {
-			if ($this->Project()->allowed(DNRoot::ALLOW_PROD_DEPLOYMENT, $member)) return true;
+		if($this->Usage === self::PRODUCTION || $this->Usage === self::UNSPECIFIED) {
+			if($this->Project()->allowed(DNRoot::ALLOW_PROD_DEPLOYMENT, $member)) return true;
 		} else {
-			if ($this->Project()->allowed(DNRoot::ALLOW_NON_PROD_DEPLOYMENT, $member)) return true;
+			if($this->Project()->allowed(DNRoot::ALLOW_NON_PROD_DEPLOYMENT, $member)) return true;
 		}
 
 		return $this->Deployers()->byID($member->ID)
@@ -346,10 +346,10 @@ 
 		}
 		// Must be logged in to check permissions
 
-		if ($this->Usage === self::PRODUCTION || $this->Usage === self::UNSPECIFIED) {
-			if ($this->Project()->allowed(DNRoot::ALLOW_PROD_SNAPSHOT, $member)) return true;
+		if($this->Usage === self::PRODUCTION || $this->Usage === self::UNSPECIFIED) {
+			if($this->Project()->allowed(DNRoot::ALLOW_PROD_SNAPSHOT, $member)) return true;
 		} else {
-			if ($this->Project()->allowed(DNRoot::ALLOW_NON_PROD_SNAPSHOT, $member)) return true;
+			if($this->Project()->allowed(DNRoot::ALLOW_NON_PROD_SNAPSHOT, $member)) return true;
 		}
 
 		return $this->CanRestoreMembers()->byID($member->ID)
@@ -377,10 +377,10 @@ 
 			return false;
 		}
 
-		if ($this->Usage === self::PRODUCTION || $this->Usage === self::UNSPECIFIED) {
-			if ($this->Project()->allowed(DNRoot::ALLOW_PROD_SNAPSHOT, $member)) return true;
+		if($this->Usage === self::PRODUCTION || $this->Usage === self::UNSPECIFIED) {
+			if($this->Project()->allowed(DNRoot::ALLOW_PROD_SNAPSHOT, $member)) return true;
 		} else {
-			if ($this->Project()->allowed(DNRoot::ALLOW_NON_PROD_SNAPSHOT, $member)) return true;
+			if($this->Project()->allowed(DNRoot::ALLOW_NON_PROD_SNAPSHOT, $member)) return true;
 		}
 
 		return $this->CanBackupMembers()->byID($member->ID)
@@ -412,10 +412,10 @@ 
 		}
 		// Must be logged in to check permissions
 
-		if ($this->Usage === self::PRODUCTION || $this->Usage === self::UNSPECIFIED) {
-			if ($this->Project()->allowed(DNRoot::ALLOW_PROD_SNAPSHOT, $member)) return true;
+		if($this->Usage === self::PRODUCTION || $this->Usage === self::UNSPECIFIED) {
+			if($this->Project()->allowed(DNRoot::ALLOW_PROD_SNAPSHOT, $member)) return true;
 		} else {
-			if ($this->Project()->allowed(DNRoot::ALLOW_NON_PROD_SNAPSHOT, $member)) return true;
+			if($this->Project()->allowed(DNRoot::ALLOW_NON_PROD_SNAPSHOT, $member)) return true;
 		}
 
 		return $this->ArchiveUploaders()->byID($member->ID)
@@ -438,10 +438,10 @@ 
 		}
 		// Must be logged in to check permissions
 
-		if ($this->Usage === self::PRODUCTION || $this->Usage === self::UNSPECIFIED) {
-			if ($this->Project()->allowed(DNRoot::ALLOW_PROD_SNAPSHOT, $member)) return true;
+		if($this->Usage === self::PRODUCTION || $this->Usage === self::UNSPECIFIED) {
+			if($this->Project()->allowed(DNRoot::ALLOW_PROD_SNAPSHOT, $member)) return true;
 		} else {
-			if ($this->Project()->allowed(DNRoot::ALLOW_NON_PROD_SNAPSHOT, $member)) return true;
+			if($this->Project()->allowed(DNRoot::ALLOW_NON_PROD_SNAPSHOT, $member)) return true;
 		}
 
 		return $this->ArchiveDownloaders()->byID($member->ID)
@@ -464,10 +464,10 @@ 
 		}
 		// Must be logged in to check permissions
 
-		if ($this->Usage === self::PRODUCTION || $this->Usage === self::UNSPECIFIED) {
-			if ($this->Project()->allowed(DNRoot::ALLOW_PROD_SNAPSHOT, $member)) return true;
+		if($this->Usage === self::PRODUCTION || $this->Usage === self::UNSPECIFIED) {
+			if($this->Project()->allowed(DNRoot::ALLOW_PROD_SNAPSHOT, $member)) return true;
 		} else {
-			if ($this->Project()->allowed(DNRoot::ALLOW_NON_PROD_SNAPSHOT, $member)) return true;
+			if($this->Project()->allowed(DNRoot::ALLOW_NON_PROD_SNAPSHOT, $member)) return true;
 		}
 
 		return $this->ArchiveDeleters()->byID($member->ID)
@@ -804,7 +804,7 @@ 
 				->buildPermissionField('ArchiveUploaderGroups', 'ArchiveUploaders', $groups, $members)
 				->setTitle('Who can upload?')
 				->setDescription(
-					'Users who can upload archives linked to this environment into Deploynaut.<br />' .
+					'Users who can upload archives linked to this environment into Deploynaut.<br />'.
 					'Linking them to an environment allows limiting download permissions (see below).'
 				),
 
@@ -851,7 +851,7 @@ 
 		// Add actions
 		$action = new FormAction('check', 'Check Connection');
 		$action->setUseButtonTag(true);
-		$dataURL = Director::absoluteBaseURL() . 'naut/api/' . $this->Project()->Name . '/' . $this->Name . '/ping';
+		$dataURL = Director::absoluteBaseURL().'naut/api/'.$this->Project()->Name.'/'.$this->Name.'/ping';
 		$action->setAttribute('data-url', $dataURL);
 		$fields->insertBefore($action, 'Name');
 
@@ -888,8 +888,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();
@@ -936,7 +936,7 @@ 
 			&& $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);
@@ -991,7 +991,7 @@ 
 		if(!$this->Filename) {
 			return '';
 		}
-		return $this->DNData()->getEnvironmentDir() . '/' . $this->Project()->Name . '/' . $this->Filename;
+		return $this->DNData()->getEnvironmentDir().'/'.$this->Project()->Name.'/'.$this->Filename;
 	}
 
 	/**

Doc Comments +1 added lines, -1 removed lines

@@ -578,7 +578,7 @@
 	 * Dear people of the future: If you are looking to optimize this, simply create a CurrentBuildSHA(), which can be
 	 * a lot faster. I presume you came here because of the Project display template, which only needs a SHA.
 	 *
-	 * @return false|DNDeployment
+	 * @return DNDeployment
 	 */
 	public function CurrentBuild() {
 		// The DeployHistory function is far too slow to use for this

code/model/DNProject.php

Braces +15 added lines, -5 removed lines

@@ -929,7 +929,9 @@ 
 	 * @return SS_List
 	 */
 	public function whoIsAllowedAny($codes) {
-		if(!is_array($codes)) $codes = array($codes);
+		if(!is_array($codes)) {
+			$codes = array($codes);
+		}
 
 		$SQLa_codes = Convert::raw2sql($codes);
 		$SQL_codes = join("','", $SQLa_codes);
@@ -991,7 +993,9 @@ 
 			$member = Member::currentUser();
 		}
 
-		if(Permission::checkMember($member, 'ADMIN')) return true;
+		if(Permission::checkMember($member, 'ADMIN')) {
+			return true;
+		}
 
 		$hits = $this->whoIsAllowedAny($codes)->filter('Member.ID', $member->ID)->count();
 		return ($hits>0 ? true : false);
@@ -1018,7 +1022,9 @@ 
 			});
 
 			// If anything returns false then we're not ready.
-			if($isDone) return min($isDone);
+			if($isDone) {
+				return min($isDone);
+			}
 		}
 
 		return true;
@@ -1099,8 +1105,12 @@ 
 	 * @return bool
 	 */
 	public function canCreate($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;

Spacing +13 added lines, -13 removed lines

@@ -262,7 +262,7 @@ 
 	 * @return bool
 	 */
 	public function canRestore($member = null) {
-		if ($this->allowedAny(
+		if($this->allowedAny(
 			array(
 				DNRoot::ALLOW_PROD_SNAPSHOT,
 				DNRoot::ALLOW_NON_PROD_SNAPSHOT
@@ -282,7 +282,7 @@ 
 	 * @return bool
 	 */
 	public function canBackup($member = null) {
-		if ($this->allowedAny(
+		if($this->allowedAny(
 			array(
 				DNRoot::ALLOW_PROD_SNAPSHOT,
 				DNRoot::ALLOW_NON_PROD_SNAPSHOT
@@ -302,7 +302,7 @@ 
 	 * @return bool
 	 */
 	public function canUploadArchive($member = null) {
-		if ($this->allowedAny(
+		if($this->allowedAny(
 			array(
 				DNRoot::ALLOW_PROD_SNAPSHOT,
 				DNRoot::ALLOW_NON_PROD_SNAPSHOT
@@ -322,7 +322,7 @@ 
 	 * @return bool
 	 */
 	public function canDownloadArchive($member = null) {
-		if ($this->allowedAny(
+		if($this->allowedAny(
 			array(
 				DNRoot::ALLOW_PROD_SNAPSHOT,
 				DNRoot::ALLOW_NON_PROD_SNAPSHOT
@@ -391,7 +391,7 @@ 
 			// Key-pair is available, use it.
 			$processEnv = array(
 				'IDENT_KEY' => $this->getPrivateKeyPath(),
-				'GIT_SSH' => BASE_PATH . "/deploynaut/git-deploy.sh"
+				'GIT_SSH' => BASE_PATH."/deploynaut/git-deploy.sh"
 			);
 		} else {
 			$processEnv = array();
@@ -746,7 +746,7 @@ 
 	 */
 	public function getPublicKeyPath() {
 		if($privateKey = $this->getPrivateKeyPath()) {
-			return $privateKey . '.pub';
+			return $privateKey.'.pub';
 		}
 		return null;
 	}
@@ -761,7 +761,7 @@ 
 		if(!empty($keyDir)) {
 			$filter = FileNameFilter::create();
 			$name = $filter->filter($this->Name);
-			return $keyDir . '/' . $name;
+			return $keyDir.'/'.$name;
 		}
 		return null;
 	}
@@ -780,7 +780,7 @@ 
 		$filter = FileNameFilter::create();
 		$name = $filter->filter($this->Name);
 
-		return $this->DNData()->getKeyDir() . '/' . $name;
+		return $this->DNData()->getKeyDir().'/'.$name;
 	}
 
 	/**
@@ -869,7 +869,7 @@ 
 		/* Look for each whitelisted hostname */
 		foreach($interfaces as $host => $interface) {
 			/* See if the CVS Path is for this hostname, followed by some junk (maybe a port), then the path */
-			if(preg_match('{^[^.]*' . $host . '(.*?)([/a-zA-Z].+)}', $this->CVSPath, $match)) {
+			if(preg_match('{^[^.]*'.$host.'(.*?)([/a-zA-Z].+)}', $this->CVSPath, $match)) {
 
 				$path = $match[2];
 
@@ -880,10 +880,10 @@ 
 				$components = explode('.', $host);
 
 				foreach($regex as $pattern => $replacement) {
-					$path = preg_replace('/' . $pattern . '/', $replacement, $path);
+					$path = preg_replace('/'.$pattern.'/', $replacement, $path);
 				}
 
-				$uxurl = Controller::join_links($scheme . '://', $host, $path);
+				$uxurl = Controller::join_links($scheme.'://', $host, $path);
 
 				if(array_key_exists('commit', $interface) && $interface['commit'] == false) {
 					$commiturl = false;
@@ -987,14 +987,14 @@ 
 	 * @return bool
 	 */
 	public function allowedAny($codes, $member = null) {
-		if (!$member) {
+		if(!$member) {
 			$member = Member::currentUser();
 		}
 
 		if(Permission::checkMember($member, 'ADMIN')) return true;
 
 		$hits = $this->whoIsAllowedAny($codes)->filter('Member.ID', $member->ID)->count();
-		return ($hits>0 ? true : false);
+		return ($hits > 0 ? true : false);
 	}
 
 	/**

code/control/DNRoot.php

Doc Comments +1 added lines, -1 removed lines

@@ -961,7 +961,7 @@
 	 * @param array $data
 	 * @param Form $form
 	 *
-	 * @return bool|HTMLText|SS_HTTPResponse
+	 * @return SS_HTTPResponse|null
 	 */
 	public function doCreateEnvironment($data, Form $form) {
 		$this->setCurrentActionType(self::ACTION_ENVIRONMENTS);

Spacing +202 added lines, -202 removed lines

@@ -178,8 +178,8 @@ 
 		Requirements::javascript('deploynaut/javascript/material.js');
 
 		// Load the buildable dependencies only if not loaded centrally.
-		if (!is_dir(BASE_PATH . DIRECTORY_SEPARATOR . 'static')) {
-			if (\Director::isDev()) {
+		if(!is_dir(BASE_PATH.DIRECTORY_SEPARATOR.'static')) {
+			if(\Director::isDev()) {
 				\Requirements::javascript('deploynaut/static/bundle-debug.js');
 			} else {
 				\Requirements::javascript('deploynaut/static/bundle.js');
@@ -197,13 +197,13 @@ 
 	 * @return boolean
 	 */
 	public static function FlagSnapshotsEnabled() {
-		if (defined('FLAG_SNAPSHOTS_ENABLED') && FLAG_SNAPSHOTS_ENABLED) {
+		if(defined('FLAG_SNAPSHOTS_ENABLED') && FLAG_SNAPSHOTS_ENABLED) {
 			return true;
 		}
-		if (defined('FLAG_SNAPSHOTS_ENABLED_FOR_MEMBERS') && FLAG_SNAPSHOTS_ENABLED_FOR_MEMBERS) {
+		if(defined('FLAG_SNAPSHOTS_ENABLED_FOR_MEMBERS') && FLAG_SNAPSHOTS_ENABLED_FOR_MEMBERS) {
 			$allowedMembers = explode(';', FLAG_SNAPSHOTS_ENABLED_FOR_MEMBERS);
 			$member = Member::currentUser();
-			if ($allowedMembers && $member && in_array($member->Email, $allowedMembers)) {
+			if($allowedMembers && $member && in_array($member->Email, $allowedMembers)) {
 				return true;
 			}
 		}
@@ -215,7 +215,7 @@ 
 	 */
 	public static function get_support_links() {
 		$supportLinks = self::config()->support_links;
-		if ($supportLinks) {
+		if($supportLinks) {
 			return new ArrayList($supportLinks);
 		}
 	}
@@ -237,12 +237,12 @@ 
 	public function init() {
 		parent::init();
 
-		if (!Member::currentUser() && !Session::get('AutoLoginHash')) {
+		if(!Member::currentUser() && !Session::get('AutoLoginHash')) {
 			return Security::permissionFailure();
 		}
 
 		// Block framework jquery
-		Requirements::block(FRAMEWORK_DIR . '/thirdparty/jquery/jquery.js');
+		Requirements::block(FRAMEWORK_DIR.'/thirdparty/jquery/jquery.js');
 
 		self::include_requirements();
 	}
@@ -261,7 +261,7 @@ 
 	 * @return \SS_HTTPResponse
 	 */
 	public function index(SS_HTTPRequest $request) {
-		return $this->redirect($this->Link() . 'projects/');
+		return $this->redirect($this->Link().'projects/');
 	}
 
 	/**
@@ -317,11 +317,11 @@ 
 
 		// Performs canView permission check by limiting visible projects
 		$project = $this->getCurrentProject();
-		if (!$project) {
+		if(!$project) {
 			return $this->project404Response();
 		}
 
-		if (!$project->canBackup()) {
+		if(!$project->canBackup()) {
 			return new SS_HTTPResponse("Not allowed to create snapshots on any environments", 401);
 		}
 
@@ -343,11 +343,11 @@ 
 
 		// Performs canView permission check by limiting visible projects
 		$project = $this->getCurrentProject();
-		if (!$project) {
+		if(!$project) {
 			return $this->project404Response();
 		}
 
-		if (!$project->canUploadArchive()) {
+		if(!$project->canUploadArchive()) {
 			return new SS_HTTPResponse("Not allowed to upload", 401);
 		}
 
@@ -378,22 +378,22 @@ 
 	public function getUploadSnapshotForm(SS_HTTPRequest $request) {
 		// Performs canView permission check by limiting visible projects
 		$project = $this->getCurrentProject();
-		if (!$project) {
+		if(!$project) {
 			return $this->project404Response();
 		}
 
-		if (!$project->canUploadArchive()) {
+		if(!$project->canUploadArchive()) {
 			return new SS_HTTPResponse("Not allowed to upload", 401);
 		}
 
 		// Framing an environment as a "group of people with download access"
 		// makes more sense to the user here, while still allowing us to enforce
 		// environment specific restrictions on downloading the file later on.
-		$envs = $project->DNEnvironmentList()->filterByCallback(function ($item) {
+		$envs = $project->DNEnvironmentList()->filterByCallback(function($item) {
 			return $item->canUploadArchive();
 		});
 		$envsMap = [];
-		foreach ($envs as $env) {
+		foreach($envs as $env) {
 			$envsMap[$env->ID] = $env->Name;
 		}
 
@@ -421,7 +421,7 @@ 
 		$form->disableSecurityToken();
 		$form->addExtraClass('fields-wide');
 		// Tweak the action so it plays well with our fake URL structure.
-		$form->setFormAction($project->Link() . '/UploadSnapshotForm');
+		$form->setFormAction($project->Link().'/UploadSnapshotForm');
 
 		return $form;
 	}
@@ -437,18 +437,18 @@ 
 
 		// Performs canView permission check by limiting visible projects
 		$project = $this->getCurrentProject();
-		if (!$project) {
+		if(!$project) {
 			return $this->project404Response();
 		}
 
 		$validEnvs = $project->DNEnvironmentList()
-			->filterByCallback(function ($item) {
+			->filterByCallback(function($item) {
 				return $item->canUploadArchive();
 			});
 
 		// Validate $data['EnvironmentID'] by checking against $validEnvs.
 		$environment = $validEnvs->find('ID', $data['EnvironmentID']);
-		if (!$environment) {
+		if(!$environment) {
 			throw new LogicException('Invalid environment');
 		}
 
@@ -471,9 +471,9 @@ 
 		$dataArchive->DataTransfers()->add($dataTransfer);
 		$form->saveInto($dataArchive);
 		$dataArchive->write();
-		$workingDir = TEMP_FOLDER . DIRECTORY_SEPARATOR . 'deploynaut-transfer-' . $dataTransfer->ID;
+		$workingDir = TEMP_FOLDER.DIRECTORY_SEPARATOR.'deploynaut-transfer-'.$dataTransfer->ID;
 
-		$cleanupFn = function () use ($workingDir, $dataTransfer, $dataArchive) {
+		$cleanupFn = function() use ($workingDir, $dataTransfer, $dataArchive) {
 			$process = new AbortableProcess(sprintf('rm -rf %s', escapeshellarg($workingDir)));
 			$process->setTimeout(120);
 			$process->run();
@@ -484,7 +484,7 @@ 
 		// extract the sspak contents so we can inspect them
 		try {
 			$dataArchive->extractArchive($workingDir);
-		} catch (Exception $e) {
+		} catch(Exception $e) {
 			$cleanupFn();
 			$form->sessionMessage(
 				'There was a problem trying to open your snapshot for processing. Please try uploading again',
@@ -495,7 +495,7 @@ 
 
 		// validate that the sspak contents match the declared contents
 		$result = $dataArchive->validateArchiveContents();
-		if (!$result->valid()) {
+		if(!$result->valid()) {
 			$cleanupFn();
 			$form->sessionMessage($result->message(), 'bad');
 			return $this->redirectBack();
@@ -505,7 +505,7 @@ 
 		try {
 			$dataArchive->fixArchivePermissions($workingDir);
 			$dataArchive->setArchiveFromFiles($workingDir);
-		} catch (Exception $e) {
+		} catch(Exception $e) {
 			$cleanupFn();
 			$form->sessionMessage(
 				'There was a problem processing your snapshot. Please try uploading again',
@@ -536,22 +536,22 @@ 
 	public function getPostSnapshotForm(SS_HTTPRequest $request) {
 		// Performs canView permission check by limiting visible projects
 		$project = $this->getCurrentProject();
-		if (!$project) {
+		if(!$project) {
 			return $this->project404Response();
 		}
 
-		if (!$project->canUploadArchive()) {
+		if(!$project->canUploadArchive()) {
 			return new SS_HTTPResponse("Not allowed to upload", 401);
 		}
 
 		// Framing an environment as a "group of people with download access"
 		// makes more sense to the user here, while still allowing us to enforce
 		// environment specific restrictions on downloading the file later on.
-		$envs = $project->DNEnvironmentList()->filterByCallback(function ($item) {
+		$envs = $project->DNEnvironmentList()->filterByCallback(function($item) {
 			return $item->canUploadArchive();
 		});
 		$envsMap = [];
-		foreach ($envs as $env) {
+		foreach($envs as $env) {
 			$envsMap[$env->ID] = $env->Name;
 		}
 
@@ -573,7 +573,7 @@ 
 		$form->disableSecurityToken();
 		$form->addExtraClass('fields-wide');
 		// Tweak the action so it plays well with our fake URL structure.
-		$form->setFormAction($project->Link() . '/PostSnapshotForm');
+		$form->setFormAction($project->Link().'/PostSnapshotForm');
 
 		return $form;
 	}
@@ -588,17 +588,17 @@ 
 		$this->setCurrentActionType(self::ACTION_SNAPSHOT);
 
 		$project = $this->getCurrentProject();
-		if (!$project) {
+		if(!$project) {
 			return $this->project404Response();
 		}
 
-		$validEnvs = $project->DNEnvironmentList()->filterByCallback(function ($item) {
+		$validEnvs = $project->DNEnvironmentList()->filterByCallback(function($item) {
 			return $item->canUploadArchive();
 		});
 
 		// Validate $data['EnvironmentID'] by checking against $validEnvs.
 		$environment = $validEnvs->find('ID', $data['EnvironmentID']);
-		if (!$environment) {
+		if(!$environment) {
 			throw new LogicException('Invalid environment');
 		}
 
@@ -636,20 +636,20 @@ 
 
 		// Performs canView permission check by limiting visible projects
 		$project = $this->getCurrentProject();
-		if (!$project) {
+		if(!$project) {
 			return $this->project404Response();
 		}
 
-		if (!$project->canUploadArchive()) {
+		if(!$project->canUploadArchive()) {
 			return new SS_HTTPResponse("Not allowed to upload", 401);
 		}
 
 		$dataArchive = DNDataArchive::get()->byId($request->param('DataArchiveID'));
-		if (!$dataArchive) {
+		if(!$dataArchive) {
 			return new SS_HTTPResponse("Archive not found.", 404);
 		}
 
-		if (!$dataArchive->canRestore()) {
+		if(!$dataArchive->canRestore()) {
 			throw new SS_HTTPResponse_Exception('Not allowed to restore archive', 403);
 		}
 
@@ -679,19 +679,19 @@ 
 	 */
 	public function toggleprojectstar(SS_HTTPRequest $request) {
 		$project = $this->getCurrentProject();
-		if (!$project) {
+		if(!$project) {
 			return $this->project404Response();
 		}
 
 		$member = Member::currentUser();
-		if ($member === null) {
+		if($member === null) {
 			return $this->project404Response();
 		}
 		$favProject = $member->StarredProjects()
 			->filter('DNProjectID', $project->ID)
 			->first();
 
-		if ($favProject) {
+		if($favProject) {
 			$member->StarredProjects()->remove($favProject);
 		} else {
 			$member->StarredProjects()->add($project);
@@ -705,14 +705,14 @@ 
 	 */
 	public function branch(SS_HTTPRequest $request) {
 		$project = $this->getCurrentProject();
-		if (!$project) {
+		if(!$project) {
 			return $this->project404Response();
 		}
 
 		$branchName = $request->getVar('name');
 		$branch = $project->DNBranchList()->byName($branchName);
-		if (!$branch) {
-			return new SS_HTTPResponse("Branch '" . Convert::raw2xml($branchName) . "' not found.", 404);
+		if(!$branch) {
+			return new SS_HTTPResponse("Branch '".Convert::raw2xml($branchName)."' not found.", 404);
 		}
 
 		return $this->render([
@@ -727,20 +727,20 @@ 
 	public function environment(SS_HTTPRequest $request) {
 		// Performs canView permission check by limiting visible projects
 		$project = $this->getCurrentProject();
-		if (!$project) {
+		if(!$project) {
 			return $this->project404Response();
 		}
 
 		// Performs canView permission check by limiting visible projects
 		$env = $this->getCurrentEnvironment($project);
-		if (!$env) {
+		if(!$env) {
 			return $this->environment404Response();
 		}
 
 		return $this->render([
 			'DNEnvironmentList' => $this->getCurrentProject()->DNEnvironmentList(),
 			'FlagSnapshotsEnabled' => $this->FlagSnapshotsEnabled(),
-			'Redeploy' => (bool) $request->getVar('redeploy')
+			'Redeploy' => (bool)$request->getVar('redeploy')
 		]);
 	}
 
@@ -752,22 +752,22 @@ 
 	 */
 	public function createenv(SS_HTTPRequest $request) {
 		$params = $request->params();
-		if ($params['Identifier']) {
+		if($params['Identifier']) {
 			$record = DNCreateEnvironment::get()->byId($params['Identifier']);
 
-			if (!$record || !$record->ID) {
+			if(!$record || !$record->ID) {
 				throw new SS_HTTPResponse_Exception('Create environment not found', 404);
 			}
-			if (!$record->canView()) {
+			if(!$record->canView()) {
 				return Security::permissionFailure();
 			}
 
 			$project = $this->getCurrentProject();
-			if (!$project) {
+			if(!$project) {
 				return $this->project404Response();
 			}
 
-			if ($project->Name != $params['Project']) {
+			if($project->Name != $params['Project']) {
 				throw new LogicException("Project in URL doesn't match this creation");
 			}
 
@@ -782,21 +782,21 @@ 
 		$params = $request->params();
 		$env = DNCreateEnvironment::get()->byId($params['Identifier']);
 
-		if (!$env || !$env->ID) {
+		if(!$env || !$env->ID) {
 			throw new SS_HTTPResponse_Exception('Log not found', 404);
 		}
-		if (!$env->canView()) {
+		if(!$env->canView()) {
 			return Security::permissionFailure();
 		}
 
 		$project = $env->Project();
 
-		if ($project->Name != $params['Project']) {
+		if($project->Name != $params['Project']) {
 			throw new LogicException("Project in URL doesn't match this deploy");
 		}
 
 		$log = $env->log();
-		if ($log->exists()) {
+		if($log->exists()) {
 			$content = $log->content();
 		} else {
 			$content = 'Waiting for action to start';
@@ -813,27 +813,27 @@ 
 		$this->setCurrentActionType(self::ACTION_ENVIRONMENTS);
 
 		$project = $this->getCurrentProject();
-		if (!$project) {
+		if(!$project) {
 			return $this->project404Response();
 		}
 
 		$envType = $project->AllowedEnvironmentType;
-		if (!$envType || !class_exists($envType)) {
+		if(!$envType || !class_exists($envType)) {
 			return null;
 		}
 
 		$backend = Injector::inst()->get($envType);
-		if (!($backend instanceof EnvironmentCreateBackend)) {
+		if(!($backend instanceof EnvironmentCreateBackend)) {
 			// Only allow this for supported backends.
 			return null;
 		}
 
 		$fields = $backend->getCreateEnvironmentFields($project);
-		if (!$fields) {
+		if(!$fields) {
 			return null;
 		}
 
-		if (!$project->canCreateEnvironments()) {
+		if(!$project->canCreateEnvironments()) {
 			return new SS_HTTPResponse('Not allowed to create environments for this project', 401);
 		}
 
@@ -849,7 +849,7 @@ 
 		);
 
 		// Tweak the action so it plays well with our fake URL structure.
-		$form->setFormAction($project->Link() . '/CreateEnvironmentForm');
+		$form->setFormAction($project->Link().'/CreateEnvironmentForm');
 
 		return $form;
 	}
@@ -864,11 +864,11 @@ 
 		$this->setCurrentActionType(self::ACTION_ENVIRONMENTS);
 
 		$project = $this->getCurrentProject();
-		if (!$project) {
+		if(!$project) {
 			return $this->project404Response();
 		}
 
-		if (!$project->canCreateEnvironments()) {
+		if(!$project->canCreateEnvironments()) {
 			return new SS_HTTPResponse('Not allowed to create environments for this project', 401);
 		}
 
@@ -882,7 +882,7 @@ 
 		$job->write();
 		$job->start();
 
-		return $this->redirect($project->Link('createenv') . '/' . $job->ID);
+		return $this->redirect($project->Link('createenv').'/'.$job->ID);
 	}
 
 	/**
@@ -893,13 +893,13 @@ 
 	public function metrics(SS_HTTPRequest $request) {
 		// Performs canView permission check by limiting visible projects
 		$project = $this->getCurrentProject();
-		if (!$project) {
+		if(!$project) {
 			return $this->project404Response();
 		}
 
 		// Performs canView permission check by limiting visible projects
 		$env = $this->getCurrentEnvironment($project);
-		if (!$env) {
+		if(!$env) {
 			return $this->environment404Response();
 		}
 
@@ -922,11 +922,11 @@ 
 	 */
 	public function DNProjectList() {
 		$memberId = Member::currentUserID();
-		if (!$memberId) {
+		if(!$memberId) {
 			return new ArrayList();
 		}
 
-		if (Permission::check('ADMIN')) {
+		if(Permission::check('ADMIN')) {
 			return DNProject::get();
 		}
 
@@ -943,7 +943,7 @@ 
 	 */
 	public function getPlatformSpecificStrings() {
 		$strings = $this->config()->platform_specific_strings;
-		if ($strings) {
+		if($strings) {
 			return new ArrayList($strings);
 		}
 	}
@@ -955,15 +955,15 @@ 
 	 */
 	public function getStarredProjects() {
 		$member = Member::currentUser();
-		if ($member === null) {
+		if($member === null) {
 			return new ArrayList();
 		}
 
 		$favProjects = $member->StarredProjects();
 
 		$list = new ArrayList();
-		foreach ($favProjects as $project) {
-			if ($project->canView($member)) {
+		foreach($favProjects as $project) {
+			if($project->canView($member)) {
 				$list->add($project);
 			}
 		}
@@ -985,30 +985,30 @@ 
 		$actionType = $this->getCurrentActionType();
 
 		$projects = $this->getStarredProjects();
-		if ($projects->count() < 1) {
+		if($projects->count() < 1) {
 			$projects = $this->DNProjectList();
 		} else {
 			$limit = -1;
 		}
 
-		if ($projects->count() > 0) {
+		if($projects->count() > 0) {
 			$activeProject = false;
 
-			if ($limit > 0) {
+			if($limit > 0) {
 				$limitedProjects = $projects->limit($limit);
 			} else {
 				$limitedProjects = $projects;
 			}
 
-			foreach ($limitedProjects as $project) {
+			foreach($limitedProjects as $project) {
 				$isActive = $currentProject && $currentProject->ID == $project->ID;
-				if ($isActive) {
+				if($isActive) {
 					$activeProject = true;
 				}
 
 				$isCurrentEnvironment = false;
-				if ($project && $currentEnvironment) {
-					$isCurrentEnvironment = (bool) $project->DNEnvironmentList()->find('ID', $currentEnvironment->ID);
+				if($project && $currentEnvironment) {
+					$isCurrentEnvironment = (bool)$project->DNEnvironmentList()->find('ID', $currentEnvironment->ID);
 				}
 
 				$navigation->push([
@@ -1020,14 +1020,14 @@ 
 			}
 
 			// Ensure the current project is in the list
-			if (!$activeProject && $currentProject) {
+			if(!$activeProject && $currentProject) {
 				$navigation->unshift([
 					'Project' => $currentProject,
 					'IsActive' => true,
 					'IsCurrentEnvironment' => $currentEnvironment,
 					'IsOverview' => $actionType == self::PROJECT_OVERVIEW
 				]);
-				if ($limit > 0 && $navigation->count() > $limit) {
+				if($limit > 0 && $navigation->count() > $limit) {
 					$navigation->pop();
 				}
 			}
@@ -1047,17 +1047,17 @@ 
 
 		// Performs canView permission check by limiting visible projects
 		$project = $this->getCurrentProject();
-		if (!$project) {
+		if(!$project) {
 			return $this->project404Response();
 		}
 
 		// Performs canView permission check by limiting visible projects
 		$environment = $this->getCurrentEnvironment($project);
-		if (!$environment) {
+		if(!$environment) {
 			return $this->environment404Response();
 		}
 
-		if (!$environment->canDeploy()) {
+		if(!$environment->canDeploy()) {
 			return new SS_HTTPResponse("Not allowed to deploy", 401);
 		}
 
@@ -1065,7 +1065,7 @@ 
 		$form = new DeployForm($this, 'DeployForm', $environment, $project);
 
 		// If this is an ajax request we don't want to submit the form - we just want to retrieve the markup.
-		if (
+		if(
 			$request &&
 			!$request->requestVar('action_showDeploySummary') &&
 			$this->getRequest()->isAjax() &&
@@ -1080,7 +1080,7 @@ 
 			return $body;
 		}
 
-		$form->setFormAction($this->getRequest()->getURL() . '/DeployForm');
+		$form->setFormAction($this->getRequest()->getURL().'/DeployForm');
 		return $form;
 	}
 
@@ -1095,18 +1095,18 @@ 
 
 		// Performs canView permission check by limiting visible projects
 		$project = $this->getCurrentProject();
-		if (!$project) {
+		if(!$project) {
 			return $this->project404Response();
 		}
 
 		// Performs canView permission check by limiting visible projects
 		$env = $this->getCurrentEnvironment($project);
-		if (!$env) {
+		if(!$env) {
 			return $this->environment404Response();
 		}
 
 		$options = [];
-		foreach ($env->Backend()->getDeployOptions($env) as $option) {
+		foreach($env->Backend()->getDeployOptions($env) as $option) {
 			$options[] = [
 				'name' => $option->getName(),
 				'title' => $option->getTitle(),
@@ -1125,7 +1125,7 @@ 
 			'field_data' => [],
 			'options' => $options
 		];
-		foreach ($project->DNBranchList() as $branch) {
+		foreach($project->DNBranchList() as $branch) {
 			$sha = $branch->SHA();
 			$name = $branch->Name();
 			$branchValue = sprintf("%s (%s, %s old)",
@@ -1151,7 +1151,7 @@ 
 			'options' => $options
 		];
 
-		foreach ($project->DNTagList()->setLimit(null) as $tag) {
+		foreach($project->DNTagList()->setLimit(null) as $tag) {
 			$name = $tag->Name();
 			$data['field_data'][] = [
 				'id' => $tag->SHA(),
@@ -1177,15 +1177,15 @@ 
 		// We are aiming at the format:
 		// [{text: 'optgroup text', children: [{id: '<sha>', text: '<inner text>'}]}]
 		$redeploy = [];
-		foreach ($project->DNEnvironmentList() as $dnEnvironment) {
+		foreach($project->DNEnvironmentList() as $dnEnvironment) {
 			$envName = $dnEnvironment->Name;
 			$perEnvDeploys = [];
 
-			foreach ($dnEnvironment->DeployHistory() as $deploy) {
+			foreach($dnEnvironment->DeployHistory() as $deploy) {
 				$sha = $deploy->SHA;
 
 				// Check if exists to make sure the newest deployment date is used.
-				if (!isset($perEnvDeploys[$sha])) {
+				if(!isset($perEnvDeploys[$sha])) {
 					$pastValue = sprintf("%s (deployed %s)",
 						substr($sha, 0, 8),
 						$deploy->obj('LastEdited')->Ago()
@@ -1197,12 +1197,12 @@ 
 				}
 			}
 
-			if (!empty($perEnvDeploys)) {
+			if(!empty($perEnvDeploys)) {
 				$redeploy[$envName] = array_values($perEnvDeploys);
 			}
 		}
 		// Convert the array to the frontend format (i.e. keyed to regular array)
-		foreach ($redeploy as $name => $descr) {
+		foreach($redeploy as $name => $descr) {
 			$data['field_data'][] = ['text' => $name, 'children' => $descr];
 		}
 		$tabs[] = $data;
@@ -1224,7 +1224,7 @@ 
 			->filter('ProjectID', $project->ID)
 			->sort('LastEdited', 'DESC')
 			->first();
-		if ($fetch) {
+		if($fetch) {
 			$lastFetched = $fetch->dbObject('LastEdited')->Ago();
 		}
 
@@ -1249,13 +1249,13 @@ 
 
 		// Performs canView permission check by limiting visible projects
 		$project = $this->getCurrentProject();
-		if (!$project) {
+		if(!$project) {
 			return $this->project404Response();
 		}
 
 		// Performs canView permission check by limiting visible projects
 		$environment = $this->getCurrentEnvironment($project);
-		if (!$environment) {
+		if(!$environment) {
 			return $this->environment404Response();
 		}
 
@@ -1266,7 +1266,7 @@ 
 		// Add in a URL for comparing from->to code changes. Ensure that we have
 		// two proper 40 character SHAs, otherwise we can't show the compare link.
 		$interface = $project->getRepositoryInterface();
-		if (
+		if(
 			!empty($interface) && !empty($interface->URL)
 			&& !empty($data['changes']['Code version']['from'])
 			&& strlen($data['changes']['Code version']['from']) == '40'
@@ -1310,26 +1310,26 @@ 
 
 		// Ensure the submitted token has a value
 		$submittedToken = $request->postVar(\Dispatcher::SECURITY_TOKEN_NAME);
-		if (!$submittedToken) {
+		if(!$submittedToken) {
 			return false;
 		}
 		// Do the actual check.
 		$check = $token->check($submittedToken);
 		// Ensure the CSRF Token is correct
-		if (!$check) {
+		if(!$check) {
 			// CSRF token didn't match
 			return $this->httpError(400, 'Bad Request');
 		}
 
 		// Performs canView permission check by limiting visible projects
 		$project = $this->getCurrentProject();
-		if (!$project) {
+		if(!$project) {
 			return $this->project404Response();
 		}
 
 		// Performs canView permission check by limiting visible projects
 		$environment = $this->getCurrentEnvironment($project);
-		if (!$environment) {
+		if(!$environment) {
 			return $this->environment404Response();
 		}
 
@@ -1346,7 +1346,7 @@ 
 		$deployment->getMachine()->apply(DNDeployment::TR_QUEUE);
 
 		return json_encode([
-			'url' => Director::absoluteBaseURL() . $deployment->Link()
+			'url' => Director::absoluteBaseURL().$deployment->Link()
 		], JSON_PRETTY_PRINT);
 	}
 
@@ -1364,20 +1364,20 @@ 
 		$params = $request->params();
 		$deployment = DNDeployment::get()->byId($params['Identifier']);
 
-		if (!$deployment || !$deployment->ID) {
+		if(!$deployment || !$deployment->ID) {
 			throw new SS_HTTPResponse_Exception('Deployment not found', 404);
 		}
-		if (!$deployment->canView()) {
+		if(!$deployment->canView()) {
 			return Security::permissionFailure();
 		}
 
 		$environment = $deployment->Environment();
 		$project = $environment->Project();
 
-		if ($environment->Name != $params['Environment']) {
+		if($environment->Name != $params['Environment']) {
 			throw new LogicException("Environment in URL doesn't match this deploy");
 		}
-		if ($project->Name != $params['Project']) {
+		if($project->Name != $params['Project']) {
 			throw new LogicException("Project in URL doesn't match this deploy");
 		}
 
@@ -1400,25 +1400,25 @@ 
 		$params = $request->params();
 		$deployment = DNDeployment::get()->byId($params['Identifier']);
 
-		if (!$deployment || !$deployment->ID) {
+		if(!$deployment || !$deployment->ID) {
 			throw new SS_HTTPResponse_Exception('Deployment not found', 404);
 		}
-		if (!$deployment->canView()) {
+		if(!$deployment->canView()) {
 			return Security::permissionFailure();
 		}
 
 		$environment = $deployment->Environment();
 		$project = $environment->Project();
 
-		if ($environment->Name != $params['Environment']) {
+		if($environment->Name != $params['Environment']) {
 			throw new LogicException("Environment in URL doesn't match this deploy");
 		}
-		if ($project->Name != $params['Project']) {
+		if($project->Name != $params['Project']) {
 			throw new LogicException("Project in URL doesn't match this deploy");
 		}
 
 		$log = $deployment->log();
-		if ($log->exists()) {
+		if($log->exists()) {
 			$content = $log->content();
 		} else {
 			$content = 'Waiting for action to start';
@@ -1431,29 +1431,29 @@ 
 		$params = $request->params();
 		$deployment = DNDeployment::get()->byId($params['Identifier']);
 
-		if (!$deployment || !$deployment->ID) {
+		if(!$deployment || !$deployment->ID) {
 			throw new SS_HTTPResponse_Exception('Deployment not found', 404);
 		}
-		if (!$deployment->canView()) {
+		if(!$deployment->canView()) {
 			return Security::permissionFailure();
 		}
 
 		// For now restrict to ADMINs only.
-		if (!Permission::check('ADMIN')) {
+		if(!Permission::check('ADMIN')) {
 			return Security::permissionFailure();
 		}
 
 		$environment = $deployment->Environment();
 		$project = $environment->Project();
 
-		if ($environment->Name != $params['Environment']) {
+		if($environment->Name != $params['Environment']) {
 			throw new LogicException("Environment in URL doesn't match this deploy");
 		}
-		if ($project->Name != $params['Project']) {
+		if($project->Name != $params['Project']) {
 			throw new LogicException("Project in URL doesn't match this deploy");
 		}
 
-		if (!in_array($deployment->Status, ['Queued', 'Deploying', 'Aborting'])) {
+		if(!in_array($deployment->Status, ['Queued', 'Deploying', 'Aborting'])) {
 			throw new LogicException(sprintf("Cannot abort from %s state.", $deployment->Status));
 		}
 
@@ -1469,11 +1469,11 @@ 
 	 */
 	public function getDataTransferForm(SS_HTTPRequest $request = null) {
 		// Performs canView permission check by limiting visible projects
-		$envs = $this->getCurrentProject()->DNEnvironmentList()->filterByCallback(function ($item) {
+		$envs = $this->getCurrentProject()->DNEnvironmentList()->filterByCallback(function($item) {
 			return $item->canBackup();
 		});
 
-		if (!$envs) {
+		if(!$envs) {
 			return $this->environment404Response();
 		}
 
@@ -1491,7 +1491,7 @@ 
 					->addExtraClass('btn')
 			)
 		);
-		$form->setFormAction($this->getRequest()->getURL() . '/DataTransferForm');
+		$form->setFormAction($this->getRequest()->getURL().'/DataTransferForm');
 
 		return $form;
 	}
@@ -1508,21 +1508,21 @@ 
 
 		// Performs canView permission check by limiting visible projects
 		$project = $this->getCurrentProject();
-		if (!$project) {
+		if(!$project) {
 			return $this->project404Response();
 		}
 
 		$dataArchive = null;
 
 		// Validate direction.
-		if ($data['Direction'] == 'get') {
+		if($data['Direction'] == 'get') {
 			$validEnvs = $this->getCurrentProject()->DNEnvironmentList()
-				->filterByCallback(function ($item) {
+				->filterByCallback(function($item) {
 					return $item->canBackup();
 				});
-		} else if ($data['Direction'] == 'push') {
+		} else if($data['Direction'] == 'push') {
 			$validEnvs = $this->getCurrentProject()->DNEnvironmentList()
-				->filterByCallback(function ($item) {
+				->filterByCallback(function($item) {
 					return $item->canRestore();
 				});
 		} else {
@@ -1531,24 +1531,24 @@ 
 
 		// Validate $data['EnvironmentID'] by checking against $validEnvs.
 		$environment = $validEnvs->find('ID', $data['EnvironmentID']);
-		if (!$environment) {
+		if(!$environment) {
 			throw new LogicException('Invalid environment');
 		}
 
 		$this->validateSnapshotMode($data['Mode']);
 
 		// Only 'push' direction is allowed an association with an existing archive.
-		if (
+		if(
 			$data['Direction'] == 'push'
 			&& isset($data['DataArchiveID'])
 			&& is_numeric($data['DataArchiveID'])
 		) {
 			$dataArchive = DNDataArchive::get()->byId($data['DataArchiveID']);
-			if (!$dataArchive) {
+			if(!$dataArchive) {
 				throw new LogicException('Invalid data archive');
 			}
 
-			if (!$dataArchive->canDownload()) {
+			if(!$dataArchive->canDownload()) {
 				throw new SS_HTTPResponse_Exception('Not allowed to access archive', 403);
 			}
 		}
@@ -1558,7 +1558,7 @@ 
 		$transfer->Direction = $data['Direction'];
 		$transfer->Mode = $data['Mode'];
 		$transfer->DataArchiveID = $dataArchive ? $dataArchive->ID : null;
-		if ($data['Direction'] == 'push') {
+		if($data['Direction'] == 'push') {
 			$transfer->setBackupBeforePush(!empty($data['BackupBeforePush']));
 		}
 		$transfer->write();
@@ -1581,17 +1581,17 @@ 
 		$params = $request->params();
 		$transfer = DNDataTransfer::get()->byId($params['Identifier']);
 
-		if (!$transfer || !$transfer->ID) {
+		if(!$transfer || !$transfer->ID) {
 			throw new SS_HTTPResponse_Exception('Transfer not found', 404);
 		}
-		if (!$transfer->canView()) {
+		if(!$transfer->canView()) {
 			return Security::permissionFailure();
 		}
 
 		$environment = $transfer->Environment();
 		$project = $environment->Project();
 
-		if ($project->Name != $params['Project']) {
+		if($project->Name != $params['Project']) {
 			throw new LogicException("Project in URL doesn't match this deploy");
 		}
 
@@ -1615,22 +1615,22 @@ 
 		$params = $request->params();
 		$transfer = DNDataTransfer::get()->byId($params['Identifier']);
 
-		if (!$transfer || !$transfer->ID) {
+		if(!$transfer || !$transfer->ID) {
 			throw new SS_HTTPResponse_Exception('Transfer not found', 404);
 		}
-		if (!$transfer->canView()) {
+		if(!$transfer->canView()) {
 			return Security::permissionFailure();
 		}
 
 		$environment = $transfer->Environment();
 		$project = $environment->Project();
 
-		if ($project->Name != $params['Project']) {
+		if($project->Name != $params['Project']) {
 			throw new LogicException("Project in URL doesn't match this deploy");
 		}
 
 		$log = $transfer->log();
-		if ($log->exists()) {
+		if($log->exists()) {
 			$content = $log->content();
 		} else {
 			$content = 'Waiting for action to start';
@@ -1653,22 +1653,22 @@ 
 
 		// Performs canView permission check by limiting visible projects
 		$project = $this->getCurrentProject();
-		$envs = $project->DNEnvironmentList()->filterByCallback(function ($item) {
+		$envs = $project->DNEnvironmentList()->filterByCallback(function($item) {
 			return $item->canRestore();
 		});
 
-		if (!$envs) {
+		if(!$envs) {
 			return $this->environment404Response();
 		}
 
 		$modesMap = [];
-		if (in_array($dataArchive->Mode, ['all'])) {
+		if(in_array($dataArchive->Mode, ['all'])) {
 			$modesMap['all'] = 'Database and Assets';
 		};
-		if (in_array($dataArchive->Mode, ['all', 'db'])) {
+		if(in_array($dataArchive->Mode, ['all', 'db'])) {
 			$modesMap['db'] = 'Database only';
 		};
-		if (in_array($dataArchive->Mode, ['all', 'assets'])) {
+		if(in_array($dataArchive->Mode, ['all', 'assets'])) {
 			$modesMap['assets'] = 'Assets only';
 		};
 
@@ -1692,7 +1692,7 @@ 
 					->addExtraClass('btn')
 			)
 		);
-		$form->setFormAction($project->Link() . '/DataTransferRestoreForm');
+		$form->setFormAction($project->Link().'/DataTransferRestoreForm');
 
 		return $form;
 	}
@@ -1713,13 +1713,13 @@ 
 		/** @var DNDataArchive $dataArchive */
 		$dataArchive = DNDataArchive::get()->byId($request->param('DataArchiveID'));
 
-		if (!$dataArchive) {
+		if(!$dataArchive) {
 			throw new SS_HTTPResponse_Exception('Archive not found', 404);
 		}
 
 		// We check for canDownload because that implies access to the data.
 		// canRestore is later checked on the actual restore action per environment.
-		if (!$dataArchive->canDownload()) {
+		if(!$dataArchive->canDownload()) {
 			throw new SS_HTTPResponse_Exception('Not allowed to access archive', 403);
 		}
 
@@ -1745,11 +1745,11 @@ 
 		/** @var DNDataArchive $dataArchive */
 		$dataArchive = DNDataArchive::get()->byId($request->param('DataArchiveID'));
 
-		if (!$dataArchive) {
+		if(!$dataArchive) {
 			throw new SS_HTTPResponse_Exception('Archive not found', 404);
 		}
 
-		if (!$dataArchive->canDelete()) {
+		if(!$dataArchive->canDelete()) {
 			throw new SS_HTTPResponse_Exception('Not allowed to delete archive', 403);
 		}
 
@@ -1770,7 +1770,7 @@ 
 
 		// Performs canView permission check by limiting visible projects
 		$project = $this->getCurrentProject();
-		if (!$project) {
+		if(!$project) {
 			return $this->project404Response();
 		}
 
@@ -1790,7 +1790,7 @@ 
 					->addExtraClass('btn')
 			)
 		);
-		$form->setFormAction($project->Link() . '/DeleteForm');
+		$form->setFormAction($project->Link().'/DeleteForm');
 
 		return $form;
 	}
@@ -1807,24 +1807,24 @@ 
 
 		// Performs canView permission check by limiting visible projects
 		$project = $this->getCurrentProject();
-		if (!$project) {
+		if(!$project) {
 			return $this->project404Response();
 		}
 
 		$dataArchive = null;
 
-		if (
+		if(
 			isset($data['DataArchiveID'])
 			&& is_numeric($data['DataArchiveID'])
 		) {
 			$dataArchive = DNDataArchive::get()->byId($data['DataArchiveID']);
 		}
 
-		if (!$dataArchive) {
+		if(!$dataArchive) {
 			throw new LogicException('Invalid data archive');
 		}
 
-		if (!$dataArchive->canDelete()) {
+		if(!$dataArchive->canDelete()) {
 			throw new SS_HTTPResponse_Exception('Not allowed to delete archive', 403);
 		}
 
@@ -1847,12 +1847,12 @@ 
 		/** @var DNDataArchive $dataArchive */
 		$dataArchive = DNDataArchive::get()->byId($request->param('DataArchiveID'));
 
-		if (!$dataArchive) {
+		if(!$dataArchive) {
 			throw new SS_HTTPResponse_Exception('Archive not found', 404);
 		}
 
 		// We check for canDownload because that implies access to the data.
-		if (!$dataArchive->canDownload()) {
+		if(!$dataArchive->canDownload()) {
 			throw new SS_HTTPResponse_Exception('Not allowed to access archive', 403);
 		}
 
@@ -1874,7 +1874,7 @@ 
 		$dataArchive = $dataArchive ? $dataArchive : DNDataArchive::get()->byId($request->requestVar('DataArchiveID'));
 
 		$envs = $dataArchive->validTargetEnvironments();
-		if (!$envs) {
+		if(!$envs) {
 			return $this->environment404Response();
 		}
 
@@ -1896,7 +1896,7 @@ 
 					->addExtraClass('btn')
 			)
 		);
-		$form->setFormAction($this->getCurrentProject()->Link() . '/MoveForm');
+		$form->setFormAction($this->getCurrentProject()->Link().'/MoveForm');
 
 		return $form;
 	}
@@ -1915,25 +1915,25 @@ 
 
 		// Performs canView permission check by limiting visible projects
 		$project = $this->getCurrentProject();
-		if (!$project) {
+		if(!$project) {
 			return $this->project404Response();
 		}
 
 		/** @var DNDataArchive $dataArchive */
 		$dataArchive = DNDataArchive::get()->byId($data['DataArchiveID']);
-		if (!$dataArchive) {
+		if(!$dataArchive) {
 			throw new LogicException('Invalid data archive');
 		}
 
 		// We check for canDownload because that implies access to the data.
-		if (!$dataArchive->canDownload()) {
+		if(!$dataArchive->canDownload()) {
 			throw new SS_HTTPResponse_Exception('Not allowed to access archive', 403);
 		}
 
 		// Validate $data['EnvironmentID'] by checking against $validEnvs.
 		$validEnvs = $dataArchive->validTargetEnvironments();
 		$environment = $validEnvs->find('ID', $data['EnvironmentID']);
-		if (!$environment) {
+		if(!$environment) {
 			throw new LogicException('Invalid environment');
 		}
 
@@ -1951,7 +1951,7 @@ 
 	public static function RedisUnavailable() {
 		try {
 			Resque::queues();
-		} catch (Exception $e) {
+		} catch(Exception $e) {
 			return $e->getMessage();
 		}
 		return '';
@@ -2005,10 +2005,10 @@ 
 	 */
 	public function getCurrentProject() {
 		$projectName = trim($this->getRequest()->param('Project'));
-		if (!$projectName) {
+		if(!$projectName) {
 			return null;
 		}
-		if (empty(self::$_project_cache[$projectName])) {
+		if(empty(self::$_project_cache[$projectName])) {
 			self::$_project_cache[$projectName] = $this->DNProjectList()->filter('Name', $projectName)->First();
 		}
 		return self::$_project_cache[$projectName];
@@ -2019,14 +2019,14 @@ 
 	 * @return DNEnvironment|null
 	 */
 	public function getCurrentEnvironment(DNProject $project = null) {
-		if ($this->getRequest()->param('Environment') === null) {
+		if($this->getRequest()->param('Environment') === null) {
 			return null;
 		}
-		if ($project === null) {
+		if($project === null) {
 			$project = $this->getCurrentProject();
 		}
 		// project can still be null
-		if ($project === null) {
+		if($project === null) {
 			return null;
 		}
 		return $project->DNEnvironmentList()->filter('Name', $this->getRequest()->param('Environment'))->First();
@@ -2065,23 +2065,23 @@ 
 	 * @return boolean|null true if $member has access to upload or download to at least one {@link DNEnvironment}.
 	 */
 	public function CanViewArchives(Member $member = null) {
-		if ($member === null) {
+		if($member === null) {
 			$member = Member::currentUser();
 		}
 
-		if (Permission::checkMember($member, 'ADMIN')) {
+		if(Permission::checkMember($member, 'ADMIN')) {
 			return true;
 		}
 
 		$allProjects = $this->DNProjectList();
-		if (!$allProjects) {
+		if(!$allProjects) {
 			return false;
 		}
 
-		foreach ($allProjects as $project) {
-			if ($project->Environments()) {
-				foreach ($project->Environments() as $environment) {
-					if (
+		foreach($allProjects as $project) {
+			if($project->Environments()) {
+				foreach($project->Environments() as $environment) {
+					if(
 						$environment->canRestore($member) ||
 						$environment->canBackup($member) ||
 						$environment->canUploadArchive($member) ||
@@ -2102,7 +2102,7 @@ 
 	 */
 	public function CreateEnvironmentList() {
 		$project = $this->getCurrentProject();
-		if ($project) {
+		if($project) {
 			$dataList = $project->CreateEnvironments();
 		} else {
 			$dataList = new ArrayList();
@@ -2122,9 +2122,9 @@ 
 		$archives = new ArrayList();
 
 		$archiveList = $project->Environments()->relation("DataArchives");
-		if ($archiveList->count() > 0) {
-			foreach ($archiveList as $archive) {
-				if (!$archive->isPending()) {
+		if($archiveList->count() > 0) {
+			foreach($archiveList as $archive) {
+				if(!$archive->isPending()) {
 					$archives->push($archive);
 				}
 			}
@@ -2139,9 +2139,9 @@ 
 	public function PendingDataArchives() {
 		$project = $this->getCurrentProject();
 		$archives = new ArrayList();
-		foreach ($project->DNEnvironmentList() as $env) {
-			foreach ($env->DataArchives() as $archive) {
-				if ($archive->isPending()) {
+		foreach($project->DNEnvironmentList() as $env) {
+			foreach($env->DataArchives() as $archive) {
+				if($archive->isPending()) {
 					$archives->push($archive);
 				}
 			}
@@ -2157,7 +2157,7 @@ 
 		$transfers = DNDataTransfer::get()
 			->filter('EnvironmentID', $environments)
 			->filterByCallback(
-				function ($record) {
+				function($record) {
 					return
 						$record->Environment()->canRestore() || // Ensure member can perform an action on the transfers env
 						$record->Environment()->canBackup() ||
@@ -2174,9 +2174,9 @@ 
 	 * @return null|PaginatedList
 	 */
 	public function DeployHistory() {
-		if ($env = $this->getCurrentEnvironment()) {
+		if($env = $this->getCurrentEnvironment()) {
 			$history = $env->DeployHistory();
-			if ($history->count() > 0) {
+			if($history->count() > 0) {
 				$pagination = new PaginatedList($history, $this->getRequest());
 				$pagination->setPageLength(4);
 				return $pagination;
@@ -2198,7 +2198,7 @@ 
 		$sendJSON = (strpos($this->getRequest()->getHeader('Accept'), 'application/json') !== false)
 			|| $this->getRequest()->getExtension() == 'json';
 
-		if (!$sendJSON) {
+		if(!$sendJSON) {
 			$this->response->addHeader("Content-type", "text/plain");
 			return $content;
 		}
@@ -2217,7 +2217,7 @@ 
 	public function AmbientMenu() {
 		$list = new ArrayList();
 
-		if (Member::currentUserID()) {
+		if(Member::currentUserID()) {
 			$list->push(new ArrayData([
 				'Classes' => 'logout',
 				'FaIcon' => 'sign-out',
@@ -2238,10 +2238,10 @@ 
 	 * @return bool
 	 */
 	public function canCreateProjects($member = null) {
-		if (!$member) {
+		if(!$member) {
 			$member = Member::currentUser();
 		}
-		if (!$member) {
+		if(!$member) {
 			return false;
 		}
 
@@ -2249,28 +2249,28 @@ 
 	}
 
 	protected function applyRedeploy(SS_HTTPRequest $request, &$data) {
-		if (!$request->getVar('redeploy')) {
+		if(!$request->getVar('redeploy')) {
 			return;
 		}
 
 		$project = $this->getCurrentProject();
-		if (!$project) {
+		if(!$project) {
 			return $this->project404Response();
 		}
 
 		// Performs canView permission check by limiting visible projects
 		$env = $this->getCurrentEnvironment($project);
-		if (!$env) {
+		if(!$env) {
 			return $this->environment404Response();
 		}
 
 		$current = $env->CurrentBuild();
-		if ($current && $current->exists()) {
+		if($current && $current->exists()) {
 			$data['preselect_tab'] = 3;
 			$data['preselect_sha'] = $current->SHA;
 		} else {
 			$master = $project->DNBranchList()->byName('master');
-			if ($master) {
+			if($master) {
 				$data['preselect_tab'] = 1;
 				$data['preselect_sha'] = $master->SHA();
 			}
@@ -2282,7 +2282,7 @@ 
 	 */
 	protected function project404Response() {
 		return new SS_HTTPResponse(
-			"Project '" . Convert::raw2xml($this->getRequest()->param('Project')) . "' not found.",
+			"Project '".Convert::raw2xml($this->getRequest()->param('Project'))."' not found.",
 			404
 		);
 	}
@@ -2292,7 +2292,7 @@ 
 	 */
 	protected function environment404Response() {
 		$envName = Convert::raw2xml($this->getRequest()->param('Environment'));
-		return new SS_HTTPResponse("Environment '" . $envName . "' not found.", 404);
+		return new SS_HTTPResponse("Environment '".$envName."' not found.", 404);
 	}
 
 	/**
@@ -2301,7 +2301,7 @@ 
 	 * @param string $mode
 	 */
 	protected function validateSnapshotMode($mode) {
-		if (!in_array($mode, ['all', 'assets', 'db'])) {
+		if(!in_array($mode, ['all', 'assets', 'db'])) {
 			throw new LogicException('Invalid mode');
 		}
 	}
@@ -2315,12 +2315,12 @@ 
 	protected function getCustomisedViewSection($sectionName, $title = '', $data = []) {
 		// Performs canView permission check by limiting visible projects
 		$project = $this->getCurrentProject();
-		if (!$project) {
+		if(!$project) {
 			return $this->project404Response();
 		}
 		$data[$sectionName] = 1;
 
-		if ($this !== '') {
+		if($this !== '') {
 			$data['Title'] = $title;
 		}
 

code/model/DNDataArchive.php

Spacing +4 added lines, -4 removed lines

@@ -229,7 +229,7 @@ 
 			return false;
 		}
 
-		$key = $memberID . '-' . $this->EnvironmentID;
+		$key = $memberID.'-'.$this->EnvironmentID;
 		if(!isset(self::$_cache_can_restore[$key])) {
 			self::$_cache_can_restore[$key] = $this->Environment()->canUploadArchive($member);
 		}
@@ -250,7 +250,7 @@ 
 			return false;
 		}
 
-		$key = $memberID . '-' . $this->EnvironmentID;
+		$key = $memberID.'-'.$this->EnvironmentID;
 		if(!isset(self::$_cache_can_download[$key])) {
 			self::$_cache_can_download[$key] = $this->Environment()->canDownloadArchive($member);
 		}
@@ -437,7 +437,7 @@ 
 		}
 
 		// Extract database.sql.gz to <workingdir>/database.sql
-		if(file_exists($workingDir . DIRECTORY_SEPARATOR . 'database.sql.gz')) {
+		if(file_exists($workingDir.DIRECTORY_SEPARATOR.'database.sql.gz')) {
 			$process = new Process('gunzip database.sql.gz', $workingDir);
 			$process->setTimeout(3600);
 			$process->run();
@@ -448,7 +448,7 @@ 
 		}
 
 		// Extract assets.tar.gz to <workingdir>/assets/
-		if(file_exists($workingDir . DIRECTORY_SEPARATOR . 'assets.tar.gz')) {
+		if(file_exists($workingDir.DIRECTORY_SEPARATOR.'assets.tar.gz')) {
 			$process = new Process('tar xzf assets.tar.gz', $workingDir);
 			$process->setTimeout(3600);
 			$process->run();

code/model/GitonomyCache.php

Spacing +1 added lines, -1 removed lines

@@ -7,7 +7,7 @@
 	public static $cache = array();
 
 	public static function getIncludingBranches($commit) {
-		$cacheKey = 'getIncludingBranches-' . $commit->getRepository()->getPath() . '-' . $commit->gethash();
+		$cacheKey = 'getIncludingBranches-'.$commit->getRepository()->getPath().'-'.$commit->gethash();
 		if(!isset(self::$cache[$cacheKey])) {
 			self::$cache[$cacheKey] = $commit->getIncludingBranches();
 		}

code/model/DNBranch.php

Spacing +1 added lines, -1 removed lines

@@ -55,7 +55,7 @@
 
 	public function Link() {
 		// Use a get-var for branch so that it can handle unsafe chars better
-		return Controller::join_links($this->project->Link(), 'branch?name=' . urlencode($this->Name()));
+		return Controller::join_links($this->project->Link(), 'branch?name='.urlencode($this->Name()));
 	}
 
 	/**

code/model/jobs/DNPing.php

Spacing +1 added lines, -1 removed lines

@@ -37,7 +37,7 @@
 	 * @return string
 	 */
 	public function LogLink() {
-		return $this->Link() . '/log';
+		return $this->Link().'/log';
 	}
 
 	/**