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';

Spacing +9 added lines, -9 removed lines

@@ -19,7 +19,7 @@ 
 
 	public function getModel($name) {
 		$deployment = $this->getDeployment();
-		if (!$deployment) {
+		if(!$deployment) {
 			return [];
 		}
 
@@ -31,7 +31,7 @@ 
 	public function getDeployment() {
 		$id = $this->request->param('Id');
 		$deployment = DNDeployment::get()->byId($id);
-		if (!$deployment || !$deployment->exists()) {
+		if(!$deployment || !$deployment->exists()) {
 			return false;
 		}
 		return $deployment;
@@ -40,7 +40,7 @@ 
 	public function apply(SS_HTTPRequest $request) {
 		$this->checkSecurityToken();
 		$response = $this->checkRequest();
-		if ($response instanceof SS_HTTPResponse) {
+		if($response instanceof SS_HTTPResponse) {
 			return $response;
 		}
 
@@ -54,7 +54,7 @@ 
 	public function canApply(SS_HTTPRequest $request) {
 		$this->checkSecurityToken();
 		$response = $this->checkRequest();
-		if ($response instanceof SS_HTTPResponse) {
+		if($response instanceof SS_HTTPResponse) {
 			return $response;
 		}
 
@@ -75,7 +75,7 @@ 
 		}
 
 		$deployment = $this->getDeployment();
-		if (!$deployment) {
+		if(!$deployment) {
 			return new SS_HTTPResponse('Deployment not found', 404);
 		}
 
@@ -84,7 +84,7 @@ 
 
 	protected function getMachine() {
 		$deployment = $this->getDeployment();
-		if (!$deployment) {
+		if(!$deployment) {
 			return null;
 		}
 
@@ -96,10 +96,10 @@ 
 			// It gives a chance to perform a dry-run, and reject the transition, for example
 			// in case the user is unauthorised.
 			'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 = self::ALLOW_DNDEPLOYMENT_APPROVE;
 					break;
@@ -108,7 +108,7 @@ 
 					break;
 				}
 
-				if (!$code || !$project->allowed($code)) {
+				if(!$code || !$project->allowed($code)) {
 					$e->reject();
 				}
 			}

Switch Indentation +6 added lines, -6 removed lines

@@ -100,12 +100,12 @@
 				$code = null;
 
 				switch ($e->getTransition()->getName()) {
-				case DNDeployment::TR_SUBMIT:
-					$code = self::ALLOW_DNDEPLOYMENT_SUBMIT;
-					break;
-				case DNDeployment::TR_QUEUE:
-					$code = self::ALLOW_DNDEPLOYMENT_QUEUE;
-					break;
+					case DNDeployment::TR_SUBMIT:
+						$code = self::ALLOW_DNDEPLOYMENT_SUBMIT;
+						break;
+					case DNDeployment::TR_QUEUE:
+						$code = self::ALLOW_DNDEPLOYMENT_QUEUE;
+						break;
 				}
 
 				if (!$code || !$project->allowed($code)) {

code/model/StateMachineFactory.php

Spacing +5 added lines, -5 removed lines

@@ -58,17 +58,17 @@
 
 	protected function addHandlers($machine) {
 		$class = get_class($machine->getObject());
-		if (empty($this->config()->handlers[$class])) return;
+		if(empty($this->config()->handlers[$class])) return;
 
 		$transitions = $this->config()->handlers[$class];
-		foreach ($transitions as $transName => $handlers) {
-			if (!is_array($handlers)) {
+		foreach($transitions as $transName => $handlers) {
+			if(!is_array($handlers)) {
 				throw new Exception(sprintf('Transition %s must be configured as an assoc array.', $transName));
 			}
 
-			foreach ($handlers as $handlerClass => $handlerMethod) {
+			foreach($handlers as $handlerClass => $handlerMethod) {
 				$handlerObj = Injector::inst()->get($handlerClass);
-				if (!is_callable([$handlerObj, $handlerMethod])) {
+				if(!is_callable([$handlerObj, $handlerMethod])) {
 					throw new Exception(sprintf('Handler %s is not callable on %s.', $handlerMethod, $handlerClass));
 				}
 				$machine->getDispatcher()->addListener(

Braces +3 added lines, -1 removed lines

@@ -58,7 +58,9 @@
 
 	protected function addHandlers($machine) {
 		$class = get_class($machine->getObject());
-		if (empty($this->config()->handlers[$class])) return;
+		if (empty($this->config()->handlers[$class])) {
+			return;
+		}
 
 		$transitions = $this->config()->handlers[$class];
 		foreach ($transitions as $transName => $handlers) {

code/control/DNDeploymentHandlers.php

Spacing +1 added lines, -1 removed lines

@@ -12,7 +12,7 @@
 	protected function sendEmailToApprover(DNDeployment $deployment) {
 		$deployer = $deployment->Deployer();
 		$approver = $deployment->Approver();
-		if (!$approver || !$approver->exists()) {
+		if(!$approver || !$approver->exists()) {
 			return false;
 		}
 

code/tasks/MigrateDeploymentStatusTask.php

Spacing +7 added lines, -7 removed lines

@@ -4,28 +4,28 @@
 
 	public function run($request) {
 		$log = function($message) {
-			$message = sprintf('[%s] ', date('Y-m-d H:i:s')) . $message;
-			echo $message . PHP_EOL;
+			$message = sprintf('[%s] ', date('Y-m-d H:i:s')).$message;
+			echo $message.PHP_EOL;
 		};
 
-		if (!Director::is_cli()) {
+		if(!Director::is_cli()) {
 			$log('This command can only run via CLI');
 			return;
 		}
 
 		$columns = DB::query('SHOW COLUMNS FROM "DNDeployment"')->column();
-		if (!in_array('Status', $columns)) {
+		if(!in_array('Status', $columns)) {
 			$log('Migration has already been run');
 			return;
 		}
 
-		foreach (DB::query('SELECT "ID", "Status" FROM "DNDeployment"') as $record) {
+		foreach(DB::query('SELECT "ID", "Status" FROM "DNDeployment"') as $record) {
 			// This record looks to be already migrated
-			if (empty($record['Status'])) {
+			if(empty($record['Status'])) {
 				continue;
 			}
 
-			switch ($record['Status']) {
+			switch($record['Status']) {
 				case 'Queued':
 					DB::query(sprintf('UPDATE "DNDeployment" SET "State" = \'Queued\' WHERE "ID" = %s', $record['ID']));
 					break;

code/jobs/DeployJob.php

Spacing +10 added lines, -10 removed lines

@@ -17,9 +17,9 @@ 
 	 */
 	public function alarmHandler() {
 		$sigFile = $this->args['sigFile'];
-		if (file_exists($sigFile) && is_readable($sigFile) && is_writable($sigFile)) {
+		if(file_exists($sigFile) && is_readable($sigFile) && is_writable($sigFile)) {
 			$signal = (int)file_get_contents($sigFile);
-			if (is_int($signal) && in_array((int)$signal, [
+			if(is_int($signal) && in_array((int)$signal, [
 				// The following signals are trapped by both Resque and Rainforest.
 				SIGTERM,
 				SIGINT,
@@ -30,7 +30,7 @@ 
 				SIGCONT
 			])) {
 				echo sprintf(
-					'[-] Signal "%s" received, delivering to own process group, PID "%s".' . PHP_EOL,
+					'[-] Signal "%s" received, delivering to own process group, PID "%s".'.PHP_EOL,
 					$signal,
 					getmypid()
 				);
@@ -40,9 +40,9 @@ 
 
 				// Dispatch to own process group.
 				$pgid = posix_getpgid(getmypid());
-				if ($pgid<=0) {
+				if($pgid <= 0) {
 					echo sprintf(
-						'[-] Unable to send signal to invalid PGID "%s".' . PHP_EOL,
+						'[-] Unable to send signal to invalid PGID "%s".'.PHP_EOL,
 						$pgid
 					);
 				} else {
@@ -61,8 +61,8 @@ 
 		posix_setsid();
 
 		if(function_exists('pcntl_alarm') && function_exists('pcntl_signal')) {
-			if (!empty($this->args['sigFile'])) {
-				echo sprintf('[-] Signal file requested, polling "%s".' . PHP_EOL, $this->args['sigFile']);
+			if(!empty($this->args['sigFile'])) {
+				echo sprintf('[-] Signal file requested, polling "%s".'.PHP_EOL, $this->args['sigFile']);
 				declare(ticks = 1);
 				pcntl_signal(SIGALRM, [$this, 'alarmHandler']);
 				pcntl_alarm(1);
@@ -74,7 +74,7 @@ 
 	}
 
 	public function perform() {
-		echo "[-] DeployJob starting" . PHP_EOL;
+		echo "[-] DeployJob starting".PHP_EOL;
 		$log = new DeploynautLogFile($this->args['logfile']);
 
 		$deployment = DNDeployment::get()->byID($this->args['deploymentID']);
@@ -109,11 +109,11 @@ 
 			);
 		} 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) {