silverstripe / deploynaut

code/control/DNDeploymentDispatcher.php

Unused Use Statements -2 removed lines

@@ -1,7 +1,5 @@
 <?php
 
-use Finite\StateMachine\StateMachine;
-
 class DNDeploymentDispatcher extends Dispatcher {
 
 	const ALLOW_DNDEPLOYMENT_APPROVE = 'ALLOW_DNDEPLOYMENT_APPROVE';

Switch Indentation +6 added lines, -6 removed lines

@@ -78,12 +78,12 @@
 				$code = null;
 
 				switch ($e->getTransition()->getName()) {
-				case 'approve':
-					$code = Dispatcher::ALLOW_DNDEPLOYMENT_APPROVE;
-					break;
-				case 'queue':
-					$code = Dispatcher::ALLOW_DNDEPLOYMENT_QUEUE;
-					break;
+					case 'approve':
+						$code = Dispatcher::ALLOW_DNDEPLOYMENT_APPROVE;
+						break;
+					case 'queue':
+						$code = Dispatcher::ALLOW_DNDEPLOYMENT_QUEUE;
+						break;
 				}
 
 				if (!$code || !$project->allowed($code)) {

Spacing +3 added lines, -3 removed lines

@@ -74,10 +74,10 @@ 
 		// Map authorisation rules to selected transitions.
 		$machine->getDispatcher()->addListener(
 			'finite.test_transition',
-			function (Finite\Event\TransitionEvent $e) use ($project) {
+			function(Finite\Event\TransitionEvent $e) use ($project) {
 				$code = null;
 
-				switch ($e->getTransition()->getName()) {
+				switch($e->getTransition()->getName()) {
 				case 'approve':
 					$code = Dispatcher::ALLOW_DNDEPLOYMENT_APPROVE;
 					break;
@@ -86,7 +86,7 @@ 
 					break;
 				}
 
-				if (!$code || !$project->allowed($code)) {
+				if(!$code || !$project->allowed($code)) {
 					$e->reject();
 				}
 			}

code/control/DNRoot.php

Spacing +25 added lines, -25 removed lines

@@ -175,8 +175,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');
@@ -239,7 +239,7 @@ 
 		}
 
 		// Block framework jquery
-		Requirements::block(FRAMEWORK_DIR . '/thirdparty/jquery/jquery.js');
+		Requirements::block(FRAMEWORK_DIR.'/thirdparty/jquery/jquery.js');
 
 		self::include_requirements();
 	}
@@ -258,7 +258,7 @@ 
 	 * @return \SS_HTTPResponse
 	 */
 	public function index(SS_HTTPRequest $request) {
-		return $this->redirect($this->Link() . 'projects/');
+		return $this->redirect($this->Link().'projects/');
 	}
 
 	/**
@@ -418,7 +418,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;
 	}
@@ -468,7 +468,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)));
@@ -568,7 +568,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;
 	}
@@ -707,7 +707,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(
@@ -843,7 +843,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;
 	}
@@ -876,7 +876,7 @@ 
 		$job->write();
 		$job->start();
 
-		return $this->redirect($project->Link('createenv') . '/' . $job->ID);
+		return $this->redirect($project->Link('createenv').'/'.$job->ID);
 	}
 
 	/**
@@ -937,7 +937,7 @@ 
 	 */
 	public function getPlatformSpecificStrings() {
 		$strings = $this->config()->platform_specific_strings;
-		if ($strings) {
+		if($strings) {
 			return new ArrayList($strings);
 		}
 	}
@@ -1002,7 +1002,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(
@@ -1072,7 +1072,7 @@ 
 			return $body;
 		}
 
-		$form->setFormAction($this->getRequest()->getURL() . '/DeployForm');
+		$form->setFormAction($this->getRequest()->getURL().'/DeployForm');
 		return $form;
 	}
 
@@ -1228,7 +1228,7 @@ 
 	}
 
 	protected function applyRedeploy(SS_HTTPRequest $request, &$data) {
-		if (!$request->getVar('redeploy')) return;
+		if(!$request->getVar('redeploy')) return;
 
 		$project = $this->getCurrentProject();
 		if(!$project) {
@@ -1242,12 +1242,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();
 			}
@@ -1378,7 +1378,7 @@ 
 		$deployment->getMachine()->apply('queue');
 
 		return json_encode(array(
-			'url' => Director::absoluteBaseURL() . $deployment->Link()
+			'url' => Director::absoluteBaseURL().$deployment->Link()
 		), JSON_PRETTY_PRINT);
 	}
 
@@ -1482,7 +1482,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));
 		}
 
@@ -1520,7 +1520,7 @@ 
 					->addExtraClass('btn')
 			)
 		);
-		$form->setFormAction($this->getRequest()->getURL() . '/DataTransferForm');
+		$form->setFormAction($this->getRequest()->getURL().'/DataTransferForm');
 
 		return $form;
 	}
@@ -1722,7 +1722,7 @@ 
 					->addExtraClass('btn')
 			)
 		);
-		$form->setFormAction($project->Link() . '/DataTransferRestoreForm');
+		$form->setFormAction($project->Link().'/DataTransferRestoreForm');
 
 		return $form;
 	}
@@ -1820,7 +1820,7 @@ 
 					->addExtraClass('btn')
 			)
 		);
-		$form->setFormAction($project->Link() . '/DeleteForm');
+		$form->setFormAction($project->Link().'/DeleteForm');
 
 		return $form;
 	}
@@ -1926,7 +1926,7 @@ 
 					->addExtraClass('btn')
 			)
 		);
-		$form->setFormAction($this->getCurrentProject()->Link() . '/MoveForm');
+		$form->setFormAction($this->getCurrentProject()->Link().'/MoveForm');
 
 		return $form;
 	}
@@ -2219,7 +2219,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
 		);
 	}
@@ -2229,7 +2229,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);
 	}
 
 	/**
@@ -2296,7 +2296,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/jobs/DNDeployment.php

Indentation +5 added lines, -5 removed lines

@@ -53,13 +53,13 @@
 	);
 
 	public function getFiniteState() {
-        return $this->State;
-    }
+		return $this->State;
+	}
 
-    public function setFiniteState($state) {
-        $this->State = $state;
+	public function setFiniteState($state) {
+		$this->State = $state;
 		$this->write();
-    }
+	}
 
 	public function getStatus() {
 		return $this->State;

Spacing +9 added lines, -9 removed lines

@@ -81,12 +81,12 @@ 
 			'transitions' => [
 				'approve'  => ['from' => ['New'], 'to' => 'Approved'],
 				'queue'  => ['from' => ['Approved'], 'to' => 'Queued'],
-				'invalidate'  => ['from' => ['New','Approved'], 'to' => 'Invalid'],
+				'invalidate'  => ['from' => ['New', 'Approved'], 'to' => 'Invalid'],
 				'deploy'  => ['from' => ['Queued'], 'to' => 'Deploying'],
-				'abort'  => ['from' => ['Queued', 'Deploying','Aborting'], 'to' => 'Aborting'],
+				'abort'  => ['from' => ['Queued', 'Deploying', 'Aborting'], 'to' => 'Aborting'],
 				'complete' => ['from' => ['Deploying'], 'to' => 'Completed'],
 				'fail'  => [
-					'from' => ['New','Approved','Queued','Invalid','Deploying','Aborting'],
+					'from' => ['New', 'Approved', 'Queued', 'Invalid', 'Deploying', 'Aborting'],
 					'to' => 'Failed'
 				],
 			],
@@ -124,7 +124,7 @@ 
 	}
 
 	public function LogLink() {
-		return $this->Link() . '/log';
+		return $this->Link().'/log';
 	}
 
 	public function canView($member = null) {
@@ -243,12 +243,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(
@@ -259,7 +259,7 @@ 
 			];
 		}
 
-		if (empty($messages)) {
+		if(empty($messages)) {
 			$messages[] = [
 				'Flag' => '',
 				'Text' => '<i>Environment changes have been made.</i>'
@@ -308,7 +308,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'] : '';
 			}