silverstripe / deploynaut

code/model/DNBranchList.php

Spacing +9 added lines, -9 removed lines

@@ -58,20 +58,20 @@ 
 
 		try {
 			$repository = new Gitonomy\Git\Repository($this->project->getLocalCVSPath());
-		} catch(Exception $e) {
+		} catch (Exception $e) {
 			return $branches;
 		}
 
-		foreach($repository->getReferences()->getBranches() as $branch) {
+		foreach ($repository->getReferences()->getBranches() as $branch) {
 			/** @var DNBranch $obj */
 			$obj = DNBranch::create($branch, $this->project, $this->data);
-			if($branch->getName() == 'master') {
+			if ($branch->getName() == 'master') {
 				$firstBranch = array($branch->getName() => $obj);
 			} else {
 				$branches[$branch->getName()] = $obj;
 			}
 		}
-		if($firstBranch) {
+		if ($firstBranch) {
 			$branches = $firstBranch + $branches;
 		}
 
@@ -86,11 +86,11 @@ 
 	 * @return string
 	 */
 	public function byName($name) {
-		if($this->loaded === false) {
+		if ($this->loaded === false) {
 			$this->getIterator();
 		}
 
-		if(isset($this->items[$name])) {
+		if (isset($this->items[$name])) {
 			return $this->items[$name];
 		}
 
@@ -104,12 +104,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 $i => $item) {
-			if(is_array($item)) {
+		foreach ($this->items as $i => $item) {
+			if (is_array($item)) {
 				$this->items[$i] = new ArrayData($item);
 			}
 		}

code/model/jobs/DNCreateEnvironment.php

Spacing +9 added lines, -9 removed lines

@@ -68,7 +68,7 @@ 
 	 * @return string
 	 */
 	public function LogLink() {
-		return $this->Link() . '/log';
+		return $this->Link().'/log';
 	}
 
 	/**
@@ -110,9 +110,9 @@ 
 		$status = new Resque_Job_Status($this->ResqueToken);
 		$statusCode = $status->get();
 		// The Resque job can no longer be found, fallback to the DNDeployment.Status
-		if($statusCode === false) {
+		if ($statusCode === false) {
 			// Translate from the DNDeployment.Status to the Resque job status for UI purposes
-			switch($this->Status) {
+			switch ($this->Status) {
 				case 'Finished':
 					return 'Complete';
 				case 'Started':
@@ -139,11 +139,11 @@ 
 			'projectName' => $project->Name
 		);
 
-		if(!$this->CreatorID) {
+		if (!$this->CreatorID) {
 			$this->CreatorID = Member::currentUserID();
 		}
 
-		if($this->CreatorID) {
+		if ($this->CreatorID) {
 			$creator = $this->Creator();
 			$message = sprintf(
 				'Environment creation for project %s initiated by %s (%s), with IP address %s',
@@ -171,7 +171,7 @@ 
 
 	public function createEnvironment() {
 		$backend = $this->getBackend();
-		if($backend) {
+		if ($backend) {
 			return $backend->createEnvironment($this);
 		}
 		throw new Exception("Unable to find backend.");
@@ -185,12 +185,12 @@ 
 	 */
 	public function getBackend() {
 		$data = unserialize($this->Data);
-		if(isset($data['EnvironmentType']) && class_exists($data['EnvironmentType'])) {
+		if (isset($data['EnvironmentType']) && class_exists($data['EnvironmentType'])) {
 			$env = Injector::inst()->get($data['EnvironmentType']);
-			if($env instanceof EnvironmentCreateBackend) {
+			if ($env instanceof EnvironmentCreateBackend) {
 				return $env;
 			} else {
-				throw new Exception("Invalid backend: " . $data['EnvironmentType']);
+				throw new Exception("Invalid backend: ".$data['EnvironmentType']);
 			}
 		}
 		return null;

code/model/jobs/DNDataTransfer.php

Spacing +13 added lines, -13 removed lines

@@ -112,7 +112,7 @@ 
 	}
 
 	public function getTitle() {
-		return $this->dbObject('Created')->Nice() . " (Status: {$this->Status})";
+		return $this->dbObject('Created')->Nice()." (Status: {$this->Status})";
 	}
 
 	public function Link() {
@@ -169,11 +169,11 @@ 
 			'backupBeforePush' => $this->backupBeforePush
 		);
 
-		if(!$this->AuthorID) {
+		if (!$this->AuthorID) {
 			$this->AuthorID = Member::currentUserID();
 		}
 
-		if($this->AuthorID) {
+		if ($this->AuthorID) {
 			$author = $this->Author();
 			$message = sprintf(
 				'Data transfer on %s (%s, %s) initiated by %s (%s), with IP address %s',
@@ -231,23 +231,23 @@ 
 
 	public function getDescription() {
 		$envName = $this->Environment()->getFullName();
-		if($this->Direction == 'get') {
-			if($this->Origin == 'ManualUpload') {
-				$description = 'Manual upload of ' . $this->getModeNice() . ' to ' . $envName;
-			} elseif($this->IsBackupDataTransfer()) {
-				$description = 'Automated backup of ' . $this->getModeNice() . ' from ' . $envName;
+		if ($this->Direction == 'get') {
+			if ($this->Origin == 'ManualUpload') {
+				$description = 'Manual upload of '.$this->getModeNice().' to '.$envName;
+			} elseif ($this->IsBackupDataTransfer()) {
+				$description = 'Automated backup of '.$this->getModeNice().' from '.$envName;
 			} else {
-				$description = 'Backup of ' . $this->getModeNice() . ' to ' . $envName;
+				$description = 'Backup of '.$this->getModeNice().' to '.$envName;
 			}
 		} else {
-			$description = 'Restore ' . $this->getModeNice() . ' to ' . $envName;
+			$description = 'Restore '.$this->getModeNice().' to '.$envName;
 		}
 
 		return $description;
 	}
 
 	public function getModeNice() {
-		if($this->Mode == 'all') {
+		if ($this->Mode == 'all') {
 			return 'database and assets';
 		} else {
 			return $this->Mode;
@@ -287,9 +287,9 @@ 
 		$status = new Resque_Job_Status($this->ResqueToken);
 		$statusCode = $status->get();
 		// The Resque job can no longer be found, fallback to the DNDataTransfer.Status
-		if($statusCode === false) {
+		if ($statusCode === false) {
 			// Translate from the DNDataTransfer.Status to the Resque job status for UI purposes
-			switch($this->Status) {
+			switch ($this->Status) {
 				case 'Finished':
 					return 'Complete';
 				case 'Started':

code/model/jobs/DNGitFetch.php

Spacing +4 added lines, -4 removed lines

@@ -54,11 +54,11 @@ 
 		$project = $this->Project();
 		$log = $this->log();
 
-		if(!$this->DeployerID) {
+		if (!$this->DeployerID) {
 			$this->DeployerID = Member::currentUserID();
 		}
 
-		if($this->DeployerID) {
+		if ($this->DeployerID) {
 			$deployer = $this->Deployer();
 			$message = sprintf(
 				'Update repository job for %s initiated by %s (%s)',
@@ -131,9 +131,9 @@ 
 		$status = new Resque_Job_Status($this->ResqueToken);
 		$statusCode = $status->get();
 		// The Resque job can no longer be found, fallback to the DNDeployment.Status
-		if($statusCode === false) {
+		if ($statusCode === false) {
 			// Translate from the DNDeployment.Status to the Resque job status for UI purposes
-			switch($this->Status) {
+			switch ($this->Status) {
 				case 'Finished':
 					return 'Complete';
 				case 'Started':

code/model/jobs/DNPing.php

Spacing +3 added lines, -3 removed lines

@@ -37,7 +37,7 @@ 
 	 * @return string
 	 */
 	public function LogLink() {
-		return $this->Link() . '/log';
+		return $this->Link().'/log';
 	}
 
 	/**
@@ -107,11 +107,11 @@ 
 			'pingID' => $this->ID
 		);
 
-		if(!$this->DeployerID) {
+		if (!$this->DeployerID) {
 			$this->DeployerID = Member::currentUserID();
 		}
 
-		if($this->DeployerID) {
+		if ($this->DeployerID) {
 			$deployer = $this->Deployer();
 			$message = sprintf(
 				'Ping to %s initiated by %s (%s)',

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