silverstripe / deploynaut

code/jobs/CreateEnvJob.php

Spacing +3 added lines, -3 removed lines

@@ -19,7 +19,7 @@ 
 	 *
 	 */
 	public function perform() {
-		echo "[-] CreateEnvJob starting" . PHP_EOL;
+		echo "[-] CreateEnvJob starting".PHP_EOL;
 		// This is a bit icky, but there is no easy way of capturing a failed deploy by using the PHP Resque
 		try {
 			$envCreate = DNCreateEnvironment::get()->byId($this->args['createID']);
@@ -31,11 +31,11 @@ 
 			$envCreate->createEnvironment();
 
 		} catch(Exception $e) {
-			echo "[-] CreateEnvJob failed" . PHP_EOL;
+			echo "[-] CreateEnvJob failed".PHP_EOL;
 			throw $e;
 		}
 		$this->updateStatus('Finished');
-		echo "[-] CreateEnvJob finished" . PHP_EOL;
+		echo "[-] CreateEnvJob finished".PHP_EOL;
 	}
 
 	/**

code/model/DNData.php

Spacing +8 added lines, -8 removed lines

@@ -89,7 +89,7 @@ 
 	 */
 	public function setEnvironmentDir($environmentDir) {
 		if($environmentDir[0] != "/") {
-			$environmentDir = BASE_PATH . '/' . $environmentDir;
+			$environmentDir = BASE_PATH.'/'.$environmentDir;
 		}
 		$this->environmentDir = realpath($environmentDir) ?: $environmentDir;
 	}
@@ -110,7 +110,7 @@ 
 	 */
 	public function setKeyDir($keyDir) {
 		if($keyDir[0] != "/") {
-			$keyDir = BASE_PATH . '/' . $keyDir;
+			$keyDir = BASE_PATH.'/'.$keyDir;
 		}
 		$this->keyDir = realpath($keyDir) ?: $keyDir;
 	}
@@ -127,7 +127,7 @@ 
 	 */
 	public function setSignalDir($signalDir) {
 		if($signalDir[0] != "/") {
-			$signalDir = BASE_PATH . '/' . $signalDir;
+			$signalDir = BASE_PATH.'/'.$signalDir;
 		}
 		$this->signalDir = realpath($signalDir) ?: $signalDir;
 	}
@@ -169,7 +169,7 @@ 
 	 */
 	public function setDataTransferDir($transferDir) {
 		if($transferDir[0] != "/") {
-			$transferDir = BASE_PATH . '/' . $transferDir;
+			$transferDir = BASE_PATH.'/'.$transferDir;
 		}
 		if(strpos($transferDir, ASSETS_PATH) === false) {
 			throw new LogicException(sprintf(
@@ -199,14 +199,14 @@ 
 	public function getProjectPaths() {
 		$paths = array();
 		if(!file_exists($this->getEnvironmentDir())) {
-			$eMessage = 'The environment directory ' . $this->getEnvironmentDir() . ' doesn\'t exist. Create it '
+			$eMessage = 'The environment directory '.$this->getEnvironmentDir().' doesn\'t exist. Create it '
 			. 'first and add some projects to it.';
 			throw new Exception($eMessage);
 		}
 		foreach(scandir($this->getEnvironmentDir()) as $project) {
 			// Exlcude dot-prefixed directories (.git was getting in the way)
 			if(preg_match('/^[^\.]/', $project)) {
-				$path = $this->getEnvironmentDir() . '/' . $project;
+				$path = $this->getEnvironmentDir().'/'.$project;
 				if(is_dir($path) && $project != '.' && $project != '..') {
 					$paths[] = $project;
 				}
@@ -221,11 +221,11 @@ 
 	 * Returns an array of paths
 	 */
 	public function getEnvironmentPaths($project) {
-		$baseDir = $this->getEnvironmentDir() . '/' . $project;
+		$baseDir = $this->getEnvironmentDir().'/'.$project;
 
 		$paths = array();
 		if(!file_exists($baseDir)) {
-			throw new Exception('Environment directory ' . $baseDir . ' doesn\'t exist. Create it first.');
+			throw new Exception('Environment directory '.$baseDir.' doesn\'t exist. Create it first.');
 		}
 		// Search the directory for config files.
 		foreach(scandir($baseDir) as $environmentFile) {

code/control/DeployForm.php

Spacing +2 added lines, -2 removed lines

@@ -73,7 +73,7 @@ 
 				substr($sha, 0, 8),
 				$branch->LastUpdated()->TimeDiff()
 			);
-			$branches[$sha . '-' . $name] = $branchValue;
+			$branches[$sha.'-'.$name] = $branchValue;
 		}
 
 		// Tags
@@ -86,7 +86,7 @@ 
 				substr($sha, 0, 8),
 				$branch->LastUpdated()->TimeDiff()
 			);
-			$tags[$sha . '-' . $tag] = $tagValue;
+			$tags[$sha.'-'.$tag] = $tagValue;
 		}
 		$tags = array_reverse($tags);
 

code/control/DNDeploymentDispatcher.php

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();
 				}
 			}

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(

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/model/jobs/DNDeployment.php

Spacing +7 added lines, -7 removed lines

@@ -100,7 +100,7 @@ 
 	}
 
 	public function LogLink() {
-		return $this->Link() . '/log';
+		return $this->Link().'/log';
 	}
 
 	public function canView($member = null) {
@@ -219,12 +219,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(
@@ -235,7 +235,7 @@ 
 			];
 		}
 
-		if (empty($messages)) {
+		if(empty($messages)) {
 			$messages[] = [
 				'Flag' => '',
 				'Text' => '<i>Environment changes have been made.</i>'
@@ -284,7 +284,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'] : '';
 			}
 
@@ -348,7 +348,7 @@ 
 
 	public function getSigFile() {
 		$dir = DNData::inst()->getSignalDir();
-		if (!is_dir($dir)) {
+		if(!is_dir($dir)) {
 			`mkdir $dir`;
 		}
 		return sprintf(

code/backends/SimplePackageGenerator.php

Spacing +4 added lines, -4 removed lines

@@ -30,7 +30,7 @@ 
 	 * Generate the package
 	 */
 	public function generatePackage($sha, $baseDir, $outputFilename, DeploynautLogFile $log) {
-		$tempPath = TEMP_FOLDER . "/" . str_replace(".tar.gz", "", basename($outputFilename));
+		$tempPath = TEMP_FOLDER."/".str_replace(".tar.gz", "", basename($outputFilename));
 		if(!file_exists($tempPath)) {
 			mkdir($tempPath);
 		}
@@ -42,17 +42,17 @@ 
 		// Execute these in sequence until there's a failure
 		$processes = array(
 			// Export the relevant SHA into a temp folder
-			new AbortableProcess("git archive $sha | tar -x -C " . $escapedTempPath, $baseDir),
+			new AbortableProcess("git archive $sha | tar -x -C ".$escapedTempPath, $baseDir),
 			// Run build script
 			new AbortableProcess($this->buildScript, $tempPath, null, null, 3600),
 			// Compress the result
-			new AbortableProcess("tar -czf " . $escapedOutputFile . " " . $escapedTempDir, dirname($tempPath)),
+			new AbortableProcess("tar -czf ".$escapedOutputFile." ".$escapedTempDir, dirname($tempPath)),
 		);
 
 		// Call at the end, regardless of success or failure
 		$cleanup = array(
 			// Delete the temporary staging folder
-			new AbortableProcess("rm -rf " . $escapedTempPath),
+			new AbortableProcess("rm -rf ".$escapedTempPath),
 		);
 
 		try {