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

Spacing +26 added lines, -26 removed lines

@@ -174,8 +174,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');
@@ -238,7 +238,7 @@ 
 		}
 
 		// Block framework jquery
-		Requirements::block(FRAMEWORK_DIR . '/thirdparty/jquery/jquery.js');
+		Requirements::block(FRAMEWORK_DIR.'/thirdparty/jquery/jquery.js');
 
 		self::include_requirements();
 	}
@@ -257,7 +257,7 @@ 
 	 * @return \SS_HTTPResponse
 	 */
 	public function index(SS_HTTPRequest $request) {
-		return $this->redirect($this->Link() . 'projects/');
+		return $this->redirect($this->Link().'projects/');
 	}
 
 	/**
@@ -417,7 +417,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;
 	}
@@ -467,7 +467,7 @@ 
 		$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) {
 			$process = new AbortableProcess(sprintf('rm -rf %s', escapeshellarg($workingDir)));
@@ -569,7 +569,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;
 	}
@@ -708,7 +708,7 @@ 
 		$branchName = $request->getVar('name');
 		$branch = $project->DNBranchList()->byName($branchName);
 		if(!$branch) {
-			return new SS_HTTPResponse("Branch '" . Convert::raw2xml($branchName) . "' not found.", 404);
+			return new SS_HTTPResponse("Branch '".Convert::raw2xml($branchName)."' not found.", 404);
 		}
 
 		return $this->render(array(
@@ -844,7 +844,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;
 	}
@@ -877,7 +877,7 @@ 
 		$job->write();
 		$job->start();
 
-		return $this->redirect($project->Link('createenv') . '/' . $job->ID);
+		return $this->redirect($project->Link('createenv').'/'.$job->ID);
 	}
 
 	/**
@@ -938,7 +938,7 @@ 
 	 */
 	public function getPlatformSpecificStrings() {
 		$strings = $this->config()->platform_specific_strings;
-		if ($strings) {
+		if($strings) {
 			return new ArrayList($strings);
 		}
 	}
@@ -1003,7 +1003,7 @@ 
 
 				$isCurrentEnvironment = false;
 				if($project && $currentEnvironment) {
-					$isCurrentEnvironment = (bool) $project->DNEnvironmentList()->find('ID', $currentEnvironment->ID);
+					$isCurrentEnvironment = (bool)$project->DNEnvironmentList()->find('ID', $currentEnvironment->ID);
 				}
 
 				$navigation->push(array(
@@ -1073,7 +1073,7 @@ 
 			return $body;
 		}
 
-		$form->setFormAction($this->getRequest()->getURL() . '/DeployForm');
+		$form->setFormAction($this->getRequest()->getURL().'/DeployForm');
 		return $form;
 	}
 
@@ -1097,7 +1097,7 @@ 
 		}
 
 		$options = [];
-		foreach ($env->Backend()->getDeployOptions($env) as $option) {
+		foreach($env->Backend()->getDeployOptions($env) as $option) {
 			$options[] = [
 				'name' => $option->getName(),
 				'title' => $option->getTitle(),
@@ -1230,7 +1230,7 @@ 
 	}
 
 	protected function applyRedeploy(SS_HTTPRequest $request, &$data) {
-		if (!$request->getVar('redeploy')) return;
+		if(!$request->getVar('redeploy')) return;
 
 		$project = $this->getCurrentProject();
 		if(!$project) {
@@ -1244,12 +1244,12 @@ 
 		}
 
 		$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();
 			}
@@ -1380,7 +1380,7 @@ 
 		$deployment->getMachine()->apply(DNDeployment::TR_QUEUE);
 
 		return json_encode(array(
-			'url' => Director::absoluteBaseURL() . $deployment->Link()
+			'url' => Director::absoluteBaseURL().$deployment->Link()
 		), JSON_PRETTY_PRINT);
 	}
 
@@ -1484,7 +1484,7 @@ 
 			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));
 		}
 
@@ -1522,7 +1522,7 @@ 
 					->addExtraClass('btn')
 			)
 		);
-		$form->setFormAction($this->getRequest()->getURL() . '/DataTransferForm');
+		$form->setFormAction($this->getRequest()->getURL().'/DataTransferForm');
 
 		return $form;
 	}
@@ -1724,7 +1724,7 @@ 
 					->addExtraClass('btn')
 			)
 		);
-		$form->setFormAction($project->Link() . '/DataTransferRestoreForm');
+		$form->setFormAction($project->Link().'/DataTransferRestoreForm');
 
 		return $form;
 	}
@@ -1822,7 +1822,7 @@ 
 					->addExtraClass('btn')
 			)
 		);
-		$form->setFormAction($project->Link() . '/DeleteForm');
+		$form->setFormAction($project->Link().'/DeleteForm');
 
 		return $form;
 	}
@@ -1928,7 +1928,7 @@ 
 					->addExtraClass('btn')
 			)
 		);
-		$form->setFormAction($this->getCurrentProject()->Link() . '/MoveForm');
+		$form->setFormAction($this->getCurrentProject()->Link().'/MoveForm');
 
 		return $form;
 	}
@@ -2220,7 +2220,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
 		);
 	}
@@ -2230,7 +2230,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);
 	}
 
 	/**
@@ -2297,7 +2297,7 @@ 
 	public function AmbientMenu() {
 		$list = new ArrayList();
 
-		if (Member::currentUserID()) {
+		if(Member::currentUserID()) {
 			$list->push(new ArrayData(array(
 				'Classes' => 'logout',
 				'FaIcon' => 'sign-out',

code/model/DNEnvironment.php

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;
 	}
 
 	/**

code/control/GitDispatcher.php

Spacing +1 added lines, -1 removed lines

@@ -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 = array(
 			'message' => 'git fetch has been queued',
 			'ID' => $fetch->ID,

code/model/jobs/DNDeployment.php

Spacing +11 added lines, -11 removed lines

@@ -101,7 +101,7 @@ 
 	}
 
 	public function LogLink() {
-		return $this->Link() . '/log';
+		return $this->Link().'/log';
 	}
 
 	public function canView($member = null) {
@@ -177,18 +177,18 @@ 
 	 */
 	public function getCommitURL() {
 		$environment = $this->Environment();
-		if (!$environment) {
+		if(!$environment) {
 			return null;
 		}
 		$project = $environment->Project();
-		if (!$project) {
+		if(!$project) {
 			return null;
 		}
 		$interface = $project->getRepositoryInterface();
-		if (!$interface) {
+		if(!$interface) {
 			return null;
 		}
-		return $interface->CommitURL . '/' . $this->SHA;
+		return $interface->CommitURL.'/'.$this->SHA;
 	}
 
 	/**
@@ -237,12 +237,12 @@ 
 	 */
 	public function getFullDeployMessages() {
 		$strategy = $this->getDeploymentStrategy();
-		if ($strategy->getActionCode()!=='full') return null;
+		if($strategy->getActionCode() !== 'full') return null;
 
 		$changes = $strategy->getChangesModificationNeeded();
 		$messages = [];
-		foreach ($changes as $change => $details) {
-			if ($change==='Code version') continue;
+		foreach($changes as $change => $details) {
+			if($change === 'Code version') continue;
 
 			$messages[] = [
 				'Flag' => sprintf(
@@ -253,7 +253,7 @@ 
 			];
 		}
 
-		if (empty($messages)) {
+		if(empty($messages)) {
 			$messages[] = [
 				'Flag' => '',
 				'Text' => '<i>Environment changes have been made.</i>'
@@ -302,7 +302,7 @@ 
 
 			// if there is a compare URL, and a description or a change (something actually changed)
 			// then show the URL. Otherwise don't show anything, as there is no comparison to be made.
-			if ($changed || $description) {
+			if($changed || $description) {
 				$compareUrl = isset($change['compareUrl']) ? $change['compareUrl'] : '';
 			}
 
@@ -366,7 +366,7 @@ 
 
 	public function getSigFile() {
 		$dir = DNData::inst()->getSignalDir();
-		if (!is_dir($dir)) {
+		if(!is_dir($dir)) {
 			`mkdir $dir`;
 		}
 		return sprintf(

code/control/DeployDispatcher.php

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);
@@ -110,10 +110,10 @@ 
 	 */
 	public function show(SS_HTTPRequest $request) {
 		$deployment = DNDeployment::get()->byId($request->param('ID'));
-		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 deploy this environment'], 403);
 		}
 		return $this->getAPIResponse(['deployment' => $this->getDeploymentData($deployment)], 200);
@@ -125,10 +125,10 @@ 
 	 */
 	public function log(SS_HTTPRequest $request) {
 		$deployment = DNDeployment::get()->byId($request->params('ID'));
-		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 environment'], 403);
 		}
 
@@ -146,7 +146,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);
 		}
 
@@ -202,12 +202,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);
 		}
 
@@ -241,8 +241,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;
 			}