silverstripe / deploynaut

code/jobs/DeployJob.php

Spacing +14 added lines, -14 removed lines

@@ -18,8 +18,8 @@ 
 	public function alarmHandler() {
 		$sigFile = $this->args['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, [
+			$signal = (int) file_get_contents($sigFile);
+			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 {
@@ -60,9 +60,9 @@ 
 		// to this job as a whole (including any subprocesses such as spawned by Symfony).
 		posix_setsid();
 
-		if(function_exists('pcntl_alarm') && function_exists('pcntl_signal')) {
+		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']);
+				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']);
@@ -92,7 +92,7 @@ 
 		// deploy onto a clean environment will not be performing any backup regardless of
 		// whether the predeploy_backup option was passed or not.
 		// Sometimes predeploy_backup comes through as string false from the frontend.
-		if(
+		if (
 			!empty($this->args['predeploy_backup'])
 			&& $this->args['predeploy_backup'] !== 'false'
 			&& !empty($currentBuild)
@@ -114,7 +114,7 @@ 
 			// Disallow concurrent deployments (don't rely on queuing implementation to restrict this)
 			// Only consider deployments started in the last 30 minutes (older jobs probably got stuck)
 			$runningDeployments = $environment->runningDeployments()->exclude('ID', $this->args['deploymentID']);
-			if($runningDeployments->count()) {
+			if ($runningDeployments->count()) {
 				$runningDeployment = $runningDeployments->first();
 				$message = sprintf(
 					'Error: another deployment is in progress (started at %s by %s)',
@@ -134,14 +134,14 @@ 
 				// all options from the DeploymentStrategy merged in, including sha.
 				$this->args
 			);
-		} catch(Exception $e) {
+		} 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) {
@@ -160,7 +160,7 @@ 
 			DB::connect($databaseConfig);
 			$backupDataTransfer->Status = 'Finished';
 			$backupDataTransfer->write();
-		} catch(Exception $e) {
+		} catch (Exception $e) {
 			global $databaseConfig;
 			DB::connect($databaseConfig);
 			$backupDataTransfer->Status = 'Failed';

code/control/DeploynautLogFile.php

Spacing +3 added lines, -3 removed lines

@@ -45,7 +45,7 @@ 
 	 * @return string
 	 */
 	public function getRawFilePath() {
-		return $this->basePath . '/' . $this->logFile;
+		return $this->basePath.'/'.$this->logFile;
 	}
 
 	/**
@@ -53,7 +53,7 @@ 
 	 * @return string
 	 */
 	public function getSanitisedLogFilePath() {
-		return $this->basePath . '/' . strtolower(FileNameFilter::create()->filter($this->logFile));
+		return $this->basePath.'/'.strtolower(FileNameFilter::create()->filter($this->logFile));
 	}
 
 	/**
@@ -83,7 +83,7 @@ 
 		// Make sure we write into the old path for existing logs. New logs use the sanitised file path instead.
 		$path = file_exists($this->getRawFilePath()) ? $this->getRawFilePath() : $this->getSanitisedLogFilePath();
 
-		error_log('[' . date('Y-m-d H:i:s') . '] ' . $message . PHP_EOL, 3, $path);
+		error_log('['.date('Y-m-d H:i:s').'] '.$message.PHP_EOL, 3, $path);
 		@chmod($path, 0666);
 	}
 

code/control/DNRoot.php

Spacing +27 added lines, -27 removed lines

@@ -178,7 +178,7 @@ 
 		Requirements::javascript('deploynaut/javascript/material.js');
 
 		// Load the buildable dependencies only if not loaded centrally.
-		if (!is_dir(BASE_PATH . DIRECTORY_SEPARATOR . 'static')) {
+		if (!is_dir(BASE_PATH.DIRECTORY_SEPARATOR.'static')) {
 			if (\Director::isDev()) {
 				\Requirements::javascript('deploynaut/static/bundle-debug.js');
 			} else {
@@ -242,7 +242,7 @@ 
 		}
 
 		// 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/');
 	}
 
 	/**
@@ -389,7 +389,7 @@ 
 		// 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 = [];
@@ -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;
 	}
@@ -442,7 +442,7 @@ 
 		}
 
 		$validEnvs = $project->DNEnvironmentList()
-			->filterByCallback(function ($item) {
+			->filterByCallback(function($item) {
 				return $item->canUploadArchive();
 			});
 
@@ -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();
@@ -547,7 +547,7 @@ 
 		// 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 = [];
@@ -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;
 	}
@@ -592,7 +592,7 @@ 
 			return $this->project404Response();
 		}
 
-		$validEnvs = $project->DNEnvironmentList()->filterByCallback(function ($item) {
+		$validEnvs = $project->DNEnvironmentList()->filterByCallback(function($item) {
 			return $item->canUploadArchive();
 		});
 
@@ -712,7 +712,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([
@@ -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;
 	}
@@ -882,7 +882,7 @@ 
 		$job->write();
 		$job->start();
 
-		return $this->redirect($project->Link('createenv') . '/' . $job->ID);
+		return $this->redirect($project->Link('createenv').'/'.$job->ID);
 	}
 
 	/**
@@ -1080,7 +1080,7 @@ 
 			return $body;
 		}
 
-		$form->setFormAction($this->getRequest()->getURL() . '/DeployForm');
+		$form->setFormAction($this->getRequest()->getURL().'/DeployForm');
 		return $form;
 	}
 
@@ -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);
 	}
 
@@ -1469,7 +1469,7 @@ 
 	 */
 	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();
 		});
 
@@ -1491,7 +1491,7 @@ 
 					->addExtraClass('btn')
 			)
 		);
-		$form->setFormAction($this->getRequest()->getURL() . '/DataTransferForm');
+		$form->setFormAction($this->getRequest()->getURL().'/DataTransferForm');
 
 		return $form;
 	}
@@ -1517,12 +1517,12 @@ 
 		// Validate direction.
 		if ($data['Direction'] == 'get') {
 			$validEnvs = $this->getCurrentProject()->DNEnvironmentList()
-				->filterByCallback(function ($item) {
+				->filterByCallback(function($item) {
 					return $item->canBackup();
 				});
 		} else if ($data['Direction'] == 'push') {
 			$validEnvs = $this->getCurrentProject()->DNEnvironmentList()
-				->filterByCallback(function ($item) {
+				->filterByCallback(function($item) {
 					return $item->canRestore();
 				});
 		} else {
@@ -1653,7 +1653,7 @@ 
 
 		// 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();
 		});
 
@@ -1692,7 +1692,7 @@ 
 					->addExtraClass('btn')
 			)
 		);
-		$form->setFormAction($project->Link() . '/DataTransferRestoreForm');
+		$form->setFormAction($project->Link().'/DataTransferRestoreForm');
 
 		return $form;
 	}
@@ -1790,7 +1790,7 @@ 
 					->addExtraClass('btn')
 			)
 		);
-		$form->setFormAction($project->Link() . '/DeleteForm');
+		$form->setFormAction($project->Link().'/DeleteForm');
 
 		return $form;
 	}
@@ -1896,7 +1896,7 @@ 
 					->addExtraClass('btn')
 			)
 		);
-		$form->setFormAction($this->getCurrentProject()->Link() . '/MoveForm');
+		$form->setFormAction($this->getCurrentProject()->Link().'/MoveForm');
 
 		return $form;
 	}
@@ -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() ||
@@ -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);
 	}
 
 	/**

code/tasks/SyncProjectsAndEnvironments.php

Spacing +33 added lines, -33 removed lines

@@ -9,19 +9,19 @@ 
 		$remove = true;
 		$dryRun = true;
 
-		if($request && $request->requestVar('remove') !== null) {
-			$remove = (bool)$request->requestVar('remove');
+		if ($request && $request->requestVar('remove') !== null) {
+			$remove = (bool) $request->requestVar('remove');
 		}
 
-		if($request && $request->requestVar('dryrun') !== null) {
-			$dryRun = (bool)$request->requestVar('dryrun');
+		if ($request && $request->requestVar('dryrun') !== null) {
+			$dryRun = (bool) $request->requestVar('dryrun');
 		}
 
-		if($dryRun) {
+		if ($dryRun) {
 			echo "Running in dry run mode, no changes commited, ";
-			echo "the output shows a prediction on what will happen." . PHP_EOL;
-			echo "To skip dryrun, run the task like this:" . PHP_EOL;
-			echo "./framework/sake dev/tasks/SyncProjectsAndEnvironments dryrun=0" . PHP_EOL . PHP_EOL;
+			echo "the output shows a prediction on what will happen.".PHP_EOL;
+			echo "To skip dryrun, run the task like this:".PHP_EOL;
+			echo "./framework/sake dev/tasks/SyncProjectsAndEnvironments dryrun=0".PHP_EOL.PHP_EOL;
 			sleep(3);
 		}
 
@@ -30,7 +30,7 @@ 
 
 		// Sync projects
 		$projects = DNProject::get();
-		if($remove) {
+		if ($remove) {
 			$this->echoHeader('Removing obsolete projects');
 			$this->removeObsoleteProjects($projectPaths, $dryRun);
 		}
@@ -38,7 +38,7 @@ 
 		$this->syncProjectPaths($projectPaths, $dryRun);
 
 		$this->echoHeader('Syncing environment files');
-		foreach($projects as $project) {
+		foreach ($projects as $project) {
 			$this->echoHeader($project->Name);
 			// Sync environments for each project
 			$environmentPaths = $data->getEnvironmentPaths($project->Name);
@@ -62,13 +62,13 @@ 
 		}, $paths);
 
 		$removeList = $list->filter('Filename:not', $basePaths);
-		if($removeList->count() === 0) {
+		if ($removeList->count() === 0) {
 			return;
 		}
 
-		foreach($removeList as $remove) {
-			$this->message('Removing "' . basename($remove->Name) . '" from db');
-			if(!$dryRun) {
+		foreach ($removeList as $remove) {
+			$this->message('Removing "'.basename($remove->Name).'" from db');
+			if (!$dryRun) {
 				$removeList->remove($remove);
 			}
 		}
@@ -83,13 +83,13 @@ 
 	 */
 	protected function removeObsoleteProjects($paths, $dryrun = false) {
 		$removeList = DNProject::get()->filter('Name:not', $paths);
-		if($removeList->count() == 0) {
+		if ($removeList->count() == 0) {
 			return;
 		}
 
-		foreach($removeList as $remove) {
-			$this->message($remove->Name . ' ' . $remove->Path);
-			if(!$dryrun) {
+		foreach ($removeList as $remove) {
+			$this->message($remove->Name.' '.$remove->Path);
+			if (!$dryrun) {
 				$removeList->remove($remove);
 			}
 		}
@@ -106,22 +106,22 @@ 
 		$list = $project->Environments();
 
 		// Normalise paths in DB
-		foreach($list as $item) {
+		foreach ($list as $item) {
 			$real = realpath($item->Filename);
-			if($real && $real != $item->Filename) {
+			if ($real && $real != $item->Filename) {
 				$item->Filename = $real;
 				$item->write();
 			}
 		}
 
-		foreach($paths as $path) {
+		foreach ($paths as $path) {
 			$path = basename($path);
-			if($list->filter('Filename', $path)->count()) {
+			if ($list->filter('Filename', $path)->count()) {
 				continue;
 			}
 
-			$this->message('Adding "' . basename($path) . '" to db');
-			if(!$dryRun) {
+			$this->message('Adding "'.basename($path).'" to db');
+			if (!$dryRun) {
 				$environment = DNEnvironment::create_from_path($path);
 				$environment->ProjectID = $project->ID;
 				$environment->write();
@@ -136,10 +136,10 @@ 
 	 * @param boolean $dryRun
 	 */
 	public function syncProjectPaths($paths, $dryRun = false) {
-		foreach($paths as $path) {
-			if(!DNProject::get()->filter('Name', $path)->count()) {
+		foreach ($paths as $path) {
+			if (!DNProject::get()->filter('Name', $path)->count()) {
 				$this->message($path);
-				if(!$dryRun) {
+				if (!$dryRun) {
 					DNProject::create_from_path($path)->write();
 				}
 			}
@@ -150,20 +150,20 @@ 
 	 * @param string $text
 	 */
 	protected function message($text) {
-		if(PHP_SAPI !== 'cli') {
-			$text = '<p>' . $text . '</p>' . PHP_EOL;
+		if (PHP_SAPI !== 'cli') {
+			$text = '<p>'.$text.'</p>'.PHP_EOL;
 		}
-		echo ' - ' . $text . PHP_EOL;
+		echo ' - '.$text.PHP_EOL;
 	}
 
 	/**
 	 * @param string $text
 	 */
 	protected function echoHeader($text) {
-		if(PHP_SAPI !== 'cli') {
-			echo '<h2>' . $text . '</h2>' . PHP_EOL;
+		if (PHP_SAPI !== 'cli') {
+			echo '<h2>'.$text.'</h2>'.PHP_EOL;
 		} else {
-			echo '# ' . $text . PHP_EOL;
+			echo '# '.$text.PHP_EOL;
 		}
 	}
 }

code/model/DNEnvironment.php

Spacing +63 added lines, -63 removed lines

@@ -180,7 +180,7 @@ 
 	 */
 	public function Backend() {
 		$backends = array_keys($this->config()->get('allowed_backends', Config::FIRST_SET));
-		switch(sizeof($backends)) {
+		switch (sizeof($backends)) {
 		// Nothing allowed, use the default value "DeploymentBackend"
 			case 0:
 				$backend = "DeploymentBackend";
@@ -194,7 +194,7 @@ 
 			// Multiple choices, use our choice if it's legal, otherwise default to the first item on the list
 			default:
 				$backend = $this->BackendIdentifier;
-				if(!in_array($backend, $backends)) {
+				if (!in_array($backend, $backends)) {
 					$backend = $backends[0];
 				}
 		}
@@ -256,14 +256,14 @@ 
 
 	public function getBareURL() {
 		$url = parse_url($this->URL);
-		if(isset($url['host'])) {
+		if (isset($url['host'])) {
 			return strtolower($url['host']);
 		}
 	}
 
 	public function getBareDefaultURL() {
 		$url = parse_url($this->getDefaultURL());
-		if(isset($url['host'])) {
+		if (isset($url['host'])) {
 			return strtolower($url['host']);
 		}
 	}
@@ -275,20 +275,20 @@ 
 	 * @return boolean
 	 */
 	public function canView($member = null) {
-		if(!$member) {
+		if (!$member) {
 			$member = Member::currentUser();
 		}
-		if(!$member) {
+		if (!$member) {
 			return false;
 		}
 		// Must be logged in to check permissions
 
-		if(Permission::checkMember($member, 'ADMIN')) {
+		if (Permission::checkMember($member, 'ADMIN')) {
 			return true;
 		}
 
 		// if no Viewers or ViewerGroups defined, fallback to DNProject::canView permissions
-		if($this->Viewers()->exists() || $this->ViewerGroups()->exists()) {
+		if ($this->Viewers()->exists() || $this->ViewerGroups()->exists()) {
 			return $this->Viewers()->byID($member->ID)
 				|| $member->inGroups($this->ViewerGroups());
 		}
@@ -303,10 +303,10 @@ 
 	 * @return boolean
 	 */
 	public function canDeploy($member = null) {
-		if(!$member) {
+		if (!$member) {
 			$member = Member::currentUser();
 		}
-		if(!$member) {
+		if (!$member) {
 			return false;
 		}
 		// Must be logged in to check permissions
@@ -338,10 +338,10 @@ 
 	 * @return boolean true if $member can restore, and false if they can't.
 	 */
 	public function canRestore($member = null) {
-		if(!$member) {
+		if (!$member) {
 			$member = Member::currentUser();
 		}
-		if(!$member) {
+		if (!$member) {
 			return false;
 		}
 		// Must be logged in to check permissions
@@ -365,15 +365,15 @@ 
 	 */
 	public function canBackup($member = null) {
 		$project = $this->Project();
-		if($project->HasDiskQuota() && $project->HasExceededDiskQuota()) {
+		if ($project->HasDiskQuota() && $project->HasExceededDiskQuota()) {
 			return false;
 		}
 
-		if(!$member) {
+		if (!$member) {
 			$member = Member::currentUser();
 		}
 		// Must be logged in to check permissions
-		if(!$member) {
+		if (!$member) {
 			return false;
 		}
 
@@ -400,14 +400,14 @@ 
 	 */
 	public function canUploadArchive($member = null) {
 		$project = $this->Project();
-		if($project->HasDiskQuota() && $project->HasExceededDiskQuota()) {
+		if ($project->HasDiskQuota() && $project->HasExceededDiskQuota()) {
 			return false;
 		}
 
-		if(!$member) {
+		if (!$member) {
 			$member = Member::currentUser();
 		}
-		if(!$member) {
+		if (!$member) {
 			return false;
 		}
 		// Must be logged in to check permissions
@@ -430,10 +430,10 @@ 
 	 * @return boolean true if $member can download archives from this environment, false if they can't.
 	 */
 	public function canDownloadArchive($member = null) {
-		if(!$member) {
+		if (!$member) {
 			$member = Member::currentUser();
 		}
-		if(!$member) {
+		if (!$member) {
 			return false;
 		}
 		// Must be logged in to check permissions
@@ -456,10 +456,10 @@ 
 	 * @return boolean true if $member can delete archives from this environment, false if they can't.
 	 */
 	public function canDeleteArchive($member = null) {
-		if(!$member) {
+		if (!$member) {
 			$member = Member::currentUser();
 		}
-		if(!$member) {
+		if (!$member) {
 			return false;
 		}
 		// Must be logged in to check permissions
@@ -589,18 +589,18 @@ 
 			'State' => 'Completed'
 		))->sort('LastEdited DESC')->first();
 
-		if(!$deploy || (!$deploy->SHA)) {
+		if (!$deploy || (!$deploy->SHA)) {
 			return false;
 		}
 
 		$repo = $this->Project()->getRepository();
-		if(!$repo) {
+		if (!$repo) {
 			return $deploy;
 		}
 
 		try {
 			$commit = $repo->getCommit($deploy->SHA);
-			if($commit) {
+			if ($commit) {
 				$deploy->Message = Convert::raw2xml($commit->getMessage());
 				$deploy->Committer = Convert::raw2xml($commit->getCommitterName());
 				$deploy->CommitDate = $commit->getCommitterDate()->Format('d/m/Y g:ia');
@@ -608,7 +608,7 @@ 
 				$deploy->AuthorDate = $commit->getAuthorDate()->Format('d/m/Y g:ia');
 			}
 			// We can't find this SHA, so we ignore adding a commit message to the deployment
-		} catch(Exception $ex) { }
+		} catch (Exception $ex) { }
 
 		return $deploy;
 	}
@@ -631,17 +631,17 @@ 
 	protected function getCommitData($sha) {
 		try {
 			$repo = $this->Project()->getRepository();
-			if($repo !== false) {
+			if ($repo !== false) {
 				$commit = new \Gitonomy\Git\Commit($repo, $sha);
 				return [
-					'AuthorName' => (string)Convert::raw2xml($commit->getAuthorName()),
-					'AuthorEmail' => (string)Convert::raw2xml($commit->getAuthorEmail()),
-					'Message' => (string)Convert::raw2xml($commit->getMessage()),
+					'AuthorName' => (string) Convert::raw2xml($commit->getAuthorName()),
+					'AuthorEmail' => (string) Convert::raw2xml($commit->getAuthorEmail()),
+					'Message' => (string) Convert::raw2xml($commit->getMessage()),
 					'ShortHash' => Convert::raw2xml($commit->getFixedShortHash(8)),
 					'Hash' => Convert::raw2xml($commit->getHash())
 				];
 			}
-		} catch(\Gitonomy\Git\Exception\ReferenceNotFoundException $exc) {
+		} catch (\Gitonomy\Git\Exception\ReferenceNotFoundException $exc) {
 			SS_Log::log($exc, SS_Log::WARN);
 		}
 		return array(
@@ -713,12 +713,12 @@ 
 		$fields = new FieldList(new TabSet('Root'));
 
 		$project = $this->Project();
-		if($project && $project->exists()) {
+		if ($project && $project->exists()) {
 			$viewerGroups = $project->Viewers();
 			$groups = $viewerGroups->sort('Title')->map()->toArray();
 			$members = array();
-			foreach($viewerGroups as $group) {
-				foreach($group->Members()->map() as $k => $v) {
+			foreach ($viewerGroups as $group) {
+				foreach ($group->Members()->map() as $k => $v) {
 					$members[$k] = $v;
 				}
 			}
@@ -755,7 +755,7 @@ 
 		// Backend identifier - pick from a named list of configurations specified in YML config
 		$backends = $this->config()->get('allowed_backends', Config::FIRST_SET);
 		// If there's only 1 backend, then user selection isn't needed
-		if(sizeof($backends) > 1) {
+		if (sizeof($backends) > 1) {
 			$fields->addFieldToTab('Root.Main', DropdownField::create('BackendIdentifier', 'Deployment backend')
 				->setSource($backends)
 				->setDescription('What kind of deployment system should be used to deploy to this environment'));
@@ -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).'
 				),
 
@@ -824,14 +824,14 @@ 
 		));
 
 		// The Main.DeployConfig
-		if($this->Project()->exists()) {
+		if ($this->Project()->exists()) {
 			$this->setDeployConfigurationFields($fields);
 		}
 
 		// The DataArchives
 		$dataArchiveConfig = GridFieldConfig_RecordViewer::create();
 		$dataArchiveConfig->removeComponentsByType('GridFieldAddNewButton');
-		if(class_exists('GridFieldBulkManager')) {
+		if (class_exists('GridFieldBulkManager')) {
 			$dataArchiveConfig->addComponent(new GridFieldBulkManager());
 		}
 		$dataArchive = GridField::create('DataArchives', 'Data Archives', $this->DataArchives(), $dataArchiveConfig);
@@ -840,7 +840,7 @@ 
 		// Deployments
 		$deploymentsConfig = GridFieldConfig_RecordEditor::create();
 		$deploymentsConfig->removeComponentsByType('GridFieldAddNewButton');
-		if(class_exists('GridFieldBulkManager')) {
+		if (class_exists('GridFieldBulkManager')) {
 			$deploymentsConfig->addComponent(new GridFieldBulkManager());
 		}
 		$deployments = GridField::create('Deployments', 'Deployments', $this->Deployments(), $deploymentsConfig);
@@ -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');
 
@@ -864,11 +864,11 @@ 
 	 * @param FieldList $fields
 	 */
 	protected function setDeployConfigurationFields(&$fields) {
-		if(!$this->config()->get('allow_web_editing')) {
+		if (!$this->config()->get('allow_web_editing')) {
 			return;
 		}
 
-		if($this->envFileExists()) {
+		if ($this->envFileExists()) {
 			$deployConfig = new TextareaField('DeployConfig', 'Deploy config', $this->getEnvironmentConfig());
 			$deployConfig->setRows(40);
 			$fields->insertAfter($deployConfig, 'Filename');
@@ -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();
@@ -898,13 +898,13 @@ 
 	public function onAfterWrite() {
 		parent::onAfterWrite();
 
-		if($this->Usage === self::PRODUCTION || $this->Usage === self::UAT) {
+		if ($this->Usage === self::PRODUCTION || $this->Usage === self::UAT) {
 			$conflicting = DNEnvironment::get()
 				->filter('ProjectID', $this->ProjectID)
 				->filter('Usage', $this->Usage)
 				->exclude('ID', $this->ID);
 
-			foreach($conflicting as $otherEnvironment) {
+			foreach ($conflicting as $otherEnvironment) {
 				$otherEnvironment->Usage = self::UNSPECIFIED;
 				$otherEnvironment->write();
 			}
@@ -918,7 +918,7 @@ 
 	protected function checkEnvironmentPath() {
 		// Create folder if it doesn't exist
 		$configDir = dirname($this->getConfigFilename());
-		if(!file_exists($configDir) && $configDir) {
+		if (!file_exists($configDir) && $configDir) {
 			mkdir($configDir, 0777, true);
 		}
 	}
@@ -927,18 +927,18 @@ 
 	 * Write the deployment config file to filesystem
 	 */
 	protected function writeConfigFile() {
-		if(!$this->config()->get('allow_web_editing')) {
+		if (!$this->config()->get('allow_web_editing')) {
 			return;
 		}
 
 		// Create a basic new environment config from a template
-		if(!$this->envFileExists()
+		if (!$this->envFileExists()
 			&& $this->Filename
 			&& $this->CreateEnvConfig
 		) {
-			$templateFile = $this->config()->template_file ?: BASE_PATH . '/deploynaut/environment.template';
+			$templateFile = $this->config()->template_file ?: BASE_PATH.'/deploynaut/environment.template';
 			file_put_contents($this->getConfigFilename(), file_get_contents($templateFile));
-		} else if($this->envFileExists() && $this->DeployConfig) {
+		} else if ($this->envFileExists() && $this->DeployConfig) {
 			file_put_contents($this->getConfigFilename(), $this->DeployConfig);
 		}
 	}
@@ -949,12 +949,12 @@ 
 	public function onAfterDelete() {
 		parent::onAfterDelete();
 		// Create a basic new environment config from a template
-		if($this->config()->get('allow_web_editing') && $this->envFileExists()) {
+		if ($this->config()->get('allow_web_editing') && $this->envFileExists()) {
 			unlink($this->getConfigFilename());
 		}
 
 		$create = $this->CreateEnvironment();
-		if($create && $create->exists()) {
+		if ($create && $create->exists()) {
 			$create->delete();
 		}
 	}
@@ -963,7 +963,7 @@ 
 	 * @return string
 	 */
 	protected function getEnvironmentConfig() {
-		if(!$this->envFileExists()) {
+		if (!$this->envFileExists()) {
 			return '';
 		}
 		return file_get_contents($this->getConfigFilename());
@@ -973,7 +973,7 @@ 
 	 * @return boolean
 	 */
 	protected function envFileExists() {
-		if(!$this->getConfigFilename()) {
+		if (!$this->getConfigFilename()) {
 			return false;
 		}
 		return file_exists($this->getConfigFilename());
@@ -985,13 +985,13 @@ 
 	 * @return string
 	 */
 	public function getConfigFilename() {
-		if(!$this->Project()->exists()) {
+		if (!$this->Project()->exists()) {
 			return '';
 		}
-		if(!$this->Filename) {
+		if (!$this->Filename) {
 			return '';
 		}
-		return $this->DNData()->getEnvironmentDir() . '/' . $this->Project()->Name . '/' . $this->Filename;
+		return $this->DNData()->getEnvironmentDir().'/'.$this->Project()->Name.'/'.$this->Filename;
 	}
 
 	/**
@@ -1004,24 +1004,24 @@ 
 	 */
 	public static function array_to_viewabledata($array) {
 		// Don't transform non-arrays
-		if(!is_array($array)) {
+		if (!is_array($array)) {
 			return $array;
 		}
 
 		// Figure out whether this is indexed or associative
 		$keys = array_keys($array);
 		$assoc = ($keys != array_keys($keys));
-		if($assoc) {
+		if ($assoc) {
 			// Treat as viewable data
 			$data = new ArrayData(array());
-			foreach($array as $key => $value) {
+			foreach ($array as $key => $value) {
 				$data->setField($key, self::array_to_viewabledata($value));
 			}
 			return $data;
 		} else {
 			// Treat this as basic non-associative list
 			$list = new ArrayList();
-			foreach($array as $value) {
+			foreach ($array as $value) {
 				$list->push(self::array_to_viewabledata($value));
 			}
 			return $list;
@@ -1032,7 +1032,7 @@ 
 		$result = parent::validate();
 		$backend = $this->Backend();
 
-		if(strcasecmp('test', $this->Name) === 0 && get_class($backend) == 'CapistranoDeploymentBackend') {
+		if (strcasecmp('test', $this->Name) === 0 && get_class($backend) == 'CapistranoDeploymentBackend') {
 			$result->error('"test" is not a valid environment name when using Capistrano backend.');
 		}
 

code/model/DNBranch.php

Spacing +6 added lines, -6 removed lines

@@ -50,19 +50,19 @@ 
 	 * @return string
 	 */
 	public function Name() {
-		return (string)htmlentities($this->branch->getName());
+		return (string) htmlentities($this->branch->getName());
 	}
 
 	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()));
 	}
 
 	/**
 	 * @return string
 	 */
 	public function SHA() {
-		return (string)htmlentities($this->branch->getCommit()->getHash());
+		return (string) htmlentities($this->branch->getCommit()->getHash());
 	}
 
 	/**
@@ -78,12 +78,12 @@ 
 	 */
 	public function LastUpdated() {
 
-		if($this->_lastUpdatedCache) {
+		if ($this->_lastUpdatedCache) {
 			return $this->_lastUpdatedCache;
 		}
 		try {
 			$created = $this->branch->getCommit()->getCommitterDate();
-		} catch(Exception $e) {
+		} catch (Exception $e) {
 			//occasionally parsing will fail this is a fallback to make it still work
 			return new SS_Datetime();
 		}
@@ -103,7 +103,7 @@ 
 	 * @return string
 	 */
 	public function IsOpenByDefault() {
-		if($this->Name() == 'master') {
+		if ($this->Name() == 'master') {
 			return " open";
 		} else {
 			return "";

code/model/DNProject.php

Spacing +70 added lines, -70 removed lines

@@ -109,7 +109,7 @@ 
 
 		// add the administrators group as the viewers of the new project
 		$adminGroup = Group::get()->filter('Code', 'administrators')->first();
-		if($adminGroup && $adminGroup->exists()) {
+		if ($adminGroup && $adminGroup->exists()) {
 			$project->Viewers()->add($adminGroup);
 		}
 		return $project;
@@ -124,8 +124,8 @@ 
 	public function getUsedQuotaMB($round = 2) {
 		$size = 0;
 
-		foreach($this->Environments() as $environment) {
-			foreach($environment->DataArchives()->filter('IsBackup', 0) as $archive) {
+		foreach ($this->Environments() as $environment) {
+			foreach ($environment->DataArchives()->filter('IsBackup', 0) as $archive) {
 				$size += $archive->ArchiveFile()->getAbsoluteSize();
 			}
 		}
@@ -144,7 +144,7 @@ 
 	public function getDiskQuotaMB() {
 		$size = $this->getField('DiskQuotaMB');
 
-		if(empty($size)) {
+		if (empty($size)) {
 			$defaults = $this->config()->get('defaults');
 			$size = (isset($defaults['DiskQuotaMB'])) ? $defaults['DiskQuotaMB'] : 0;
 		}
@@ -177,7 +177,7 @@ 
 	 */
 	public function DiskQuotaUsagePercent() {
 		$quota = $this->getDiskQuotaMB();
-		if($quota > 0) {
+		if ($quota > 0) {
 			return $this->getUsedQuotaMB() * 100 / $quota;
 		}
 		return 100;
@@ -194,7 +194,7 @@ 
 		$controller = Controller::curr();
 		$actionType = $controller->getField('CurrentActionType');
 
-		if(DNRoot::FlagSnapshotsEnabled() && $this->isProjectReady()) {
+		if (DNRoot::FlagSnapshotsEnabled() && $this->isProjectReady()) {
 			$list->push(new ArrayData(array(
 				'Link' => sprintf('naut/project/%s/snapshots', $this->Name),
 				'Title' => 'Snapshots',
@@ -245,11 +245,11 @@ 
 	 * @return boolean
 	 */
 	public function canView($member = null) {
-		if(!$member) {
+		if (!$member) {
 			$member = Member::currentUser();
 		}
 
-		if(Permission::checkMember($member, 'ADMIN')) {
+		if (Permission::checkMember($member, 'ADMIN')) {
 			return true;
 		}
 
@@ -272,7 +272,7 @@ 
 			return true;
 		}
 
-		return (bool)$this->Environments()->filterByCallback(function($env) use($member) {
+		return (bool) $this->Environments()->filterByCallback(function($env) use($member) {
 			return $env->canRestore($member);
 		})->Count();
 	}
@@ -292,7 +292,7 @@ 
 			return true;
 		}
 
-		return (bool)$this->Environments()->filterByCallback(function($env) use($member) {
+		return (bool) $this->Environments()->filterByCallback(function($env) use($member) {
 			return $env->canBackup($member);
 		})->Count();
 	}
@@ -312,7 +312,7 @@ 
 			return true;
 		}
 
-		return (bool)$this->Environments()->filterByCallback(function($env) use($member) {
+		return (bool) $this->Environments()->filterByCallback(function($env) use($member) {
 			return $env->canUploadArchive($member);
 		})->Count();
 	}
@@ -332,7 +332,7 @@ 
 			return true;
 		}
 
-		return (bool)$this->Environments()->filterByCallback(function($env) use($member) {
+		return (bool) $this->Environments()->filterByCallback(function($env) use($member) {
 			return $env->canDownloadArchive($member);
 		})->Count();
 	}
@@ -349,9 +349,9 @@ 
 	 */
 	public function canCreateEnvironments($member = null) {
 		$envType = $this->AllowedEnvironmentType;
-		if($envType) {
+		if ($envType) {
 			$env = Injector::inst()->get($envType);
-			if($env instanceof EnvironmentCreateBackend) {
+			if ($env instanceof EnvironmentCreateBackend) {
 				return $this->allowed(DNRoot::ALLOW_CREATE_ENVIRONMENT, $member);
 			}
 		}
@@ -387,11 +387,11 @@ 
 	 * @return array
 	 */
 	public function getProcessEnv() {
-		if(file_exists($this->getPrivateKeyPath())) {
+		if (file_exists($this->getPrivateKeyPath())) {
 			// 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();
@@ -432,7 +432,7 @@ 
 	 * @return DNBranchList
 	 */
 	public function DNBranchList() {
-		if($this->CVSPath && !$this->repoExists()) {
+		if ($this->CVSPath && !$this->repoExists()) {
 			$this->cloneRepo();
 		}
 		return DNBranchList::create($this, $this->DNData());
@@ -444,7 +444,7 @@ 
 	 * @return DNReferenceList
 	 */
 	public function DNTagList() {
-		if($this->CVSPath && !$this->repoExists()) {
+		if ($this->CVSPath && !$this->repoExists()) {
 			$this->cloneRepo();
 		}
 		return DNReferenceList::create($this, $this->DNData(), null, null, true);
@@ -454,7 +454,7 @@ 
 	 * @return false|Gitonomy\Git\Repository
 	 */
 	public function getRepository() {
-		if(!$this->repoExists()) {
+		if (!$this->repoExists()) {
 			return false;
 		}
 
@@ -469,11 +469,11 @@ 
 	 */
 	public function DNEnvironmentList() {
 
-		if(!self::$_current_member_cache) {
+		if (!self::$_current_member_cache) {
 			self::$_current_member_cache = Member::currentUser();
 		}
 
-		if(self::$_current_member_cache === false) {
+		if (self::$_current_member_cache === false) {
 			return new ArrayList();
 		}
 
@@ -498,9 +498,9 @@ 
 	 * @return false|DNDeployment
 	 */
 	public function currentBuilds() {
-		if(!isset(self::$relation_cache['currentBuilds.'.$this->ID])) {
+		if (!isset(self::$relation_cache['currentBuilds.'.$this->ID])) {
 			$currentBuilds = array();
-			foreach($this->Environments() as $env) {
+			foreach ($this->Environments() as $env) {
 				$currentBuilds[$env->Name] = $env->CurrentBuild();
 			}
 			self::$relation_cache['currentBuilds.'.$this->ID] = $currentBuilds;
@@ -520,7 +520,7 @@ 
 	 * @return string|null
 	 */
 	public function CreateEnvironmentLink() {
-		if($this->canCreateEnvironments()) {
+		if ($this->canCreateEnvironments()) {
 			return $this->Link('createenv');
 		}
 		return null;
@@ -538,11 +538,11 @@ 
 	 */
 	public function IsStarred() {
 		$member = Member::currentUser();
-		if($member === null) {
+		if ($member === null) {
 			return false;
 		}
 		$favourited = $this->StarredBy()->filter('MemberID', $member->ID);
-		if($favourited->count() == 0) {
+		if ($favourited->count() == 0) {
 			return false;
 		}
 		return true;
@@ -597,7 +597,7 @@ 
 
 		$environmentTypes = ClassInfo::implementorsOf('EnvironmentCreateBackend');
 		$types = array();
-		foreach($environmentTypes as $type) {
+		foreach ($environmentTypes as $type) {
 			$types[$type] = $type;
 		}
 
@@ -621,11 +621,11 @@ 
 	 */
 	public function setCreateProjectFolderField(&$fields) {
 		// Check if the capistrano project folder exists
-		if(!$this->Name) {
+		if (!$this->Name) {
 			return;
 		}
 
-		if($this->projectFolderExists()) {
+		if ($this->projectFolderExists()) {
 			return;
 		}
 
@@ -657,7 +657,7 @@ 
 	 */
 	public function cloneRepo() {
 		// Avoid this being called multiple times in the same request
-		if(!isset(self::$has_cloned_cache[$this->ID])) {
+		if (!isset(self::$has_cloned_cache[$this->ID])) {
 			$fetch = DNGitFetch::create();
 			$fetch->ProjectID = $this->ID;
 			$fetch->write();
@@ -681,7 +681,7 @@ 
 	public function onBeforeWrite() {
 		parent::onBeforeWrite();
 
-		if($this->CreateEnvFolder && !file_exists($this->getProjectFolderPath())) {
+		if ($this->CreateEnvFolder && !file_exists($this->getProjectFolderPath())) {
 			mkdir($this->getProjectFolderPath());
 		}
 	}
@@ -689,12 +689,12 @@ 
 	public function onAfterWrite() {
 		parent::onAfterWrite();
 
-		if(!$this->CVSPath) {
+		if (!$this->CVSPath) {
 			return;
 		}
 
 		$changedFields = $this->getChangedFields(true, 2);
-		if(isset($changedFields['CVSPath']) || isset($changedFields['Name'])) {
+		if (isset($changedFields['CVSPath']) || isset($changedFields['Name'])) {
 			$this->cloneRepo();
 		}
 	}
@@ -706,22 +706,22 @@ 
 		parent::onAfterDelete();
 
 		// Delete related environments
-		foreach($this->Environments() as $env) {
+		foreach ($this->Environments() as $env) {
 			$env->delete();
 		}
 
 		// Delete local repository
-		if(file_exists($this->getLocalCVSPath())) {
+		if (file_exists($this->getLocalCVSPath())) {
 			Filesystem::removeFolder($this->getLocalCVSPath());
 		}
 
 		// Delete project template
-		if(file_exists($this->getProjectFolderPath()) && Config::inst()->get('DNEnvironment', 'allow_web_editing')) {
+		if (file_exists($this->getProjectFolderPath()) && Config::inst()->get('DNEnvironment', 'allow_web_editing')) {
 			Filesystem::removeFolder($this->getProjectFolderPath());
 		}
 
 		// Delete the deploy key
-		if(file_exists($this->getKeyDir())) {
+		if (file_exists($this->getKeyDir())) {
 			Filesystem::removeFolder($this->getKeyDir());
 		}
 	}
@@ -734,7 +734,7 @@ 
 	public function getPublicKey() {
 		$key = $this->getPublicKeyPath();
 
-		if(file_exists($key)) {
+		if (file_exists($key)) {
 			return trim(file_get_contents($key));
 		}
 	}
@@ -745,8 +745,8 @@ 
 	 * @return string|null
 	 */
 	public function getPublicKeyPath() {
-		if($privateKey = $this->getPrivateKeyPath()) {
-			return $privateKey . '.pub';
+		if ($privateKey = $this->getPrivateKeyPath()) {
+			return $privateKey.'.pub';
 		}
 		return null;
 	}
@@ -758,10 +758,10 @@ 
 	 */
 	public function getPrivateKeyPath() {
 		$keyDir = $this->getKeyDir();
-		if(!empty($keyDir)) {
+		if (!empty($keyDir)) {
 			$filter = FileNameFilter::create();
 			$name = $filter->filter($this->Name);
-			return $keyDir . '/' . $name;
+			return $keyDir.'/'.$name;
 		}
 		return null;
 	}
@@ -773,14 +773,14 @@ 
 	 */
 	public function getKeyDir() {
 		$keyDir = $this->DNData()->getKeyDir();
-		if(!$keyDir) {
+		if (!$keyDir) {
 			return null;
 		}
 
 		$filter = FileNameFilter::create();
 		$name = $filter->filter($this->Name);
 
-		return $this->DNData()->getKeyDir() . '/' . $name;
+		return $this->DNData()->getKeyDir().'/'.$name;
 	}
 
 	/**
@@ -790,7 +790,7 @@ 
 	 * @param GridField $environments
 	 */
 	protected function setEnvironmentFields(&$fields, $environments) {
-		if(!$environments) {
+		if (!$environments) {
 			return;
 		}
 
@@ -799,7 +799,7 @@ 
 		$environments->getConfig()->removeComponentsByType('GridFieldAddExistingAutocompleter');
 		$environments->getConfig()->removeComponentsByType('GridFieldDeleteAction');
 		$environments->getConfig()->removeComponentsByType('GridFieldPageCount');
-		if(Config::inst()->get('DNEnvironment', 'allow_web_editing')) {
+		if (Config::inst()->get('DNEnvironment', 'allow_web_editing')) {
 			$addNewRelease = new GridFieldAddNewButton('toolbar-header-right');
 			$addNewRelease->setButtonName('Add');
 			$environments->getConfig()->addComponent($addNewRelease);
@@ -815,7 +815,7 @@ 
 	 */
 	public function getRepositoryURL() {
 		$showUrl = Config::inst()->get($this->class, 'show_repository_url');
-		if($showUrl) {
+		if ($showUrl) {
 			return $this->CVSPath;
 		}
 	}
@@ -867,9 +867,9 @@ 
 		$interfaces = $this->config()->repository_interfaces;
 
 		/* Look for each whitelisted hostname */
-		foreach($interfaces as $host => $interface) {
+		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];
 
@@ -879,13 +879,13 @@ 
 
 				$components = explode('.', $host);
 
-				foreach($regex as $pattern => $replacement) {
-					$path = preg_replace('/' . $pattern . '/', $replacement, $path);
+				foreach ($regex as $pattern => $replacement) {
+					$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) {
+				if (array_key_exists('commit', $interface) && $interface['commit'] == false) {
 					$commiturl = false;
 				} else {
 					$commiturl = Controller::join_links(
@@ -929,7 +929,7 @@ 
 	 * @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);
@@ -968,11 +968,11 @@ 
 	 */
 	public function groupAllowed($permissionCode, Group $group) {
 		$viewers = $this->Viewers();
-		if(!$viewers->find('ID', $group->ID)) {
+		if (!$viewers->find('ID', $group->ID)) {
 			return false;
 		}
 		$groups = Permission::get_groups_by_permission($permissionCode);
-		if(!$groups->find('ID', $group->ID)) {
+		if (!$groups->find('ID', $group->ID)) {
 			return false;
 		}
 		return true;
@@ -991,10 +991,10 @@ 
 			$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);
+		return ($hits > 0 ? true : false);
 	}
 
 	/**
@@ -1003,7 +1003,7 @@ 
 	 * @return bool
 	 */
 	public function isProjectReady() {
-		if($this->getRunningInitialEnvironmentCreations()->count() > 0) {
+		if ($this->getRunningInitialEnvironmentCreations()->count() > 0) {
 			// We're still creating the initial environments for this project so we're
 			// not quite done
 			return false;
@@ -1012,13 +1012,13 @@ 
 		// Provide a hook for further checks. Logic stolen from
 		// {@see DataObject::extendedCan()}
 		$isDone = $this->extend('isProjectReady');
-		if($isDone && is_array($isDone)) {
+		if ($isDone && is_array($isDone)) {
 			$isDone = array_filter($isDone, function($val) {
 				return !is_null($val);
 			});
 
 			// If anything returns false then we're not ready.
-			if($isDone) return min($isDone);
+			if ($isDone) return min($isDone);
 		}
 
 		return true;
@@ -1068,25 +1068,25 @@ 
 	 */
 	protected function validate() {
 		$validation = parent::validate();
-		if($validation->valid()) {
-			if(empty($this->Name)) {
+		if ($validation->valid()) {
+			if (empty($this->Name)) {
 				return $validation->error('The stack must have a name.');
 			}
 
 			// The name is used to build filepaths so should be restricted
-			if(!preg_match('/^[a-zA-Z0-9][a-zA-Z0-9\-\_]+$/', $this->Name)) {
+			if (!preg_match('/^[a-zA-Z0-9][a-zA-Z0-9\-\_]+$/', $this->Name)) {
 				return $validation->error('Project name can only contain alphanumeric, hyphens and underscores.');
 			}
 
-			if(empty($this->CVSPath)) {
+			if (empty($this->CVSPath)) {
 				return $validation->error('You must provide a repository URL.');
 			}
 
 			$existing = DNProject::get()->filter('Name', $this->Name);
-			if($this->ID) {
+			if ($this->ID) {
 				$existing = $existing->exclude('ID', $this->ID);
 			}
-			if($existing->count() > 0) {
+			if ($existing->count() > 0) {
 				return $validation->error('A stack already exists with that name.');
 			}
 		}
@@ -1099,10 +1099,10 @@ 
 	 * @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')) {
+		if (Permission::checkMember($member, 'ADMIN')) {
 			return true;
 		}
 

code/control/Dispatcher.php

Spacing +1 added lines, -1 removed lines

@@ -144,7 +144,7 @@
 		$output['status_code'] = $statusCode;
 		$response = $this->getResponse();
 		$response->addHeader('Content-Type', 'application/json');
-		$response->setBody(json_encode($output, JSON_PRETTY_PRINT|JSON_NUMERIC_CHECK));
+		$response->setBody(json_encode($output, JSON_PRETTY_PRINT | JSON_NUMERIC_CHECK));
 		$response->setStatusCode($statusCode);
 		return $response;
 	}