Inspection of "Default predeploy backup option to production envs..." - silverstripe/deploynaut - Measure and Improve Code Quality continuously with Scrutinizer

Completed

Pull Request — master (#610)

by Sean

created 2016-08-28 04:46 UTC

Status

Spacing +26 added lines, -26 removed lines patch added patch discarded remove patch

@@ -174,8 +174,8 @@  discard block
 block discarded – undo
 		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 @@  discard block
 block discarded – undo
 		}
 
 		// 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 @@  discard block
 block discarded – undo
 	 * @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 @@  discard block
 block discarded – undo
 		$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 @@  discard block
 block discarded – undo
 		$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 @@  discard block
 block discarded – undo
 		$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 @@  discard block
 block discarded – undo
 		$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 @@  discard block
 block discarded – undo
 		);
 
 		// 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 @@  discard block
 block discarded – undo
 		$job->write();
 		$job->start();
 
-		return $this->redirect($project->Link('createenv') . '/' . $job->ID);
+		return $this->redirect($project->Link('createenv').'/'.$job->ID);
 	}
 
 	/**
@@ -938,7 +938,7 @@  discard block
 block discarded – undo
 	 */
 	public function getPlatformSpecificStrings() {
 		$strings = $this->config()->platform_specific_strings;
-		if ($strings) {
+		if($strings) {
 			return new ArrayList($strings);
 		}
 	}
@@ -1003,7 +1003,7 @@  discard block
 block discarded – undo
 
 				$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 @@  discard block
 block discarded – undo
 			return $body;
 		}
 
-		$form->setFormAction($this->getRequest()->getURL() . '/DeployForm');
+		$form->setFormAction($this->getRequest()->getURL().'/DeployForm');
 		return $form;
 	}
 
@@ -1097,7 +1097,7 @@  discard block
 block discarded – undo
 		}
 
 		$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 @@  discard block
 block discarded – undo
 	}
 
 	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 @@  discard block
 block discarded – undo
 		}
 
 		$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 @@  discard block
 block discarded – undo
 		$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 @@  discard block
 block discarded – undo
 			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 @@  discard block
 block discarded – undo
 					->addExtraClass('btn')
 			)
 		);
-		$form->setFormAction($this->getRequest()->getURL() . '/DataTransferForm');
+		$form->setFormAction($this->getRequest()->getURL().'/DataTransferForm');
 
 		return $form;
 	}
@@ -1724,7 +1724,7 @@  discard block
 block discarded – undo
 					->addExtraClass('btn')
 			)
 		);
-		$form->setFormAction($project->Link() . '/DataTransferRestoreForm');
+		$form->setFormAction($project->Link().'/DataTransferRestoreForm');
 
 		return $form;
 	}
@@ -1822,7 +1822,7 @@  discard block
 block discarded – undo
 					->addExtraClass('btn')
 			)
 		);
-		$form->setFormAction($project->Link() . '/DeleteForm');
+		$form->setFormAction($project->Link().'/DeleteForm');
 
 		return $form;
 	}
@@ -1928,7 +1928,7 @@  discard block
 block discarded – undo
 					->addExtraClass('btn')
 			)
 		);
-		$form->setFormAction($this->getCurrentProject()->Link() . '/MoveForm');
+		$form->setFormAction($this->getCurrentProject()->Link().'/MoveForm');
 
 		return $form;
 	}
@@ -2220,7 +2220,7 @@  discard block
 block discarded – undo
 	 */
 	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 @@  discard block
 block discarded – undo
 	 */
 	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 @@  discard block
 block discarded – undo
 	public function AmbientMenu() {
 		$list = new ArrayList();
 
-		if (Member::currentUserID()) {
+		if(Member::currentUserID()) {
 			$list->push(new ArrayData(array(
 				'Classes' => 'logout',
 				'FaIcon' => 'sign-out',

Please login to merge, or discard this patch.

code/model/DNEnvironment.php 1 patch

Spacing +25 added lines, -25 removed lines patch added patch discarded remove patch

@@ -311,10 +311,10 @@  discard block
 block discarded – undo
 		}
 		// 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 @@  discard block
 block discarded – undo
 		}
 		// 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 @@  discard block
 block discarded – undo
 			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 @@  discard block
 block discarded – undo
 		}
 		// 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 @@  discard block
 block discarded – undo
 		}
 		// 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 @@  discard block
 block discarded – undo
 		}
 		// 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)
@@ -657,7 +657,7 @@  discard block
 block discarded – undo
 	 * @return string
 	 */
 	public function Link() {
-		return $this->Project()->Link() . "/environment/" . $this->Name;
+		return $this->Project()->Link()."/environment/".$this->Name;
 	}
 
 	/**
@@ -802,7 +802,7 @@  discard block
 block discarded – undo
 				->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).'
 				),
 
@@ -849,7 +849,7 @@  discard block
 block discarded – undo
 		// 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');
 
@@ -886,8 +886,8 @@  discard block
 block discarded – undo
 	 */
 	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();
@@ -934,7 +934,7 @@  discard block
 block discarded – undo
 			&& $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);
@@ -989,7 +989,7 @@  discard block
 block discarded – undo
 		if(!$this->Filename) {
 			return '';
 		}
-		return $this->DNData()->getEnvironmentDir() . '/' . $this->Project()->Name . '/' . $this->Filename;
+		return $this->DNData()->getEnvironmentDir().'/'.$this->Project()->Name.'/'.$this->Filename;
 	}
 
 	/**

Please login to merge, or discard this patch.

		@@ -311,10 +311,10 @@ discard block
		block discarded – undo
311	311	}
312	312	// Must be logged in to check permissions
313	313
314		- if ($this->Usage === self::PRODUCTION \|\| $this->Usage === self::UNSPECIFIED) {
315		- if ($this->Project()->allowed(DNRoot::ALLOW_PROD_DEPLOYMENT, $member)) return true;
	314	+ if($this->Usage === self::PRODUCTION \|\| $this->Usage === self::UNSPECIFIED) {
	315	+ if($this->Project()->allowed(DNRoot::ALLOW_PROD_DEPLOYMENT, $member)) return true;
316	316	} else {
317		- if ($this->Project()->allowed(DNRoot::ALLOW_NON_PROD_DEPLOYMENT, $member)) return true;
	317	+ if($this->Project()->allowed(DNRoot::ALLOW_NON_PROD_DEPLOYMENT, $member)) return true;
318	318	}
319	319
320	320	return $this->Deployers()->byID($member->ID)
		@@ -346,10 +346,10 @@ discard block
		block discarded – undo
346	346	}
347	347	// Must be logged in to check permissions
348	348
349		- if ($this->Usage === self::PRODUCTION \|\| $this->Usage === self::UNSPECIFIED) {
350		- if ($this->Project()->allowed(DNRoot::ALLOW_PROD_SNAPSHOT, $member)) return true;
	349	+ if($this->Usage === self::PRODUCTION \|\| $this->Usage === self::UNSPECIFIED) {
	350	+ if($this->Project()->allowed(DNRoot::ALLOW_PROD_SNAPSHOT, $member)) return true;
351	351	} else {
352		- if ($this->Project()->allowed(DNRoot::ALLOW_NON_PROD_SNAPSHOT, $member)) return true;
	352	+ if($this->Project()->allowed(DNRoot::ALLOW_NON_PROD_SNAPSHOT, $member)) return true;
353	353	}
354	354
355	355	return $this->CanRestoreMembers()->byID($member->ID)
		@@ -377,10 +377,10 @@ discard block
		block discarded – undo
377	377	return false;
378	378	}
379	379
380		- if ($this->Usage === self::PRODUCTION \|\| $this->Usage === self::UNSPECIFIED) {
381		- if ($this->Project()->allowed(DNRoot::ALLOW_PROD_SNAPSHOT, $member)) return true;
	380	+ if($this->Usage === self::PRODUCTION \|\| $this->Usage === self::UNSPECIFIED) {
	381	+ if($this->Project()->allowed(DNRoot::ALLOW_PROD_SNAPSHOT, $member)) return true;
382	382	} else {
383		- if ($this->Project()->allowed(DNRoot::ALLOW_NON_PROD_SNAPSHOT, $member)) return true;
	383	+ if($this->Project()->allowed(DNRoot::ALLOW_NON_PROD_SNAPSHOT, $member)) return true;
384	384	}
385	385
386	386	return $this->CanBackupMembers()->byID($member->ID)
		@@ -412,10 +412,10 @@ discard block
		block discarded – undo
412	412	}
413	413	// Must be logged in to check permissions
414	414
415		- if ($this->Usage === self::PRODUCTION \|\| $this->Usage === self::UNSPECIFIED) {
416		- if ($this->Project()->allowed(DNRoot::ALLOW_PROD_SNAPSHOT, $member)) return true;
	415	+ if($this->Usage === self::PRODUCTION \|\| $this->Usage === self::UNSPECIFIED) {
	416	+ if($this->Project()->allowed(DNRoot::ALLOW_PROD_SNAPSHOT, $member)) return true;
417	417	} else {
418		- if ($this->Project()->allowed(DNRoot::ALLOW_NON_PROD_SNAPSHOT, $member)) return true;
	418	+ if($this->Project()->allowed(DNRoot::ALLOW_NON_PROD_SNAPSHOT, $member)) return true;
419	419	}
420	420
421	421	return $this->ArchiveUploaders()->byID($member->ID)
		@@ -438,10 +438,10 @@ discard block
		block discarded – undo
438	438	}
439	439	// Must be logged in to check permissions
440	440
441		- if ($this->Usage === self::PRODUCTION \|\| $this->Usage === self::UNSPECIFIED) {
442		- if ($this->Project()->allowed(DNRoot::ALLOW_PROD_SNAPSHOT, $member)) return true;
	441	+ if($this->Usage === self::PRODUCTION \|\| $this->Usage === self::UNSPECIFIED) {
	442	+ if($this->Project()->allowed(DNRoot::ALLOW_PROD_SNAPSHOT, $member)) return true;
443	443	} else {
444		- if ($this->Project()->allowed(DNRoot::ALLOW_NON_PROD_SNAPSHOT, $member)) return true;
	444	+ if($this->Project()->allowed(DNRoot::ALLOW_NON_PROD_SNAPSHOT, $member)) return true;
445	445	}
446	446
447	447	return $this->ArchiveDownloaders()->byID($member->ID)
		@@ -464,10 +464,10 @@ discard block
		block discarded – undo
464	464	}
465	465	// Must be logged in to check permissions
466	466
467		- if ($this->Usage === self::PRODUCTION \|\| $this->Usage === self::UNSPECIFIED) {
468		- if ($this->Project()->allowed(DNRoot::ALLOW_PROD_SNAPSHOT, $member)) return true;
	467	+ if($this->Usage === self::PRODUCTION \|\| $this->Usage === self::UNSPECIFIED) {
	468	+ if($this->Project()->allowed(DNRoot::ALLOW_PROD_SNAPSHOT, $member)) return true;
469	469	} else {
470		- if ($this->Project()->allowed(DNRoot::ALLOW_NON_PROD_SNAPSHOT, $member)) return true;
	470	+ if($this->Project()->allowed(DNRoot::ALLOW_NON_PROD_SNAPSHOT, $member)) return true;
471	471	}
472	472
473	473	return $this->ArchiveDeleters()->byID($member->ID)
		@@ -657,7 +657,7 @@ discard block
		block discarded – undo
657	657	* @return string
658	658	*/
659	659	public function Link() {
660		- return $this->Project()->Link() . "/environment/" . $this->Name;
	660	+ return $this->Project()->Link()."/environment/".$this->Name;
661	661	}
662	662
663	663	/**
		@@ -802,7 +802,7 @@ discard block
		block discarded – undo
802	802	->buildPermissionField('ArchiveUploaderGroups', 'ArchiveUploaders', $groups, $members)
803	803	->setTitle('Who can upload?')
804	804	->setDescription(
805		- 'Users who can upload archives linked to this environment into Deploynaut.<br />' .
	805	+ 'Users who can upload archives linked to this environment into Deploynaut.<br />'.
806	806	'Linking them to an environment allows limiting download permissions (see below).'
807	807	),
808	808
		@@ -849,7 +849,7 @@ discard block
		block discarded – undo
849	849	// Add actions
850	850	$action = new FormAction('check', 'Check Connection');
851	851	$action->setUseButtonTag(true);
852		- $dataURL = Director::absoluteBaseURL() . 'naut/api/' . $this->Project()->Name . '/' . $this->Name . '/ping';
	852	+ $dataURL = Director::absoluteBaseURL().'naut/api/'.$this->Project()->Name.'/'.$this->Name.'/ping';
853	853	$action->setAttribute('data-url', $dataURL);
854	854	$fields->insertBefore($action, 'Name');
855	855
		@@ -886,8 +886,8 @@ discard block
		block discarded – undo
886	886	*/
887	887	public function onBeforeWrite() {
888	888	parent::onBeforeWrite();
889		- if($this->Name && $this->Name . '.rb' != $this->Filename) {
890		- $this->Filename = $this->Name . '.rb';
	889	+ if($this->Name && $this->Name.'.rb' != $this->Filename) {
	890	+ $this->Filename = $this->Name.'.rb';
891	891	}
892	892	$this->checkEnvironmentPath();
893	893	$this->writeConfigFile();
		@@ -934,7 +934,7 @@ discard block
		block discarded – undo
934	934	&& $this->Filename
935	935	&& $this->CreateEnvConfig
936	936	) {
937		- $templateFile = $this->config()->template_file ?: BASE_PATH . '/deploynaut/environment.template';
	937	+ $templateFile = $this->config()->template_file ?: BASE_PATH.'/deploynaut/environment.template';
938	938	file_put_contents($this->getConfigFilename(), file_get_contents($templateFile));
939	939	} else if($this->envFileExists() && $this->DeployConfig) {
940	940	file_put_contents($this->getConfigFilename(), $this->DeployConfig);
		@@ -989,7 +989,7 @@ discard block
		block discarded – undo
989	989	if(!$this->Filename) {
990	990	return '';
991	991	}
992		- return $this->DNData()->getEnvironmentDir() . '/' . $this->Project()->Name . '/' . $this->Filename;
	992	+ return $this->DNData()->getEnvironmentDir().'/'.$this->Project()->Name.'/'.$this->Filename;
993	993	}
994	994
995	995	/**

		@@ -174,8 +174,8 @@ discard block
		block discarded – undo
174	174	Requirements::javascript('deploynaut/javascript/material.js');
175	175
176	176	// Load the buildable dependencies only if not loaded centrally.
177		- if (!is_dir(BASE_PATH . DIRECTORY_SEPARATOR . 'static')) {
178		- if (\Director::isDev()) {
	177	+ if(!is_dir(BASE_PATH.DIRECTORY_SEPARATOR.'static')) {
	178	+ if(\Director::isDev()) {
179	179	\Requirements::javascript('deploynaut/static/bundle-debug.js');
180	180	} else {
181	181	\Requirements::javascript('deploynaut/static/bundle.js');
		@@ -238,7 +238,7 @@ discard block
		block discarded – undo
238	238	}
239	239
240	240	// Block framework jquery
241		- Requirements::block(FRAMEWORK_DIR . '/thirdparty/jquery/jquery.js');
	241	+ Requirements::block(FRAMEWORK_DIR.'/thirdparty/jquery/jquery.js');
242	242
243	243	self::include_requirements();
244	244	}
		@@ -257,7 +257,7 @@ discard block
		block discarded – undo
257	257	* @return \SS_HTTPResponse
258	258	*/
259	259	public function index(SS_HTTPRequest $request) {
260		- return $this->redirect($this->Link() . 'projects/');
	260	+ return $this->redirect($this->Link().'projects/');
261	261	}
262	262
263	263	/**
		@@ -417,7 +417,7 @@ discard block
		block discarded – undo
417	417	$form->disableSecurityToken();
418	418	$form->addExtraClass('fields-wide');
419	419	// Tweak the action so it plays well with our fake URL structure.
420		- $form->setFormAction($project->Link() . '/UploadSnapshotForm');
	420	+ $form->setFormAction($project->Link().'/UploadSnapshotForm');
421	421
422	422	return $form;
423	423	}
		@@ -467,7 +467,7 @@ discard block
		block discarded – undo
467	467	$dataArchive->DataTransfers()->add($dataTransfer);
468	468	$form->saveInto($dataArchive);
469	469	$dataArchive->write();
470		- $workingDir = TEMP_FOLDER . DIRECTORY_SEPARATOR . 'deploynaut-transfer-' . $dataTransfer->ID;
	470	+ $workingDir = TEMP_FOLDER.DIRECTORY_SEPARATOR.'deploynaut-transfer-'.$dataTransfer->ID;
471	471
472	472	$cleanupFn = function() use($workingDir, $dataTransfer, $dataArchive) {
473	473	$process = new AbortableProcess(sprintf('rm -rf %s', escapeshellarg($workingDir)));
		@@ -569,7 +569,7 @@ discard block
		block discarded – undo
569	569	$form->disableSecurityToken();
570	570	$form->addExtraClass('fields-wide');
571	571	// Tweak the action so it plays well with our fake URL structure.
572		- $form->setFormAction($project->Link() . '/PostSnapshotForm');
	572	+ $form->setFormAction($project->Link().'/PostSnapshotForm');
573	573
574	574	return $form;
575	575	}
		@@ -708,7 +708,7 @@ discard block
		block discarded – undo
708	708	$branchName = $request->getVar('name');
709	709	$branch = $project->DNBranchList()->byName($branchName);
710	710	if(!$branch) {
711		- return new SS_HTTPResponse("Branch '" . Convert::raw2xml($branchName) . "' not found.", 404);
	711	+ return new SS_HTTPResponse("Branch '".Convert::raw2xml($branchName)."' not found.", 404);
712	712	}
713	713
714	714	return $this->render(array(
		@@ -844,7 +844,7 @@ discard block
		block discarded – undo
844	844	);
845	845
846	846	// Tweak the action so it plays well with our fake URL structure.
847		- $form->setFormAction($project->Link() . '/CreateEnvironmentForm');
	847	+ $form->setFormAction($project->Link().'/CreateEnvironmentForm');
848	848
849	849	return $form;
850	850	}
		@@ -877,7 +877,7 @@ discard block
		block discarded – undo
877	877	$job->write();
878	878	$job->start();
879	879
880		- return $this->redirect($project->Link('createenv') . '/' . $job->ID);
	880	+ return $this->redirect($project->Link('createenv').'/'.$job->ID);
881	881	}
882	882
883	883	/**
		@@ -938,7 +938,7 @@ discard block
		block discarded – undo
938	938	*/
939	939	public function getPlatformSpecificStrings() {
940	940	$strings = $this->config()->platform_specific_strings;
941		- if ($strings) {
	941	+ if($strings) {
942	942	return new ArrayList($strings);
943	943	}
944	944	}
		@@ -1003,7 +1003,7 @@ discard block
		block discarded – undo
1003	1003
1004	1004	$isCurrentEnvironment = false;
1005	1005	if($project && $currentEnvironment) {
1006		- $isCurrentEnvironment = (bool) $project->DNEnvironmentList()->find('ID', $currentEnvironment->ID);
	1006	+ $isCurrentEnvironment = (bool)$project->DNEnvironmentList()->find('ID', $currentEnvironment->ID);
1007	1007	}
1008	1008
1009	1009	$navigation->push(array(
		@@ -1073,7 +1073,7 @@ discard block
		block discarded – undo
1073	1073	return $body;
1074	1074	}
1075	1075
1076		- $form->setFormAction($this->getRequest()->getURL() . '/DeployForm');
	1076	+ $form->setFormAction($this->getRequest()->getURL().'/DeployForm');
1077	1077	return $form;
1078	1078	}
1079	1079
		@@ -1097,7 +1097,7 @@ discard block
		block discarded – undo
1097	1097	}
1098	1098
1099	1099	$options = [];
1100		- foreach ($env->Backend()->getDeployOptions($env) as $option) {
	1100	+ foreach($env->Backend()->getDeployOptions($env) as $option) {
1101	1101	$options[] = [
1102	1102	'name' => $option->getName(),
1103	1103	'title' => $option->getTitle(),
		@@ -1230,7 +1230,7 @@ discard block
		block discarded – undo
1230	1230	}
1231	1231
1232	1232	protected function applyRedeploy(SS_HTTPRequest $request, &$data) {
1233		- if (!$request->getVar('redeploy')) return;
	1233	+ if(!$request->getVar('redeploy')) return;
1234	1234
1235	1235	$project = $this->getCurrentProject();
1236	1236	if(!$project) {
		@@ -1244,12 +1244,12 @@ discard block
		block discarded – undo
1244	1244	}
1245	1245
1246	1246	$current = $env->CurrentBuild();
1247		- if ($current && $current->exists()) {
	1247	+ if($current && $current->exists()) {
1248	1248	$data['preselect_tab'] = 3;
1249	1249	$data['preselect_sha'] = $current->SHA;
1250	1250	} else {
1251	1251	$master = $project->DNBranchList()->byName('master');
1252		- if ($master) {
	1252	+ if($master) {
1253	1253	$data['preselect_tab'] = 1;
1254	1254	$data['preselect_sha'] = $master->SHA();
1255	1255	}
		@@ -1380,7 +1380,7 @@ discard block
		block discarded – undo
1380	1380	$deployment->getMachine()->apply(DNDeployment::TR_QUEUE);
1381	1381
1382	1382	return json_encode(array(
1383		- 'url' => Director::absoluteBaseURL() . $deployment->Link()
	1383	+ 'url' => Director::absoluteBaseURL().$deployment->Link()
1384	1384	), JSON_PRETTY_PRINT);
1385	1385	}
1386	1386
		@@ -1484,7 +1484,7 @@ discard block
		block discarded – undo
1484	1484	throw new LogicException("Project in URL doesn't match this deploy");
1485	1485	}
1486	1486
1487		- if (!in_array($deployment->Status, ['Queued', 'Deploying', 'Aborting'])) {
	1487	+ if(!in_array($deployment->Status, ['Queued', 'Deploying', 'Aborting'])) {
1488	1488	throw new LogicException(sprintf("Cannot abort from %s state.", $deployment->Status));
1489	1489	}
1490	1490
		@@ -1522,7 +1522,7 @@ discard block
		block discarded – undo
1522	1522	->addExtraClass('btn')
1523	1523	)
1524	1524	);
1525		- $form->setFormAction($this->getRequest()->getURL() . '/DataTransferForm');
	1525	+ $form->setFormAction($this->getRequest()->getURL().'/DataTransferForm');
1526	1526
1527	1527	return $form;
1528	1528	}
		@@ -1724,7 +1724,7 @@ discard block
		block discarded – undo
1724	1724	->addExtraClass('btn')
1725	1725	)
1726	1726	);
1727		- $form->setFormAction($project->Link() . '/DataTransferRestoreForm');
	1727	+ $form->setFormAction($project->Link().'/DataTransferRestoreForm');
1728	1728
1729	1729	return $form;
1730	1730	}
		@@ -1822,7 +1822,7 @@ discard block
		block discarded – undo
1822	1822	->addExtraClass('btn')
1823	1823	)
1824	1824	);
1825		- $form->setFormAction($project->Link() . '/DeleteForm');
	1825	+ $form->setFormAction($project->Link().'/DeleteForm');
1826	1826
1827	1827	return $form;
1828	1828	}
		@@ -1928,7 +1928,7 @@ discard block
		block discarded – undo
1928	1928	->addExtraClass('btn')
1929	1929	)
1930	1930	);
1931		- $form->setFormAction($this->getCurrentProject()->Link() . '/MoveForm');
	1931	+ $form->setFormAction($this->getCurrentProject()->Link().'/MoveForm');
1932	1932
1933	1933	return $form;
1934	1934	}
		@@ -2220,7 +2220,7 @@ discard block
		block discarded – undo
2220	2220	*/
2221	2221	protected function project404Response() {
2222	2222	return new SS_HTTPResponse(
2223		- "Project '" . Convert::raw2xml($this->getRequest()->param('Project')) . "' not found.",
	2223	+ "Project '".Convert::raw2xml($this->getRequest()->param('Project'))."' not found.",
2224	2224	404
2225	2225	);
2226	2226	}
		@@ -2230,7 +2230,7 @@ discard block
		block discarded – undo
2230	2230	*/
2231	2231	protected function environment404Response() {
2232	2232	$envName = Convert::raw2xml($this->getRequest()->param('Environment'));
2233		- return new SS_HTTPResponse("Environment '" . $envName . "' not found.", 404);
	2233	+ return new SS_HTTPResponse("Environment '".$envName."' not found.", 404);
2234	2234	}
2235	2235
2236	2236	/**
		@@ -2297,7 +2297,7 @@ discard block
		block discarded – undo
2297	2297	public function AmbientMenu() {
2298	2298	$list = new ArrayList();
2299	2299
2300		- if (Member::currentUserID()) {
	2300	+ if(Member::currentUserID()) {
2301	2301	$list->push(new ArrayData(array(
2302	2302	'Classes' => 'logout',
2303	2303	'FaIcon' => 'sign-out',

silverstripe / deploynaut

Pull Request — master (#610)

Status

Category

Spacing +26 added lines, -26 removed lines patch added patch discarded remove patch

Spacing +25 added lines, -25 removed lines patch added patch discarded remove patch