silverstripe / deploynaut

code/model/DNData.php

Spacing +21 added lines, -21 removed lines

@@ -59,7 +59,7 @@ 
 		parent::__construct();
 
 		// Better to use injector to set these
-		if(func_num_args() == 0) {
+		if (func_num_args() == 0) {
 			return;
 		}
 		Deprecation::notice(
@@ -88,8 +88,8 @@ 
 	 * @param string $environmentDir
 	 */
 	public function setEnvironmentDir($environmentDir) {
-		if($environmentDir[0] != "/") {
-			$environmentDir = BASE_PATH . '/' . $environmentDir;
+		if ($environmentDir[0] != "/") {
+			$environmentDir = BASE_PATH.'/'.$environmentDir;
 		}
 		$this->environmentDir = realpath($environmentDir) ?: $environmentDir;
 	}
@@ -109,8 +109,8 @@ 
 	 * @param string $keyDir
 	 */
 	public function setKeyDir($keyDir) {
-		if($keyDir[0] != "/") {
-			$keyDir = BASE_PATH . '/' . $keyDir;
+		if ($keyDir[0] != "/") {
+			$keyDir = BASE_PATH.'/'.$keyDir;
 		}
 		$this->keyDir = realpath($keyDir) ?: $keyDir;
 	}
@@ -126,8 +126,8 @@ 
 	 * @param string $signalDir
 	 */
 	public function setSignalDir($signalDir) {
-		if($signalDir[0] != "/") {
-			$signalDir = BASE_PATH . '/' . $signalDir;
+		if ($signalDir[0] != "/") {
+			$signalDir = BASE_PATH.'/'.$signalDir;
 		}
 		$this->signalDir = realpath($signalDir) ?: $signalDir;
 	}
@@ -168,10 +168,10 @@ 
 	 * @param string $transferDir
 	 */
 	public function setDataTransferDir($transferDir) {
-		if($transferDir[0] != "/") {
-			$transferDir = BASE_PATH . '/' . $transferDir;
+		if ($transferDir[0] != "/") {
+			$transferDir = BASE_PATH.'/'.$transferDir;
 		}
-		if(strpos($transferDir, ASSETS_PATH) === false) {
+		if (strpos($transferDir, ASSETS_PATH) === false) {
 			throw new LogicException(sprintf(
 				'DNData::dataTransferDir needs to be located within <webroot>assets/ (location: %s)',
 				$transferDir
@@ -198,16 +198,16 @@ 
 	 */
 	public function getProjectPaths() {
 		$paths = array();
-		if(!file_exists($this->getEnvironmentDir())) {
-			$eMessage = 'The environment directory ' . $this->getEnvironmentDir() . ' doesn\'t exist. Create it '
+		if (!file_exists($this->getEnvironmentDir())) {
+			$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) {
+		foreach (scandir($this->getEnvironmentDir()) as $project) {
 			// Exlcude dot-prefixed directories (.git was getting in the way)
-			if(preg_match('/^[^\.]/', $project)) {
-				$path = $this->getEnvironmentDir() . '/' . $project;
-				if(is_dir($path) && $project != '.' && $project != '..') {
+			if (preg_match('/^[^\.]/', $project)) {
+				$path = $this->getEnvironmentDir().'/'.$project;
+				if (is_dir($path) && $project != '.' && $project != '..') {
 					$paths[] = $project;
 				}
 			}
@@ -221,15 +221,15 @@ 
 	 * 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.');
+		if (!file_exists($baseDir)) {
+			throw new Exception('Environment directory '.$baseDir.' doesn\'t exist. Create it first.');
 		}
 		// Search the directory for config files.
-		foreach(scandir($baseDir) as $environmentFile) {
-			if(preg_match('/\.rb$/', $environmentFile)) {
+		foreach (scandir($baseDir) as $environmentFile) {
+			if (preg_match('/\.rb$/', $environmentFile)) {
 				// Config found, wrap it into an object.
 				$paths[] = "$baseDir/$environmentFile";
 			}

code/model/DNCommit.php

Spacing +11 added lines, -11 removed lines

@@ -74,7 +74,7 @@ 
 	 * @return string
 	 */
 	public function Name() {
-		if($this->name == null) {
+		if ($this->name == null) {
 			$this->name = $this->commit->getFixedShortHash(8);
 		}
 
@@ -94,7 +94,7 @@ 
 	 * @return string
 	 */
 	public function SubjectMessage() {
-		if($this->subjectMessage == null) {
+		if ($this->subjectMessage == null) {
 			$this->subjectMessage = $this->commit->getSubjectMessage();
 		}
 
@@ -102,7 +102,7 @@ 
 	}
 
 	public function BodyMessage() {
-		if($this->bodyMessage == null) {
+		if ($this->bodyMessage == null) {
 			$this->bodyMessage = $this->commit->getBodyMessage();
 		}
 
@@ -113,14 +113,14 @@ 
 	 * @return ArrayList
 	 */
 	public function References() {
-		if($this->references !== null) {
+		if ($this->references !== null) {
 			return $this->references;
 		}
 		$this->references = new ArrayList();
 
 		// Add tags
-		foreach($this->commit->resolveReferences() as $reference) {
-			if($reference instanceof \Gitonomy\Git\Reference\Tag) {
+		foreach ($this->commit->resolveReferences() as $reference) {
+			if ($reference instanceof \Gitonomy\Git\Reference\Tag) {
 				$this->references->push(new ArrayData(array(
 					'Name' => $reference->getName(),
 					'Type' => 'Tag',
@@ -151,16 +151,16 @@ 
 	public function CurrentlyDeployedTo() {
 		$environments = $this->project->Environments();
 		$envList = new ArrayList();
-		foreach($environments as $environment) {
+		foreach ($environments as $environment) {
 			$deployments = DNDeployment::get()
 				->filter('State', 'Completed')
 				->filter('EnvironmentID', $environment->ID)
 				->sort('LastEdited DESC');
-			if(!$deployments->count()) {
+			if (!$deployments->count()) {
 				continue;
 			}
 			$latest = $deployments->first();
-			if($latest->SHA === $this->commit->getHash()) {
+			if ($latest->SHA === $this->commit->getHash()) {
 				$envList->push($environment);
 			}
 		}
@@ -173,7 +173,7 @@ 
 	 */
 	public function EverDeployedTo($environmentName) {
 		$environments = $this->project->Environments()->filter('Name', $environmentName);
-		if(!$environments->count()) {
+		if (!$environments->count()) {
 			return false;
 		}
 
@@ -183,7 +183,7 @@ 
 				->filter('State', 'Completed')
 				->filter('EnvironmentID', $environment->ID);
 
-		if($deployments->count()) {
+		if ($deployments->count()) {
 			return true;
 		}
 

code/model/DNReferenceList.php

Spacing +18 added lines, -18 removed lines

@@ -100,24 +100,24 @@ 
 	protected function getReferences() {
 		try {
 			$repository = new Gitonomy\Git\Repository($this->project->getLocalCVSPath());
-		} catch(Exception $e) {
+		} catch (Exception $e) {
 			return array();
 		}
 
-		if($this->getTags) {
-			if($this->reference) {
+		if ($this->getTags) {
+			if ($this->reference) {
 				throw new LogicException("Can't have \$reference and \$getTags both set");
 			}
 			$log = $repository->getReferences()->getTags();
 
-		} else if($this->reference) {
+		} else if ($this->reference) {
 			$log = $this->reference->getLog();
 		} else {
 			$log = $repository->getLog();
 		}
 
-		if($this->limit) {
-			if(is_array($log)) {
+		if ($this->limit) {
+			if (is_array($log)) {
 				$limitedLog = array_slice($log, 0, $this->limit);
 			} else {
 				$limitedLog = $log->setLimit($this->limit);
@@ -128,18 +128,18 @@ 
 
 		// cache them for look up in byName
 		$builds = array();
-		foreach($limitedLog as $reference) {
-			if(!empty($this->blockBranch)) {
+		foreach ($limitedLog as $reference) {
+			if (!empty($this->blockBranch)) {
 				$branchesIncluding = GitonomyCache::getIncludingBranches($reference);
-				foreach($branchesIncluding as $candidate) {
-					if($candidate->getName() == $this->blockBranch) {
+				foreach ($branchesIncluding as $candidate) {
+					if ($candidate->getName() == $this->blockBranch) {
 						// Break out of the function
 						return $builds;
 					}
 				}
 			}
 
-			if($this->getTags) {
+			if ($this->getTags) {
 				$builds[] = DNTag::create($reference, $this->project, $this->data);
 			} else {
 				$name = $this->reference ? $this->reference->getName() : '';
@@ -157,7 +157,7 @@ 
 	 * @return DNCommit
 	 */
 	public function byName($hash) {
-		if($this->loaded === false) {
+		if ($this->loaded === false) {
 			$this->items = $this->getReferences();
 			$this->loaded = true;
 		}
@@ -165,14 +165,14 @@ 
 		// The item might not be in the list because of the limit, try to find
 		// in an older version and add it to the list.
 		$found = null;
-		foreach($this->items as $item) {
-			if($item->SHA() == $hash) {
+		foreach ($this->items as $item) {
+			if ($item->SHA() == $hash) {
 				$found = $item;
 				break;
 			}
 		}
 
-		if($found === null) {
+		if ($found === null) {
 			$repository = new Gitonomy\Git\Repository($this->project->getLocalCVSPath());
 			$commit = new Gitonomy\Git\Commit($repository, $hash);
 			$found = DNCommit::create($commit, $this->project, $this->data);
@@ -193,12 +193,12 @@ 
 	 * @return ArrayIterator
 	 */
 	public function getIterator() {
-		if($this->loaded === false) {
+		if ($this->loaded === false) {
 			$this->items = $this->getReferences();
 			$this->loaded = true;
 		}
-		foreach($this->items as $item) {
-			if(is_array($item)) {
+		foreach ($this->items as $item) {
+			if (is_array($item)) {
 				$this->items[] = new ArrayData($item);
 			}
 		}

code/jobs/DataTransferJob.php

Spacing +7 added lines, -7 removed lines

@@ -20,13 +20,13 @@ 
 	}
 
 	public function perform() {
-		echo "[-] DataTransferJob starting" . PHP_EOL;
+		echo "[-] DataTransferJob starting".PHP_EOL;
 		$log = new DeploynautLogFile($this->args['logfile']);
 		$dataTransfer = DNDataTransfer::get()->byID($this->args['dataTransferID']);
 		$environment = $dataTransfer->Environment();
 		$backupDataTransfer = null;
 
-		if(
+		if (
 			!empty($this->args['backupBeforePush'])
 			&& $this->args['backupBeforePush'] !== 'false'
 			&& $dataTransfer->Direction == 'push'
@@ -54,7 +54,7 @@ 
 					'Created:GreaterThan' => strtotime('-30 minutes')
 				))
 				->exclude('ID', $dataTransfer->ID);
-			if($runningTransfers->count()) {
+			if ($runningTransfers->count()) {
 				$runningTransfer = $runningTransfers->first();
 				$message = sprintf(
 					'Error: another transfer is in progress (started at %s by %s)',
@@ -67,13 +67,13 @@ 
 
 			$this->performBackup($backupDataTransfer, $log);
 			$environment->Backend()->dataTransfer($dataTransfer, $log);
-		} catch(Exception $e) {
-			echo "[-] DataTransferJob failed" . PHP_EOL;
+		} catch (Exception $e) {
+			echo "[-] DataTransferJob failed".PHP_EOL;
 			throw $e;
 		}
 
 		$this->updateStatus('Finished');
-		echo "[-] DataTransferJob finished" . PHP_EOL;
+		echo "[-] DataTransferJob finished".PHP_EOL;
 	}
 
 	protected function performBackup($backupDataTransfer, DeploynautLogFile $log) {
@@ -88,7 +88,7 @@ 
 			DB::connect($databaseConfig);
 			$backupDataTransfer->Status = 'Finished';
 			$backupDataTransfer->write();
-		} catch(Exception $e) {
+		} catch (Exception $e) {
 			global $databaseConfig;
 			DB::connect($databaseConfig);
 			$backupDataTransfer->Status = 'Failed';

code/jobs/FetchJob.php

Spacing +14 added lines, -14 removed lines

@@ -33,12 +33,12 @@ 
 	public function perform() {
 		set_time_limit(0);
 
-		if(!empty($this->args['logfile'])) {
+		if (!empty($this->args['logfile'])) {
 			$this->log = new DeploynautLogFile($this->args['logfile']);
 		}
 
 		$this->project = DNProject::get()->byId($this->args['projectID']);
-		if(!($this->project && $this->project->exists())) {
+		if (!($this->project && $this->project->exists())) {
 			throw new RuntimeException(sprintf('Project ID %s not found', $this->args['projectID']));
 		}
 
@@ -47,7 +47,7 @@ 
 		// Disallow concurrent git fetches on the same project.
 		// Only consider fetches started in the last 30 minutes (older jobs probably got stuck)
 		try {
-			if(!empty($this->args['fetchID'])) {
+			if (!empty($this->args['fetchID'])) {
 				$runningFetches = DNGitFetch::get()
 					->filter(array(
 						'ProjectID' => $this->project->ID,
@@ -56,14 +56,14 @@ 
 					))
 					->exclude('ID', $this->args['fetchID']);
 
-				if($runningFetches->count()) {
+				if ($runningFetches->count()) {
 					$runningFetch = $runningFetches->first();
 					$message = sprintf(
 						'Another fetch is in progress (started at %s by %s)',
 						$runningFetch->dbObject('Created')->Nice(),
 						$runningFetch->Deployer()->Title
 					);
-					if($this->log) {
+					if ($this->log) {
 						$this->log->write($message);
 					}
 					throw new RuntimeException($message);
@@ -72,13 +72,13 @@ 
 
 			// Decide whether we need to just update what we already have
 			// or initiate a clone if no local repo exists.
-			if($this->project->repoExists() && empty($this->args['forceClone'])) {
+			if ($this->project->repoExists() && empty($this->args['forceClone'])) {
 				$this->fetchRepo();
 			} else {
 				$this->cloneRepo();
 			}
-		} catch(Exception $e) {
-			if($this->log) {
+		} catch (Exception $e) {
+			if ($this->log) {
 				$this->log->write($e->getMessage());
 			}
 			throw $e;
@@ -95,7 +95,7 @@ 
 	}
 
 	protected function cloneRepo() {
-		if(file_exists($this->project->getLocalCVSPath())) {
+		if (file_exists($this->project->getLocalCVSPath())) {
 			$this->runCommand(sprintf(
 				'rm -rf %s',
 				escapeshellarg($this->project->getLocalCVSPath())
@@ -117,17 +117,17 @@ 
 	 * @throws RuntimeException
 	 */
 	protected function runCommand($command, $workingDir = null) {
-		if(!empty($this->user)) {
+		if (!empty($this->user)) {
 			$command = sprintf('sudo -u %s %s', $this->user, $command);
 		}
-		if($this->log) {
+		if ($this->log) {
 			$this->log->write(sprintf('Running command: %s', $command));
 		}
 		$process = new AbortableProcess($command, $workingDir);
 		$process->setEnv($this->project->getProcessEnv());
 		$process->setTimeout(1800);
 		$process->run();
-		if(!$process->isSuccessful()) {
+		if (!$process->isSuccessful()) {
 			throw new RuntimeException($process->getErrorOutput());
 		}
 	}
@@ -140,9 +140,9 @@ 
 		global $databaseConfig;
 		DB::connect($databaseConfig);
 
-		if(!empty($this->args['fetchID'])) {
+		if (!empty($this->args['fetchID'])) {
 			$fetch = DNGitFetch::get()->byID($this->args['fetchID']);
-			if($fetch && $fetch->exists()) {
+			if ($fetch && $fetch->exists()) {
 				$fetch->Status = $status;
 				$fetch->write();
 			}

code/form/TabbedSelectionGroup.php

Spacing +1 added lines, -1 removed lines

@@ -9,7 +9,7 @@
 		$items = CompositeField::FieldList()->toArray();
 		$fields = new ArrayList();
 
-		foreach($items as $item) {
+		foreach ($items as $item) {
 			$extra = array(
 				'Selected' => $this->value == $item->getValue(),
 			);

code/form/DataArchiveFileField.php

Spacing +7 added lines, -7 removed lines

@@ -15,11 +15,11 @@ 
 	 * @return bool|DataArchiveFileField
 	 */
 	public function saveInto(DataObjectInterface $record) {
-		if(!isset($_FILES[$this->name])) {
+		if (!isset($_FILES[$this->name])) {
 			return false;
 		}
 
-		if(!($record instanceof DNDataArchive)) {
+		if (!($record instanceof DNDataArchive)) {
 			throw new LogicException('Saving into wrong type, expected DNDataArchive');
 		}
 
@@ -27,7 +27,7 @@ 
 
 		/** @var DNDataTransfer $dataTransfer */
 		$dataTransfer = $dataArchive->DataTransfers()->First();
-		if(!$dataTransfer) {
+		if (!$dataTransfer) {
 			throw new LogicException('No transfer found');
 		}
 
@@ -36,16 +36,16 @@ 
 		// Hack: loadIntoFile assumes paths relative to assets,
 		//  otherwise it creates the whole structure *within* that folder
 		$absolutePath = $dataArchive->generateFilepath($dataTransfer);
-		$relativePath = preg_replace('#^' . preg_quote(ASSETS_PATH) . '/#', '', $absolutePath);
+		$relativePath = preg_replace('#^'.preg_quote(ASSETS_PATH).'/#', '', $absolutePath);
 		$this->upload->loadIntoFile($_FILES[$this->name], $file, $relativePath);
-		if($this->upload->isError()) {
+		if ($this->upload->isError()) {
 			return false;
 		}
 
 		$file = $this->upload->getFile();
-		if($this->relationAutoSetting) {
+		if ($this->relationAutoSetting) {
 			// save to record
-			$record->{$this->name . 'ID'} = $file->ID;
+			$record->{$this->name.'ID'} = $file->ID;
 		}
 
 		return $this;

code/extensions/DeploynautSecurityExtension.php

Spacing +1 added lines, -1 removed lines

@@ -6,7 +6,7 @@
 		// the 'ping' action is called via AJAX from the /admin and will cause
 		// the admin section to 'grow' over time. We only need the css and js
 		// for login, reset, logout and so on.
-		if(!$this->owner->getRequest()->isAjax()) {
+		if (!$this->owner->getRequest()->isAjax()) {
 			DNRoot::include_requirements();
 		}
 	}

code/extensions/DeploynautFileExtension.php

Spacing +1 added lines, -1 removed lines

@@ -11,7 +11,7 @@
 		$file = $this->owner;
 		$archive = DNDataArchive::get()->filter('ArchiveFileID', $file->ID)->First();
 
-		if($archive) {
+		if ($archive) {
 			return $archive->canDownload($member);
 		}