silverstripe / deploynaut

code/model/steps/PipelineStep.php

Doc Comments +1 added lines, -2 removed lines

@@ -119,7 +119,6 @@ 
 	 * Retrieve the value of a specific config setting
 	 *
 	 * @param string $setting Settings
-	 * @param string $setting,... Sub-settings
 	 * @return mixed Value of setting, or null if not set
 	 */
 	public function getConfigSetting($setting) {
@@ -233,7 +232,7 @@ 
 	 * Initialise the step unless it's already running (Started state).
 	 * The step will be expected to transition from here to Finished, Failed or Aborted state.
 	 *
-	 * @return boolean True if successfully started, false if error
+	 * @return boolean|null True if successfully started, false if error
 	 */
 	public function start() {
 		$this->Status = 'Started';

Spacing +1 added lines, -1 removed lines

@@ -251,7 +251,7 @@
 	 */
 	public function abort() {
 
-		if ($this->isQueued() || $this->isRunning()) {
+		if($this->isQueued() || $this->isRunning()) {
 			$this->Status = 'Aborted';
 			$this->log('Step aborted');
 			$this->write();

Braces +6 added lines, -2 removed lines

@@ -89,7 +89,9 @@ 
 	 * @return array
 	 */
 	public function getConfigData() {
-		if(!$this->Config) return array();
+		if(!$this->Config) {
+			return array();
+		}
 
 		// Merge with defaults
 		if(!$this->mergedConfig) {
@@ -125,7 +127,9 @@ 
 	public function getConfigSetting($setting) {
 		$source = $this->getConfigData();
 		foreach(func_get_args() as $setting) {
-			if(empty($source[$setting])) return null;
+			if(empty($source[$setting])) {
+				return null;
+			}
 			$source = $source[$setting];
 		}
 		return $source;

code/api/nouns/APIEnvironment.php

Spacing +3 added lines, -3 removed lines

@@ -38,7 +38,7 @@ 
 							"href" => "$href/deploy",
 							"type" => "application/json",
 							"fields" => array(
-								array( "name" => "release", "type" => "text" ),
+								array("name" => "release", "type" => "text"),
 							),
 						)
 					)
@@ -126,7 +126,7 @@ 
 		$ping->write();
 		$ping->start();
 
-		$location = Director::absoluteBaseURL().$this->Link().'/ping/'.$ping->ID;
+		$location = Director::absoluteBaseURL() . $this->Link() . '/ping/' . $ping->ID;
 		$output = array(
 			'message' => 'Ping queued as job ' . $ping->ResqueToken,
 			'href' => $location,
@@ -180,7 +180,7 @@ 
 		$deploy->SHA = $reqBody['release'];
 		$deploy->write();
 		$deploy->start();
-		$location = Director::absoluteBaseURL().$this->Link().'/deploy/'.$deploy->ID;
+		$location = Director::absoluteBaseURL() . $this->Link() . '/deploy/' . $deploy->ID;
 		$output = array(
 			'message' => 'Deploy queued as job ' . $deploy->ResqueToken,
 			'href' => $location,

code/api/nouns/APIProject.php

Spacing +1 added lines, -1 removed lines

@@ -97,7 +97,7 @@
 		$fetch->write();
 		$fetch->start();
 
-		$location = Director::absoluteBaseURL().$this->Link().'/fetch/'.$fetch->ID;
+		$location = Director::absoluteBaseURL() . $this->Link() . '/fetch/' . $fetch->ID;
 		$output = array(
 			'message' => 'Ping queued as job ' . $fetch->ResqueToken,
 			'href' => $location,

code/backends/SimplePackageGenerator.php

Spacing +2 added lines, -2 removed lines

@@ -25,7 +25,7 @@ 
 
 	public function getIdentifier() {
 		// If the build script changes, don't re-use cached items
-		return substr(sha1($this->buildScript),0,8);
+		return substr(sha1($this->buildScript), 0, 8);
 	}
 
 	/**
@@ -72,7 +72,7 @@ 
 	 */
 	protected function executeProcesses($processes, DeploynautLogFile $log) {
 		foreach($processes as $process) {
-			$process->mustRun(function ($type, $buffer) use($log) {
+			$process->mustRun(function($type, $buffer) use($log) {
 				$log->write($buffer);
 			});
 		}

Braces +3 added lines, -1 removed lines

@@ -33,7 +33,9 @@
 	 */
 	public function generatePackage($sha, $baseDir, $outputFilename, DeploynautLogFile $log) {
 		$tempPath = TEMP_FOLDER . "/" . str_replace(".tar.gz", "", basename($outputFilename));
-		if(!file_exists($tempPath)) mkdir($tempPath);
+		if(!file_exists($tempPath)) {
+			mkdir($tempPath);
+		}
 
 		// Execute these in sequence until there's a failure
 		$processes = array(

code/control/DeploynautLogFile.php

Spacing +1 added lines, -1 removed lines

@@ -15,7 +15,7 @@
 	}
 
 	public function write($message) {
-		error_log('['.date('Y-m-d H:i:s').'] ' . $message .PHP_EOL, 3, $this->logFile);
+		error_log('[' . date('Y-m-d H:i:s') . '] ' . $message . PHP_EOL, 3, $this->logFile);
 		@chmod($this->logFile, 0666);
 	}
 

code/form/DataArchiveFileField.php

Indentation +5 added lines, -5 removed lines

@@ -1,10 +1,10 @@
 <?php
 /**
- * Overwrite field to save into a {@link DataArchive}, using generateFilepath().
- * This mainly just works around the limitation
- * of FileField to set the folder path *before* uploading the file,
- * at which point we don't have a {@link DataTransfer} ID yet, so can't generate the path.
- */
+	 * Overwrite field to save into a {@link DataArchive}, using generateFilepath().
+	 * This mainly just works around the limitation
+	 * of FileField to set the folder path *before* uploading the file,
+	 * at which point we don't have a {@link DataTransfer} ID yet, so can't generate the path.
+	 */
 class DataArchiveFileField extends FileField {
 
 	public function saveInto(DataObjectInterface $record) {

Braces +6 added lines, -2 removed lines

@@ -8,7 +8,9 @@ 
 class DataArchiveFileField extends FileField {
 
 	public function saveInto(DataObjectInterface $record) {
-		if(!isset($_FILES[$this->name])) return false;
+		if(!isset($_FILES[$this->name])) {
+			return false;
+		}
 
 		if(!($record instanceof DNDataArchive)) {
 			throw new LogicException('Saving into wrong type, expected DNDataArchive');
@@ -27,7 +29,9 @@ 
 		$absolutePath = $dataArchive->generateFilepath($dataTransfer);
 		$relativePath = preg_replace('#^' . preg_quote(ASSETS_PATH) . '/#', '', $absolutePath);
 		$this->upload->loadIntoFile($_FILES[$this->name], $file, $relativePath);
-		if($this->upload->isError()) return false;
+		if($this->upload->isError()) {
+			return false;
+		}
 
 		$file = $this->upload->getFile();
 		if($this->relationAutoSetting) {

code/jobs/CloneGitRepo.php

Braces +6 added lines, -2 removed lines

@@ -30,7 +30,9 @@ 
 
 		if(file_exists($path)) {
 			$command = array();
-			if($user) $command[] = sprintf('sudo -u %s', $user);
+			if($user) {
+				$command[] = sprintf('sudo -u %s', $user);
+			}
 			$command[] = sprintf('rm -rf %s', $path);
 
 			fwrite($fh, sprintf('[%s] Cleaning up existing repository %s', date('Y-m-d H:i:s'), $path) . PHP_EOL);
@@ -50,7 +52,9 @@ 
 		echo "[-] CloneGitRepo starting" . PHP_EOL;
 
 		$command = array();
-		if($user) $command[] = sprintf('sudo -u %s', $user);
+		if($user) {
+			$command[] = sprintf('sudo -u %s', $user);
+		}
 		$command[] = sprintf('git clone --bare -q %s %s', $repo, $path);
 
 		fwrite($fh, sprintf('[%s] Running command: %s', date('Y-m-d H:i:s'), implode(' ', $command)) . PHP_EOL);

code/model/DNBranch.php

Spacing +1 added lines, -1 removed lines

@@ -51,7 +51,7 @@
 
 	public function Link() {
 		// Use a get-var for branch so that it can handle unsafe chars better
-		return Controller::join_links($this->project->Link(), 'branch?name='.urlencode($this->Name()));
+		return Controller::join_links($this->project->Link(), 'branch?name=' . urlencode($this->Name()));
 	}
 
 	/**

Braces +5 added lines, -2 removed lines

@@ -97,8 +97,11 @@
 	 * @return string
 	 */
 	public function IsOpenByDefault() {
-		if($this->Name() == 'master') return " open";
-		else return "";
+		if($this->Name() == 'master') {
+			return " open";
+		} else {
+			return "";
+		}
 	}
 
 }

Doc Comments -1 removed lines

@@ -22,7 +22,6 @@
 	);
 
 	/**
-	 * @param Gitonomy\Git\Commit $commit
 	 * @param DNProject $project
 	 * @param DNData $data
 	 */

code/model/DNBranchList.php

Braces +17 added lines, -6 removed lines

@@ -36,15 +36,22 @@ 
 		$firstBranch = null;
 
 		// return an empty array if the version control isn't checked out yet
-		if(!file_exists($this->project->LocalCVSPath)) return array();
+		if(!file_exists($this->project->LocalCVSPath)) {
+			return array();
+		}
 
 		$repository = new Gitonomy\Git\Repository($this->project->LocalCVSPath);
 		foreach($repository->getReferences()->getBranches() as $branch) {
 			$obj = DNBranch::create($branch, $this->project, $this->data);
-			if($branch->getName() == 'master') $firstBranch = array($branch->getName() => $obj);
-			else $branches[$branch->getName()] = $obj;
+			if($branch->getName() == 'master') {
+				$firstBranch = array($branch->getName() => $obj);
+			} else {
+				$branches[$branch->getName()] = $obj;
+			}
+		}
+		if($firstBranch) {
+			$branches = $firstBranch + $branches;
 		}
-		if($firstBranch) $branches = $firstBranch + $branches;
 
 		return $branches;
 	}
@@ -57,7 +64,9 @@ 
 			$this->getIterator();
 		}
 
-		if(isset($this->items[$name])) return $this->items[$name];
+		if(isset($this->items[$name])) {
+			return $this->items[$name];
+		}
 	}
 
 	/**
@@ -72,7 +81,9 @@ 
 			$this->loaded = true;
 		}
 		foreach($this->items as $i => $item) {
-			if(is_array($item)) $this->items[$i] = new ArrayData($item);
+			if(is_array($item)) {
+				$this->items[$i] = new ArrayData($item);
+			}
 		}
 		return new ArrayIterator($this->items);
 	}