silverstripe / deploynaut

code/control/DNRoot.php

Spacing +24 added lines, -24 removed lines

@@ -187,8 +187,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');
@@ -251,7 +251,7 @@ 
 		}
 
 		// Block framework jquery
-		Requirements::block(FRAMEWORK_DIR . '/thirdparty/jquery/jquery.js');
+		Requirements::block(FRAMEWORK_DIR.'/thirdparty/jquery/jquery.js');
 
 		self::include_requirements();
 	}
@@ -270,7 +270,7 @@ 
 	 * @return \SS_HTTPResponse
 	 */
 	public function index(SS_HTTPRequest $request) {
-		return $this->redirect($this->Link() . 'projects/');
+		return $this->redirect($this->Link().'projects/');
 	}
 
 	/**
@@ -430,7 +430,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;
 	}
@@ -480,7 +480,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 Process(sprintf('rm -rf %s', escapeshellarg($workingDir)));
@@ -580,7 +580,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;
 	}
@@ -719,7 +719,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(
@@ -952,7 +952,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;
 	}
@@ -985,7 +985,7 @@ 
 		$job->write();
 		$job->start();
 
-		return $this->redirect($project->Link('createenv') . '/' . $job->ID);
+		return $this->redirect($project->Link('createenv').'/'.$job->ID);
 	}
 
 	/**
@@ -1046,7 +1046,7 @@ 
 	 */
 	public function getPlatformSpecificStrings() {
 		$strings = $this->config()->platform_specific_strings;
-		if ($strings) {
+		if($strings) {
 			return new ArrayList($strings);
 		}
 	}
@@ -1111,7 +1111,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(
@@ -1181,7 +1181,7 @@ 
 			return $body;
 		}
 
-		$form->setFormAction($this->getRequest()->getURL() . '/DeployForm');
+		$form->setFormAction($this->getRequest()->getURL().'/DeployForm');
 		return $form;
 	}
 
@@ -1337,7 +1337,7 @@ 
 	}
 
 	protected function applyRedeploy(SS_HTTPRequest $request, &$data) {
-		if (!$request->getVar('redeploy')) return;
+		if(!$request->getVar('redeploy')) return;
 
 		$project = $this->getCurrentProject();
 		if(!$project) {
@@ -1351,12 +1351,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();
 			}
@@ -1483,7 +1483,7 @@ 
 		$deployment->start();
 
 		return json_encode(array(
-			'url' => Director::absoluteBaseURL() . $deployment->Link()
+			'url' => Director::absoluteBaseURL().$deployment->Link()
 		), JSON_PRETTY_PRINT);
 	}
 
@@ -1590,7 +1590,7 @@ 
 					->addExtraClass('btn')
 			)
 		);
-		$form->setFormAction($this->getRequest()->getURL() . '/DataTransferForm');
+		$form->setFormAction($this->getRequest()->getURL().'/DataTransferForm');
 
 		return $form;
 	}
@@ -1792,7 +1792,7 @@ 
 					->addExtraClass('btn')
 			)
 		);
-		$form->setFormAction($project->Link() . '/DataTransferRestoreForm');
+		$form->setFormAction($project->Link().'/DataTransferRestoreForm');
 
 		return $form;
 	}
@@ -1890,7 +1890,7 @@ 
 					->addExtraClass('btn')
 			)
 		);
-		$form->setFormAction($project->Link() . '/DeleteForm');
+		$form->setFormAction($project->Link().'/DeleteForm');
 
 		return $form;
 	}
@@ -1996,7 +1996,7 @@ 
 					->addExtraClass('btn')
 			)
 		);
-		$form->setFormAction($this->getCurrentProject()->Link() . '/MoveForm');
+		$form->setFormAction($this->getCurrentProject()->Link().'/MoveForm');
 
 		return $form;
 	}
@@ -2299,7 +2299,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
 		);
 	}
@@ -2309,7 +2309,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);
 	}
 
 	/**
@@ -2376,7 +2376,7 @@ 
 	public function AmbientMenu() {
 		$list = new ArrayList();
 
-		if (Member::currentUserID()) {
+		if(Member::currentUserID()) {
 			$list->push(new ArrayData(array(
 				'Classes' => 'logout',
 				'FaIcon' => 'sign-out',

Braces +12 added lines, -4 removed lines

@@ -934,7 +934,9 @@ 
 		}
 
 		$fields = $backend->getCreateEnvironmentFields($project);
-		if(!$fields) return null;
+		if(!$fields) {
+			return null;
+		}
 
 		if(!$project->canCreateEnvironments()) {
 			return new SS_HTTPResponse('Not allowed to create environments for this project', 401);
@@ -1337,7 +1339,9 @@ 
 	}
 
 	protected function applyRedeploy(SS_HTTPRequest $request, &$data) {
-		if (!$request->getVar('redeploy')) return;
+		if (!$request->getVar('redeploy')) {
+			return;
+		}
 
 		$project = $this->getCurrentProject();
 		if(!$project) {
@@ -2397,8 +2401,12 @@ 
 	 * @return bool
 	 */
 	public function canCreateProjects($member = null) {
-		if(!$member) $member = Member::currentUser();
-		if(!$member) return false;
+		if(!$member) {
+			$member = Member::currentUser();
+		}
+		if(!$member) {
+			return false;
+		}
 
 		return singleton('DNProject')->canCreate($member);
 	}