silverstripe / deploynaut

code/jobs/DataTransferJob.php

Spacing +4 added lines, -4 removed lines

@@ -20,7 +20,7 @@ 
 	}
 
 	public function perform() {
-		echo "[-] DataTransferJob starting" . PHP_EOL;
+		echo "[-] DataTransferJob starting".PHP_EOL;
 		$log = new DeploynautLogFile($this->args['logfile']);
 		$dataTransfer = DNDataTransfer::get()->byID($this->args['dataTransferID']);
 		$environment = $dataTransfer->Environment();
@@ -64,16 +64,16 @@ 
 			$this->performBackup($backupDataTransfer, $log);
 			$environment->Backend()->dataTransfer($dataTransfer, $log);
 		} catch(Exception $e) {
-			echo "[-] DataTransferJob failed" . PHP_EOL;
+			echo "[-] DataTransferJob failed".PHP_EOL;
 			throw $e;
 		}
 
 		$this->updateStatus('Finished');
-		echo "[-] DataTransferJob finished" . PHP_EOL;
+		echo "[-] DataTransferJob finished".PHP_EOL;
 	}
 
 	protected function performBackup($backupDataTransfer, DeploynautLogFile $log) {
-		if (!$backupDataTransfer) {
+		if(!$backupDataTransfer) {
 			return false;
 		}
 

code/jobs/DeployJob.php

Spacing +11 added lines, -11 removed lines

@@ -17,9 +17,9 @@ 
 	 */
 	public function alarmHandler() {
 		$sigFile = $this->args['sigFile'];
-		if (file_exists($sigFile) && is_readable($sigFile) && is_writable($sigFile)) {
+		if(file_exists($sigFile) && is_readable($sigFile) && is_writable($sigFile)) {
 			$signal = (int)file_get_contents($sigFile);
-			if (is_int($signal) && in_array((int)$signal, [
+			if(is_int($signal) && in_array((int)$signal, [
 				// The following signals are trapped by both Resque and Rainforest.
 				SIGTERM,
 				SIGINT,
@@ -30,7 +30,7 @@ 
 				SIGCONT
 			])) {
 				echo sprintf(
-					'[-] Signal "%s" received, delivering to own process group, PID "%s".' . PHP_EOL,
+					'[-] Signal "%s" received, delivering to own process group, PID "%s".'.PHP_EOL,
 					$signal,
 					getmypid()
 				);
@@ -40,9 +40,9 @@ 
 
 				// Dispatch to own process group.
 				$pgid = posix_getpgid(getmypid());
-				if ($pgid<=0) {
+				if($pgid <= 0) {
 					echo sprintf(
-						'[-] Unable to send signal to invalid PGID "%s".' . PHP_EOL,
+						'[-] Unable to send signal to invalid PGID "%s".'.PHP_EOL,
 						$pgid
 					);
 				} else {
@@ -61,8 +61,8 @@ 
 		posix_setsid();
 
 		if(function_exists('pcntl_alarm') && function_exists('pcntl_signal')) {
-			if (!empty($this->args['sigFile'])) {
-				echo sprintf('[-] Signal file requested, polling "%s".' . PHP_EOL, $this->args['sigFile']);
+			if(!empty($this->args['sigFile'])) {
+				echo sprintf('[-] Signal file requested, polling "%s".'.PHP_EOL, $this->args['sigFile']);
 				declare(ticks = 1);
 				pcntl_signal(SIGALRM, [$this, 'alarmHandler']);
 				pcntl_alarm(1);
@@ -74,7 +74,7 @@ 
 	}
 
 	public function perform() {
-		echo "[-] DeployJob starting" . PHP_EOL;
+		echo "[-] DeployJob starting".PHP_EOL;
 		$log = new DeploynautLogFile($this->args['logfile']);
 
 		$deployment = DNDeployment::get()->byID($this->args['deploymentID']);
@@ -127,12 +127,12 @@ 
 			);
 		} catch(Exception $e) {
 			// DeploynautJob will automatically trigger onFailure.
-			echo "[-] DeployJob failed" . PHP_EOL;
+			echo "[-] DeployJob failed".PHP_EOL;
 			throw $e;
 		}
 
 		$this->updateStatus(DNDeployment::TR_COMPLETE);
-		echo "[-] DeployJob finished" . PHP_EOL;
+		echo "[-] DeployJob finished".PHP_EOL;
 	}
 
 	public function onFailure(Exception $exception) {
@@ -140,7 +140,7 @@ 
 	}
 
 	protected function performBackup($backupDataTransfer, DeploynautLogFile $log) {
-		if (!$backupDataTransfer) {
+		if(!$backupDataTransfer) {
 			return false;
 		}
 

code/backends/CapistranoDeploymentBackend.php

Spacing +18 added lines, -18 removed lines

@@ -71,7 +71,7 @@ 
 
 			try {
 				$args['build_filename'] = $this->packageGenerator->getPackageFilename($project->Name, $sha, $repository, $log);
-			} catch (Exception $e) {
+			} catch(Exception $e) {
 				$log->write($e->getMessage());
 				throw $e;
 			}
@@ -110,7 +110,7 @@ 
 			$this->extend('deployFailure', $environment, $sha, $log, $project);
 
 			$currentBuild = $environment->CurrentBuild();
-			if (empty($currentBuild) || (!empty($options['no_rollback']) && $options['no_rollback'] !== 'false')) {
+			if(empty($currentBuild) || (!empty($options['no_rollback']) && $options['no_rollback'] !== 'false')) {
 				throw new RuntimeException($command->getErrorOutput());
 			}
 
@@ -126,7 +126,7 @@ 
 			// as deploying removes .htaccess
 			$this->enableMaintenance($environment, $log, $project);
 
-			if (!$command->isSuccessful() || !$this->smokeTest($environment, $log)) {
+			if(!$command->isSuccessful() || !$this->smokeTest($environment, $log)) {
 				$this->extend('deployRollbackFailure', $environment, $currentBuild->SHA, $log, $project);
 				$log->write('Rollback failed');
 				throw new RuntimeException($command->getErrorOutput());
@@ -142,7 +142,7 @@ 
 
 		// Rolling back means the rollback succeeded, but ultimately the deployment
 		// has failed. Throw an exception so the job is marked as failed accordingly.
-		if ($rolledBack === true) {
+		if($rolledBack === true) {
 			throw new RuntimeException('Rollback successful');
 		}
 
@@ -213,7 +213,7 @@ 
 		} else {
 			$environment = $dataTransfer->Environment();
 			$project = $environment->Project();
-			$workingDir = TEMP_FOLDER . DIRECTORY_SEPARATOR . 'deploynaut-transfer-' . $dataTransfer->ID;
+			$workingDir = TEMP_FOLDER.DIRECTORY_SEPARATOR.'deploynaut-transfer-'.$dataTransfer->ID;
 			$archive = $dataTransfer->DataArchive();
 
 			// extract the sspak contents, we'll need these so capistrano can restore that content
@@ -259,7 +259,7 @@ 
 		if(!$args) {
 			$args = array();
 		}
-		$args['history_path'] = realpath(DEPLOYNAUT_LOG_PATH . '/');
+		$args['history_path'] = realpath(DEPLOYNAUT_LOG_PATH.'/');
 		$args['environment_id'] = $environment->ID;
 
 		// Inject env string directly into the command.
@@ -274,7 +274,7 @@ 
 
 		$data = DNData::inst();
 		// Generate a capfile from a template
-		$capTemplate = file_get_contents(BASE_PATH . '/deploynaut/Capfile.template');
+		$capTemplate = file_get_contents(BASE_PATH.'/deploynaut/Capfile.template');
 		$cap = str_replace(
 			array('<config root>', '<ssh key>', '<base path>'),
 			array($data->getEnvironmentDir(), DEPLOYNAUT_SSH_KEY, BASE_PATH),
@@ -284,13 +284,13 @@ 
 		if(defined('DEPLOYNAUT_CAPFILE')) {
 			$capFile = DEPLOYNAUT_CAPFILE;
 		} else {
-			$capFile = ASSETS_PATH . '/Capfile';
+			$capFile = ASSETS_PATH.'/Capfile';
 		}
 		file_put_contents($capFile, $cap);
 
-		$command = "{$envString}cap -f " . escapeshellarg($capFile) . " -vv $name $action ROLES=$roles";
+		$command = "{$envString}cap -f ".escapeshellarg($capFile)." -vv $name $action ROLES=$roles";
 		foreach($args as $argName => $argVal) {
-			$command .= ' -s ' . escapeshellarg($argName) . '=' . escapeshellarg($argVal);
+			$command .= ' -s '.escapeshellarg($argName).'='.escapeshellarg($argVal);
 		}
 
 		$log->write(sprintf('Running command: %s', $command));
@@ -324,7 +324,7 @@ 
 		$filepathBase = $dataArchive->generateFilepath($dataTransfer);
 		mkdir($filepathBase, 0700, true);
 
-		$databasePath = $filepathBase . DIRECTORY_SEPARATOR . 'database.sql';
+		$databasePath = $filepathBase.DIRECTORY_SEPARATOR.'database.sql';
 
 		// Backup database
 		if(in_array($dataTransfer->Mode, array('all', 'db'))) {
@@ -362,7 +362,7 @@ 
 		$log->write('Creating sspak...');
 
 		$sspakFilename = sprintf('%s.sspak', $dataArchive->generateFilename($dataTransfer));
-		$sspakFilepath = $filepathBase . DIRECTORY_SEPARATOR . $sspakFilename;
+		$sspakFilepath = $filepathBase.DIRECTORY_SEPARATOR.$sspakFilename;
 
 		try {
 			$dataArchive->attachFile($sspakFilepath, $dataTransfer);
@@ -429,7 +429,7 @@ 
 		// Restore database into target environment
 		if(in_array($dataTransfer->Mode, array('all', 'db'))) {
 			$log->write(sprintf('Restore of database to "%s" started', $name));
-			$args = array('data_path' => $workingDir . DIRECTORY_SEPARATOR . 'database.sql');
+			$args = array('data_path' => $workingDir.DIRECTORY_SEPARATOR.'database.sql');
 			$command = $this->getCommand('data:pushdb', 'db', $environment, $args, $log);
 			$command->run(function($type, $buffer) use($log) {
 				$log->write($buffer);
@@ -446,7 +446,7 @@ 
 		// Restore assets into target environment
 		if(in_array($dataTransfer->Mode, array('all', 'assets'))) {
 			$log->write(sprintf('Restore of assets to "%s" started', $name));
-			$args = array('data_path' => $workingDir . DIRECTORY_SEPARATOR . 'assets');
+			$args = array('data_path' => $workingDir.DIRECTORY_SEPARATOR.'assets');
 			$command = $this->getCommand('data:pushassets', 'web', $environment, $args, $log);
 			$command->run(function($type, $buffer) use($log) {
 				$log->write($buffer);
@@ -527,17 +527,17 @@ 
 			}
 
 			// Produce an informational ticker roughly every $tick
-			if (time() > $infoTick) {
+			if(time() > $infoTick) {
 				$message = [];
 
 				// Collect status information from different sources.
-				if ($status) {
+				if($status) {
 					$message[] = sprintf('HTTP status code is %s', $status);
 				}
-				if (!$response) {
+				if(!$response) {
 					$message[] = 'response is empty';
 				}
-				if ($error = curl_error($ch)) {
+				if($error = curl_error($ch)) {
 					$message[] = sprintf('request error: %s', $error);
 				}
 

code/control/DeployDispatcher.php

Doc Comments +1 added lines, -1 removed lines

@@ -46,7 +46,7 @@
 	 *
 	 * @param \SS_HTTPRequest $request
 	 *
-	 * @return \HTMLText|\SS_HTTPResponse
+	 * @return SS_HTTPResponse|null
 	 */
 	public function index(\SS_HTTPRequest $request) {
 		return $this->redirect(\Controller::join_links($this->Link(), 'history'), 302);

Spacing +17 added lines, -17 removed lines

@@ -41,13 +41,13 @@ 
 
 		$this->project = $this->getCurrentProject();
 
-		if (!$this->project) {
+		if(!$this->project) {
 			return $this->project404Response();
 		}
 
 		// Performs canView permission check by limiting visible projects
 		$this->environment = $this->getCurrentEnvironment($this->project);
-		if (!$this->environment) {
+		if(!$this->environment) {
 			return $this->environment404Response();
 		}
 	}
@@ -68,19 +68,19 @@ 
 		$data = [];
 		$list = $this->DeployHistory();
 		$page = $request->getVar('page') ?: 1;
-		if ($page > $list->TotalPages()) {
+		if($page > $list->TotalPages()) {
 			$page = 1;
 		}
-		if ($page < 1) {
+		if($page < 1) {
 			$page = 1;
 		}
 		$start = ($page - 1) * $list->getPageLength();
-		$list->setPageStart((int) $start);
-		if (empty($list)) {
+		$list->setPageStart((int)$start);
+		if(empty($list)) {
 			return $this->getAPIResponse(['list' => []], 200);
 		}
 
-		foreach ($list as $deployment) {
+		foreach($list as $deployment) {
 			$data[] = $this->getDeploymentData($deployment);
 		}
 
@@ -98,7 +98,7 @@ 
 	 */
 	public function currentbuild(SS_HTTPRequest $request) {
 		$currentBuild = $this->environment->CurrentBuild();
-		if (!$currentBuild) {
+		if(!$currentBuild) {
 			return $this->getAPIResponse(['deployment' => []], 200);
 		}
 		return $this->getAPIResponse(['deployment' => $this->getDeploymentData($currentBuild)], 200);
@@ -111,7 +111,7 @@ 
 	public function show(SS_HTTPRequest $request) {
 		$deployment = DNDeployment::get()->byId($request->param('ID'));
 		$errorResponse = $this->validateDeployments($deployment);
-		if ($errorResponse instanceof \SS_HTTPResponse) {
+		if($errorResponse instanceof \SS_HTTPResponse) {
 			return $errorResponse;
 		}
 		return $this->getAPIResponse(['deployment' => $this->getDeploymentData($deployment)], 200);
@@ -124,7 +124,7 @@ 
 	public function log(SS_HTTPRequest $request) {
 		$deployment = DNDeployment::get()->byId($request->param('ID'));
 		$errorResponse = $this->validateDeployments($deployment);
-		if ($errorResponse instanceof \SS_HTTPResponse) {
+		if($errorResponse instanceof \SS_HTTPResponse) {
 			return $errorResponse;
 		}
 		$log = $deployment->log();
@@ -141,7 +141,7 @@ 
 	public function start(SS_HTTPRequest $request) {
 		$this->checkSecurityToken();
 
-		if (!$this->environment->canDeploy(Member::currentUser())) {
+		if(!$this->environment->canDeploy(Member::currentUser())) {
 			return $this->getAPIResponse(['message' => 'You are not authorised to deploy this environment'], 403);
 		}
 
@@ -197,12 +197,12 @@ 
 
 		$deployer = $deployment->Deployer();
 		$deployerData = null;
-		if ($deployer && $deployer->exists()) {
+		if($deployer && $deployer->exists()) {
 			$deployerData = $this->getStackMemberData($deployer);
 		}
 		$approver = $deployment->Approver();
 		$approverData = null;
-		if ($approver && $approver->exists()) {
+		if($approver && $approver->exists()) {
 			$approverData = $this->getStackMemberData($approver);
 		}
 
@@ -236,8 +236,8 @@ 
 		$stackMembers = $this->project->listMembers();
 		$role = null;
 
-		foreach ($stackMembers as $stackMember) {
-			if ($stackMember['MemberID'] !== $member->ID) {
+		foreach($stackMembers as $stackMember) {
+			if($stackMember['MemberID'] !== $member->ID) {
 				continue;
 			}
 
@@ -261,10 +261,10 @@ 
 	 * @return null|SS_HTTPResponse
 	 */
 	protected function validateDeployments(\DNDeployment $deployment) {
-		if (!$deployment || !$deployment->exists()) {
+		if(!$deployment || !$deployment->exists()) {
 			return $this->getAPIResponse(['message' => 'This deployment does not exist'], 404);
 		}
-		if (!$deployment->canView()) {
+		if(!$deployment->canView()) {
 			return $this->getAPIResponse(['message' => 'You are not authorised to view this deployment'], 403);
 		}
 		return null;

code/control/GitDispatcher.php

Doc Comments +5 added lines, -5 removed lines

@@ -47,7 +47,7 @@ 
 	 *
 	 * @param \SS_HTTPRequest $request
 	 *
-	 * @return \HTMLText|\SS_HTTPResponse
+	 * @return SS_HTTPResponse|null
 	 */
 	public function index(\SS_HTTPRequest $request) {
 		return $this->redirect(\Controller::join_links($this->Link(), 'show'), 302);
@@ -72,7 +72,7 @@ 
 	/**
 	 * @param SS_HTTPRequest $request
 	 *
-	 * @return string
+	 * @return SS_HTTPResponse
 	 */
 	public function show(\SS_HTTPRequest $request) {
 
@@ -166,7 +166,7 @@ 
 	}
 
 	/**
-	 * @param $project
+	 * @param DNProject $project
 	 *
 	 * @return array
 	 */
@@ -182,7 +182,7 @@ 
 	}
 
 	/**
-	 * @param $project
+	 * @param DNProject $project
 	 *
 	 * @return array
 	 */
@@ -198,7 +198,7 @@ 
 	}
 
 	/**
-	 * @param $project
+	 * @param DNProject $project
 	 *
 	 * @return array
 	 */

Spacing +13 added lines, -13 removed lines

@@ -38,7 +38,7 @@ 
 
 		$this->project = $this->getCurrentProject();
 
-		if (!$this->project) {
+		if(!$this->project) {
 			return $this->project404Response();
 		}
 	}
@@ -58,7 +58,7 @@ 
 	 * @return SS_HTTPResponse
 	 */
 	public function update(SS_HTTPRequest $request) {
-		switch ($request->httpMethod()) {
+		switch($request->httpMethod()) {
 			case 'POST':
 				$this->checkSecurityToken();
 				return $this->createUpdate();
@@ -95,8 +95,8 @@ 
 		// @todo: the original was a tree that was keyed by environment, the
 		// front-end dropdown needs to be changed to support that. brrrr.
 		$prevDeploys = [];
-		foreach ($this->getGitPrevDeploys($this->project) as $env) {
-			foreach ($env as $deploy) {
+		foreach($this->getGitPrevDeploys($this->project) as $env) {
+			foreach($env as $deploy) {
 				$prevDeploys[] = $deploy;
 			}
 		}
@@ -132,8 +132,8 @@ 
 	 */
 	protected function getUpdateStatus($ID) {
 		$ping = DNGitFetch::get()->byID($ID);
-		if (!$ping) {
-			return $this->getAPIResponse(['message' => 'GIT update (' . $ID . ') not found'], 404);
+		if(!$ping) {
+			return $this->getAPIResponse(['message' => 'GIT update ('.$ID.') not found'], 404);
 		}
 		$output = [
 			'id' => $ID,
@@ -154,7 +154,7 @@ 
 		$fetch->write();
 		$fetch->start();
 
-		$location = Director::absoluteBaseURL() . $this->Link() . '/update/' . $fetch->ID;
+		$location = Director::absoluteBaseURL().$this->Link().'/update/'.$fetch->ID;
 		$output = [
 			'message' => 'git fetch has been queued',
 			'id' => $fetch->ID,
@@ -173,7 +173,7 @@ 
 	 */
 	protected function getGitBranches($project) {
 		$branches = [];
-		foreach ($project->DNBranchList() as $branch) {
+		foreach($project->DNBranchList() as $branch) {
 			$branches[] = [
 				'key' => $branch->SHA(),
 				'value' => $branch->Name(),
@@ -189,7 +189,7 @@ 
 	 */
 	protected function getGitTags($project) {
 		$tags = [];
-		foreach ($project->DNTagList()->setLimit(null) as $tag) {
+		foreach($project->DNTagList()->setLimit(null) as $tag) {
 			$tags[] = [
 				'key' => $tag->SHA(),
 				'value' => $tag->Name(),
@@ -205,14 +205,14 @@ 
 	 */
 	protected function getGitPrevDeploys($project) {
 		$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),
@@ -224,7 +224,7 @@ 
 					];
 				}
 			}
-			if (!empty($perEnvDeploys)) {
+			if(!empty($perEnvDeploys)) {
 				$redeploy[$envName] = array_values($perEnvDeploys);
 			}
 		}

code/control/DNDeploymentDispatcher.php

Spacing +11 added lines, -11 removed lines

@@ -17,7 +17,7 @@ 
 
 	public function getModel($name) {
 		$deployment = $this->getDeployment();
-		if (!$deployment) {
+		if(!$deployment) {
 			return [];
 		}
 
@@ -29,7 +29,7 @@ 
 	public function getDeployment() {
 		$id = $this->request->param('Id');
 		$deployment = DNDeployment::get()->byId($id);
-		if (!$deployment || !$deployment->exists()) {
+		if(!$deployment || !$deployment->exists()) {
 			return false;
 		}
 		return $deployment;
@@ -38,7 +38,7 @@ 
 	public function apply(SS_HTTPRequest $request) {
 		$this->checkSecurityToken();
 		$response = $this->checkRequest();
-		if ($response instanceof SS_HTTPResponse) {
+		if($response instanceof SS_HTTPResponse) {
 			return $response;
 		}
 
@@ -52,7 +52,7 @@ 
 	public function canApply(SS_HTTPRequest $request) {
 		$this->checkSecurityToken();
 		$response = $this->checkRequest();
-		if ($response instanceof SS_HTTPResponse) {
+		if($response instanceof SS_HTTPResponse) {
 			return $response;
 		}
 
@@ -63,17 +63,17 @@ 
 
 	protected function checkRequest() {
 		$project = $this->getCurrentProject();
-		if (!$project) {
+		if(!$project) {
 			return $this->project404Response();
 		}
 
 		$env = $this->getCurrentEnvironment($project);
-		if (!$env) {
+		if(!$env) {
 			return $this->environment404Response();
 		}
 
 		$deployment = $this->getDeployment();
-		if (!$deployment) {
+		if(!$deployment) {
 			return new SS_HTTPResponse('Deployment not found', 404);
 		}
 
@@ -82,7 +82,7 @@ 
 
 	protected function getMachine() {
 		$deployment = $this->getDeployment();
-		if (!$deployment) {
+		if(!$deployment) {
 			return null;
 		}
 
@@ -94,10 +94,10 @@ 
 		// It gives a chance to perform a dry-run, and reject the transition, for example
 		// in case the user is unauthorised.
 			'finite.test_transition',
-			function (Finite\Event\TransitionEvent $e) use ($project) {
+			function(Finite\Event\TransitionEvent $e) use ($project) {
 				$code = null;
 
-				switch ($e->getTransition()->getName()) {
+				switch($e->getTransition()->getName()) {
 					case DNDeployment::TR_SUBMIT:
 						$code = self::ALLOW_DNDEPLOYMENT_SUBMIT;
 						break;
@@ -106,7 +106,7 @@ 
 						break;
 				}
 
-				if (!$code || !$project->allowed($code)) {
+				if(!$code || !$project->allowed($code)) {
 					$e->reject();
 				}
 			}

code/control/PlanDispatcher.php

Spacing +9 added lines, -9 removed lines

@@ -37,13 +37,13 @@ 
 
 		$this->project = $this->getCurrentProject();
 
-		if (!$this->project) {
+		if(!$this->project) {
 			return $this->project404Response();
 		}
 
 		// Performs canView permission check by limiting visible projects
 		$this->environment = $this->getCurrentEnvironment($this->project);
-		if (!$this->environment) {
+		if(!$this->environment) {
 			return $this->environment404Response();
 		}
 	}
@@ -66,7 +66,7 @@ 
 	 */
 	public function deploysummary(SS_HTTPRequest $request) {
 
-		if (strtolower($request->httpMethod()) !== 'post') {
+		if(strtolower($request->httpMethod()) !== 'post') {
 			return $this->getAPIResponse(['message' => 'Method not allowed, requires POST'], 405);
 		}
 		$this->checkSecurityToken();
@@ -81,7 +81,7 @@ 
 		$data = $strategy->toArray();
 
 		$interface = $this->project->getRepositoryInterface();
-		if ($this->canCompareCodeVersions($interface, $data['changes'])) {
+		if($this->canCompareCodeVersions($interface, $data['changes'])) {
 			$compareurl = sprintf(
 				'%s/compare/%s...%s',
 				$interface->URL,
@@ -118,20 +118,20 @@ 
 	 *
 	 */
 	protected function canCompareCodeVersions(\ArrayData $interface, $changes) {
-		if (empty($changes['Code version'])) {
+		if(empty($changes['Code version'])) {
 			return false;
 		}
 		$codeVersion = ['Code version'];
-		if (empty($interface)) {
+		if(empty($interface)) {
 			return false;
 		}
-		if (empty($interface->URL)) {
+		if(empty($interface->URL)) {
 			return false;
 		}
-		if (empty($codeVersion['from']) || empty($codeVersion['to'])) {
+		if(empty($codeVersion['from']) || empty($codeVersion['to'])) {
 			return false;
 		}
-		if (strlen($codeVersion['from']) !== 40 || strlen($codeVersion['to']) !== 40) {
+		if(strlen($codeVersion['from']) !== 40 || strlen($codeVersion['to']) !== 40) {
 			return false;
 		}
 		return true;

code/control/Dispatcher.php

Spacing +7 added lines, -7 removed lines

@@ -50,7 +50,7 @@ 
 	 */
 	public function asJSONValidatorErrors($code, $validatorErrors) {
 		$fieldErrors = [];
-		foreach ($validatorErrors as $error) {
+		foreach($validatorErrors as $error) {
 			$fieldErrors[$error['fieldName']] = $error['message'];
 		}
 		return $this->asJSONFormFieldErrors($code, $fieldErrors);
@@ -95,7 +95,7 @@ 
 		// To get around that, upon spotting an active redirect, we change the response code to 200,
 		// and move the redirect into the "RedirectTo" field in the JSON response. Frontend can
 		// then interpret this and trigger a redirect.
-		if ($this->redirectedTo()) {
+		if($this->redirectedTo()) {
 			$data['RedirectTo'] = $this->response->getHeader('Location');
 			// Pop off the header - we are no longer redirecting via the usual mechanism.
 			$this->response->removeHeader('Location');
@@ -128,7 +128,7 @@ 
 	 */
 	protected function checkSecurityToken() {
 		$securityToken = $this->getSecurityToken();
-		if (!$securityToken->check($this->request->postVar(self::SECURITY_TOKEN_NAME))) {
+		if(!$securityToken->check($this->request->postVar(self::SECURITY_TOKEN_NAME))) {
 			$this->httpError(403, 'Invalid security token, try reloading the page.');
 		}
 	}
@@ -163,8 +163,8 @@ 
 	 * @return string|array
 	 */
 	protected function trimWhitespace($val) {
-		if (is_array($val)) {
-			foreach ($val as $k => $v) {
+		if(is_array($val)) {
+			foreach($val as $k => $v) {
 				$val[$k] = $this->trimWhitespace($v);
 			}
 			return $val;
@@ -180,8 +180,8 @@ 
 	 * @return string|array
 	 */
 	protected function stripNonPrintables($val) {
-		if (is_array($val)) {
-			foreach ($val as $k => $v) {
+		if(is_array($val)) {
+			foreach($val as $k => $v) {
 				$val[$k] = $this->stripNonPrintables($v);
 			}
 			return $val;

code/control/EnvironmentOverview.php

Spacing +5 added lines, -5 removed lines

@@ -19,7 +19,7 @@ 
 	public function init() {
 		parent::init();
 		$this->project = $this->getCurrentProject();
-		if (!$this->project) {
+		if(!$this->project) {
 			return $this->project404Response();
 		}
 		// Performs canView permission check by limiting visible projects
@@ -33,7 +33,7 @@ 
 	 * @return \HTMLText|\SS_HTTPResponse
 	 */
 	public function index(\SS_HTTPRequest $request) {
-		if (!$this->environment) {
+		if(!$this->environment) {
 			return $this->environment404Response();
 		}
 
@@ -63,9 +63,9 @@ 
 		$base = Director::absoluteBaseURL();
 		return [
 			'dispatchers' => [
-				'git' => $base . $this->getCurrentProject()->Link('git'),
-				'plan' => $base . $this->getCurrentEnvironment()->Link('plan'),
-				'deploys' => $base . $this->getCurrentEnvironment()->Link('deploys')
+				'git' => $base.$this->getCurrentProject()->Link('git'),
+				'plan' => $base.$this->getCurrentEnvironment()->Link('plan'),
+				'deploys' => $base.$this->getCurrentEnvironment()->Link('deploys')
 			],
 			'api_auth' => [
 				'name' => $this->getSecurityToken()->getName(),