silverstripe / deploynaut

code/backends/DeploymentStrategy.php

Braces +6 added lines, -2 removed lines

@@ -110,8 +110,12 @@
 		// Normalise "empty" values into dashes so comparisons are done properly.
 		// This means there is no diference between an empty string and a null
 		// but "0" is considered to be non-empty.
-		if(empty($from) && !strlen($from)) $from = '-';
-		if(empty($to) && !strlen($to)) $to = '-';
+		if(empty($from) && !strlen($from)) {
+			$from = '-';
+		}
+		if(empty($to) && !strlen($to)) {
+			$to = '-';
+		}
 
 		return $this->changes[$title] = array(
 			'from' => $from,

Spacing +8 added lines, -8 removed lines

@@ -110,8 +110,8 @@ 
 		// Normalise "empty" values into dashes so comparisons are done properly.
 		// This means there is no diference between an empty string and a null
 		// but "0" is considered to be non-empty.
-		if(empty($from) && !strlen($from)) $from = '-';
-		if(empty($to) && !strlen($to)) $to = '-';
+		if (empty($from) && !strlen($from)) $from = '-';
+		if (empty($to) && !strlen($to)) $to = '-';
 
 		return $this->changes[$title] = array(
 			'from' => $from,
@@ -170,7 +170,7 @@ 
 	 */
 	public function getChange($key) {
 		$changes = $this->getChanges();
-		if(array_key_exists($key, $changes)) {
+		if (array_key_exists($key, $changes)) {
 			return new ArrayData($changes[$key]);
 		}
 		return null;
@@ -189,7 +189,7 @@ 
 	 * @return string|null
 	 */
 	public function getOption($option) {
-		if(!empty($this->options[$option])) {
+		if (!empty($this->options[$option])) {
 			return $this->options[$option];
 		}
 	}
@@ -230,7 +230,7 @@ 
 			DeploymentStrategy::WARNING_CODE => 1,
 			DeploymentStrategy::ERROR_CODE => 2
 		];
-		if($map[$current] < $map[$code]) {
+		if ($map[$current] < $map[$code]) {
 			$this->setValidationCode($code);
 		}
 	}
@@ -259,7 +259,7 @@ 
 		);
 
 		$output = array();
-		foreach($fields as $field) {
+		foreach ($fields as $field) {
 			$output[$field] = $this->$field;
 		}
 		return $output;
@@ -300,8 +300,8 @@ 
 			'messages'
 		);
 
-		foreach($fields as $field) {
-			if(!empty($data[$field])) {
+		foreach ($fields as $field) {
+			if (!empty($data[$field])) {
 				$this->$field = $data[$field];
 			}
 		}

code/jobs/PingJob.php

Spacing +1 added lines, -1 removed lines

@@ -31,7 +31,7 @@
 	 * Do the actual job by calling the appropiate backend
 	 */
 	public function perform() {
-		echo "[-] PingJob starting" . PHP_EOL;
+		echo "[-] PingJob starting".PHP_EOL;
 		$log = new DeploynautLogFile($this->args['logfile']);
 
 		$ping = DNPing::get()->byID($this->args['pingID']);

code/model/jobs/DNDeployment.php

Braces +6 added lines, -2 removed lines

@@ -205,12 +205,16 @@
 	 */
 	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;
+			if ($change==='Code version') {
+				continue;
+			}
 
 			$messages[] = [
 				'Flag' => sprintf(

Spacing +17 added lines, -17 removed lines

@@ -116,7 +116,7 @@ 
 	}
 
 	public function LogLink() {
-		return $this->Link() . '/log';
+		return $this->Link().'/log';
 	}
 
 	public function canView($member = null) {
@@ -162,7 +162,7 @@ 
 	 * @return \Gitonomy\Git\Repository|null
 	 */
 	public function getRepository() {
-		if(!$this->SHA) {
+		if (!$this->SHA) {
 			return null;
 		}
 		return $this->Environment()->Project()->getRepository();
@@ -175,10 +175,10 @@ 
 	 */
 	public function getCommit() {
 		$repo = $this->getRepository();
-		if($repo) {
+		if ($repo) {
 			try {
 				return $this->Environment()->getCommit($this->SHA);
-			} catch(Gitonomy\Git\Exception\ReferenceNotFoundException $ex) {
+			} catch (Gitonomy\Git\Exception\ReferenceNotFoundException $ex) {
 				return null;
 			}
 		}
@@ -203,7 +203,7 @@ 
 		if (!$interface) {
 			return null;
 		}
-		return $interface->CommitURL . '/' . $this->SHA;
+		return $interface->CommitURL.'/'.$this->SHA;
 	}
 
 	/**
@@ -213,10 +213,10 @@ 
 	 */
 	public function getCommitMessage() {
 		$commit = $this->getCommit();
-		if($commit) {
+		if ($commit) {
 			try {
 				return Convert::raw2xml($this->Environment()->getCommitMessage($commit));
-			} catch(Gitonomy\Git\Exception\ReferenceNotFoundException $e) {
+			} catch (Gitonomy\Git\Exception\ReferenceNotFoundException $e) {
 				return null;
 			}
 		}
@@ -230,10 +230,10 @@ 
 	 */
 	public function getCommitSubjectMessage() {
 		$commit = $this->getCommit();
-		if($commit) {
+		if ($commit) {
 			try {
 				return Convert::raw2xml($this->Environment()->getCommitSubjectMessage($commit));
-			} catch(Gitonomy\Git\Exception\ReferenceNotFoundException $e) {
+			} catch (Gitonomy\Git\Exception\ReferenceNotFoundException $e) {
 				return null;
 			}
 		}
@@ -247,13 +247,13 @@ 
 	 */
 	public function getTags() {
 		$commit = $this->Environment()->getCommit($this->SHA);
-		if(!$commit) {
+		if (!$commit) {
 			return new ArrayList([]);
 		}
 		$tags = $this->Environment()->getCommitTags($commit);
 		$returnTags = [];
 		if (!empty($tags)) {
-			foreach($tags as $tag) {
+			foreach ($tags as $tag) {
 				$field = Varchar::create('Tag', '255');
 				$field->setValue($tag->getName());
 				$returnTags[] = $field;
@@ -270,12 +270,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;
+			if ($change === 'Code version') continue;
 
 			$messages[] = [
 				'Flag' => sprintf(
@@ -303,7 +303,7 @@ 
 	 */
 	public function getTag() {
 		$tags = $this->getTags();
-		if($tags->count() > 0) {
+		if ($tags->count() > 0) {
 			return $tags->last();
 		}
 		return null;
@@ -328,7 +328,7 @@ 
 	public function getChanges() {
 		$list = new ArrayList();
 		$strategy = $this->getDeploymentStrategy();
-		foreach($strategy->getChanges() as $name => $change) {
+		foreach ($strategy->getChanges() as $name => $change) {
 			$changed = (isset($change['from']) && isset($change['to'])) ? $change['from'] != $change['to'] : null;
 			$description = isset($change['description']) ? $change['description'] : '';
 			$compareUrl = null;
@@ -378,11 +378,11 @@ 
 		// Make sure we use the SHA as it was written into this DNDeployment.
 		$args['sha'] = $this->SHA;
 
-		if(!$this->DeployerID) {
+		if (!$this->DeployerID) {
 			$this->DeployerID = Member::currentUserID();
 		}
 
-		if($this->DeployerID) {
+		if ($this->DeployerID) {
 			$deployer = $this->Deployer();
 			$message = sprintf(
 				'Deploy to %s initiated by %s (%s), with IP address %s',

code/model/StateMachineFactory.php

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) {

_config.php

Spacing +1 added lines, -1 removed lines

@@ -10,7 +10,7 @@
 // This will ensure jobs can correctly clean themselves up on any type of failure
 Resque_Event::listen('onFailure', function(Exception $exception, Resque_job $job) {
 	$inst = $job->getInstance();
-	if($inst instanceof DeploynautJobInterface) {
+	if ($inst instanceof DeploynautJobInterface) {
 		$inst->onFailure($exception);
 	}
 });

code/control/GitDispatcher.php

Spacing +2 added lines, -2 removed lines

@@ -133,7 +133,7 @@ 
 	protected function getUpdateStatus($ID) {
 		$ping = DNGitFetch::get()->byID($ID);
 		if (!$ping) {
-			return $this->getAPIResponse(['message' => 'GIT update (' . $ID . ') not found'], 404);
+			return $this->getAPIResponse(['message' => 'GIT update ('.$ID.') not found'], 404);
 		}
 		$output = [
 			'id' => $ID,
@@ -154,7 +154,7 @@ 
 		$fetch->write();
 		$fetch->start();
 
-		$location = Director::absoluteBaseURL() . $this->Link() . '/update/' . $fetch->ID;
+		$location = Director::absoluteBaseURL().$this->Link().'/update/'.$fetch->ID;
 		$output = [
 			'message' => 'git fetch has been queued',
 			'id' => $fetch->ID,

code/backends/PackageGenerator.php

Spacing +4 added lines, -4 removed lines

@@ -50,14 +50,14 @@
 	 */
 	public function getPackageFilename($identifier, $sha, $repositoryDir, DeploynautLogFile $log) {
 		// Fetch through the cache
-		if($this->cache) {
-			$identifier .= '-' . get_class($this) . '-' . $this->getIdentifier();
+		if ($this->cache) {
+			$identifier .= '-'.get_class($this).'-'.$this->getIdentifier();
  			return $this->cache->getPackageFilename($this, $identifier, $sha, $repositoryDir, $log);
 
  		// Default, cacheless implementation
  		} else {
- 			$filename = TEMP_FOLDER . '/' . $sha . '.tar.gz';
- 			if($this->generatePackage($sha, $repositoryDir, $filename, $log)) {
+ 			$filename = TEMP_FOLDER.'/'.$sha.'.tar.gz';
+ 			if ($this->generatePackage($sha, $repositoryDir, $filename, $log)) {
  				return $filename;
  			}
  		}

code/backends/SimplePackageGenerator.php

Spacing +7 added lines, -7 removed lines

@@ -30,8 +30,8 @@ 
 	 * Generate the package
 	 */
 	public function generatePackage($sha, $baseDir, $outputFilename, DeploynautLogFile $log) {
-		$tempPath = TEMP_FOLDER . "/" . str_replace(".tar.gz", "", basename($outputFilename));
-		if(!file_exists($tempPath)) {
+		$tempPath = TEMP_FOLDER."/".str_replace(".tar.gz", "", basename($outputFilename));
+		if (!file_exists($tempPath)) {
 			mkdir($tempPath);
 		}
 
@@ -42,22 +42,22 @@ 
 		// 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 {
 			$this->executeProcesses($processes, $log);
-		} catch(Exception $e) {
+		} catch (Exception $e) {
 			// Execute cleanup on failure
 			$this->executeProcesses($cleanup, $log);
 			throw $e;
@@ -75,7 +75,7 @@ 
 	 * @param DeploynautLogFile $log The log to send output to
 	 */
 	protected function executeProcesses($processes, DeploynautLogFile $log) {
-		foreach($processes as $process) {
+		foreach ($processes as $process) {
 			$process->mustRun(function($type, $buffer) use($log) {
 				$log->write($buffer);
 			});

code/backends/SizeRestrictedPackageCache.php

Spacing +13 added lines, -13 removed lines

@@ -48,25 +48,25 @@ 
 		$repositoryDir,
 		DeploynautLogFile $log
 	) {
-		if(!$this->baseDir) {
+		if (!$this->baseDir) {
 			throw new \LogicException("Can't use PackageCache without setting BaseDir");
 		}
 
-		$buildPath = $this->baseDir . '/' . $this->sanitiseDirName($identifier);
+		$buildPath = $this->baseDir.'/'.$this->sanitiseDirName($identifier);
 		$filename = "$buildPath/$sha.tar.gz";
 
-		if(!file_exists($this->baseDir)) {
-			if(!mkdir($this->baseDir)) {
+		if (!file_exists($this->baseDir)) {
+			if (!mkdir($this->baseDir)) {
 				throw new \LogicException("Can't create base dir {$this->baseDir}");
 			}
 		}
-		if(!file_exists($buildPath)) {
-			if(!mkdir($buildPath)) {
+		if (!file_exists($buildPath)) {
+			if (!mkdir($buildPath)) {
 				throw new \LogicException("Can't create build path $buildPath");
 			}
 		}
 
-		if(file_exists($filename)) {
+		if (file_exists($filename)) {
 			$log->write("Using previously generated package $filename");
 			// This will ensure that our cache garbage collection will remove least-recently-accessed,
 			// rather than oldest.
@@ -74,11 +74,11 @@ 
 			return $filename;
 
 		} else {
-			if($this->cacheSize) {
+			if ($this->cacheSize) {
 				$this->reduceDirSizeTo($buildPath, $this->cacheSize - 1, $log);
 			}
 
-			if($generator->generatePackage($sha, $repositoryDir, $filename, $log)) {
+			if ($generator->generatePackage($sha, $repositoryDir, $filename, $log)) {
 				return $filename;
 			}
 		}
@@ -103,14 +103,14 @@ 
 	 * @param DeploynautLogFile $log The log to send removal status messages to
 	 */
 	protected function reduceDirSizeTo($dir, $count, DeploynautLogFile $log) {
-		$files = glob($dir . '/*.tar.gz');
-		if(sizeof($files) > $count) {
+		$files = glob($dir.'/*.tar.gz');
+		if (sizeof($files) > $count) {
 			usort($files, function($a, $b) {
 				return filemtime($a) > filemtime($b);
 			});
 
-			for($i = 0; $i < sizeof($files) - $count; $i++) {
-				$log->write("Removing " . $files[$i] . " from package cache");
+			for ($i = 0; $i < sizeof($files) - $count; $i++) {
+				$log->write("Removing ".$files[$i]." from package cache");
 				unlink($files[$i]);
 			}
 		}