silverstripe / deploynaut

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

code/model/DNCommit.php

Spacing +1 added lines, -1 removed lines

@@ -75,7 +75,7 @@
 	 * @return ArrayList
 	 */
 	public function References() {
-		if($this->references !== null ) {
+		if($this->references !== null) {
 			return $this->references;
 		}
 		$this->references = new ArrayList();

code/model/DNData.php

Spacing +4 added lines, -4 removed lines

@@ -165,13 +165,13 @@ 
 	public function getProjectPaths() {
 		$paths = array();
 		if(!file_exists($this->getEnvironmentDir())) {
-			throw new Exception('The environment directory '.$this->getEnvironmentDir().' doesn\'t exist. Create it first and add some projects to it.');
+			throw new Exception('The environment directory ' . $this->getEnvironmentDir() . ' doesn\'t exist. Create it first and add some projects to it.');
 		}
 		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!='..') {
+				$path = $this->getEnvironmentDir() . '/' . $project;
+				if(is_dir($path) && $project != '.' && $project != '..') {
 					$paths[] = $project;
 				}
 			}
@@ -189,7 +189,7 @@ 
 
 		$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/model/DNDataArchive.php

Spacing +3 added lines, -3 removed lines

@@ -254,7 +254,7 @@ 
 	 * @return boolean true if $member can upload archives linked to this environment, false if they can't.
 	 */
 	public function canMoveTo($targetEnv, $member = null) {
-		if ($this->Environment()->Project()->ID!=$targetEnv->Project()->ID) {
+		if($this->Environment()->Project()->ID != $targetEnv->Project()->ID) {
 			// We don't permit moving snapshots between projects at this stage.
 			return false;
 		}
@@ -266,7 +266,7 @@ 
 		if(Permission::checkMember($member, 'ADMIN')) return true;
 
 		// Checks if the user can actually access the archive.
-		if (!$this->canDownload($member)) return false;
+		if(!$this->canDownload($member)) return false;
 
 		// Hooks into ArchiveUploaders permission to prevent proliferation of permission checkboxes.
 		// Bypasses the quota check - we don't need to check for it as long as we move the snapshot within the project.
@@ -284,7 +284,7 @@ 
 		$archive = $this;
 		$envs = $this->Environment()->Project()->DNEnvironmentList()
 			->filterByCallback(function($item) use ($archive) {
-				return $archive->EnvironmentID!=$item->ID && $archive->canMoveTo($item);
+				return $archive->EnvironmentID != $item->ID && $archive->canMoveTo($item);
 			});
 
 		return $envs;

code/model/DNEnvironment.php

Spacing +17 added lines, -17 removed lines

@@ -107,9 +107,9 @@ 
 		"CanBackupGroups"   => "Group",
 		"ArchiveUploaders"   => "Member", // Who can upload archive files linked to this environment
 		"ArchiveUploaderGroups" => "Group",
-		"ArchiveDownloaders" => "Member",  // Who can download archive files from this environment
+		"ArchiveDownloaders" => "Member", // Who can download archive files from this environment
 		"ArchiveDownloaderGroups" => "Group",
-		"ArchiveDeleters"    => "Member",  // Who can delete archive files from this environment,
+		"ArchiveDeleters"    => "Member", // Who can delete archive files from this environment,
 		"ArchiveDeleterGroups" => "Group",
 		"PipelineApprovers"  => "Member", // Who can approve / reject pipelines from this environment
 		"PipelineApproverGroups" => "Group",
@@ -291,7 +291,7 @@ 
 	 */
 	public function CanCancelPipeline() {
 		// do we have a current pipeline
-		if ($this->HasCurrentPipeline()) {
+		if($this->HasCurrentPipeline()) {
 			return $this->CurrentPipeline()->canAbort();
 		}
 		return false;
@@ -599,22 +599,22 @@ 
 		// The DeployHistory function is far too slow to use for this
 		$deploy = DNDeployment::get()->filter(array('EnvironmentID' => $this->ID, 'Status' => 'Finished'))->sort('LastEdited DESC')->first();
 
-		if (!$deploy || (!$deploy->SHA)) {
+		if(!$deploy || (!$deploy->SHA)) {
 			return false;
 		}
 
 		$repo = $this->Project()->getRepository();
-		if (!$repo) {
+		if(!$repo) {
 			return $deploy;
 		}
 
 		try {
 			$commit = $repo->getCommit($deploy->SHA);
-			if ($commit) {
+			if($commit) {
 				$deploy->Message = Convert::raw2xml($commit->getMessage());
 			}
 			// We can't find this SHA, so we ignore adding a commit message to the deployment
-		} catch (Exception $ex) { }
+		} catch(Exception $ex) { }
 
 		return $deploy;
 	}
@@ -644,7 +644,7 @@ 
 					$deploy->Message = Convert::raw2xml($commit->getMessage());
 				}
 				// We can't find this SHA, so we ignore adding a commit message to the deployment
-			} catch (Exception $ex) { }
+			} catch(Exception $ex) { }
 			$ammendedHistory->push($deploy);
 		}
 
@@ -682,7 +682,7 @@ 
 	 * @return string
 	 */
 	public function Link() {
-		return $this->Project()->Link()."/environment/" . $this->Name;
+		return $this->Project()->Link() . "/environment/" . $this->Name;
 	}
 
 
@@ -887,7 +887,7 @@ 
 		// Add actions
 		$action = new FormAction('check', 'Check Connection');
 		$action->setUseButtonTag(true);
-		$action->setAttribute('data-url', Director::absoluteBaseURL().'naut/api/'.$this->Project()->Name.'/'.$this->Name.'/ping');
+		$action->setAttribute('data-url', Director::absoluteBaseURL() . 'naut/api/' . $this->Project()->Name . '/' . $this->Name . '/ping');
 		$fields->insertBefore($action, 'Name');
 
 		// Allow extensions
@@ -950,8 +950,8 @@ 
 	 */
 	public function onBeforeWrite() {
 		parent::onBeforeWrite();
-		if($this->Name && $this->Name.'.rb' != $this->Filename) {
-			$this->Filename = $this->Name.'.rb';
+		if($this->Name && $this->Name . '.rb' != $this->Filename) {
+			$this->Filename = $this->Name . '.rb';
 		}
 		$this->checkEnvironmentPath();
 		$this->writeConfigFile();
@@ -976,11 +976,11 @@ 
 		if(!$this->config()->get('allow_web_editing')) return;
 
 		// Create a basic new environment config from a template
-		if( !$this->envFileExists()
+		if(!$this->envFileExists()
 			&& $this->Filename
 			&& $this->CreateEnvConfig
 		) {
-			$templateFile = $this->config()->template_file ?: BASE_PATH.'/deploynaut/environment.template';
+			$templateFile = $this->config()->template_file ?: BASE_PATH . '/deploynaut/environment.template';
 			file_put_contents($this->getConfigFilename(), file_get_contents($templateFile));
 		} else if($this->envFileExists() && $this->DeployConfig) {
 			file_put_contents($this->getConfigFilename(), $this->DeployConfig);
@@ -1047,7 +1047,7 @@ 
 		if(!$this->Filename) {
 			return '';
 		}
-		return $this->DNData()->getEnvironmentDir().'/'.$this->Project()->Name.'/'.$this->Filename;
+		return $this->DNData()->getEnvironmentDir() . '/' . $this->Project()->Name . '/' . $this->Filename;
 	}
 
 	/**
@@ -1126,10 +1126,10 @@ 
 		$filter = isset($config->PipelineConfig->FilteredCommits)
 			? $config->PipelineConfig->FilteredCommits
 			: null;
-		if (empty($filter)) return null;
+		if(empty($filter)) return null;
 
 		// Create and execute filter
-		if (!class_exists($filter)) throw new Exception(sprintf("Class %s does not exist", $filter));
+		if(!class_exists($filter)) throw new Exception(sprintf("Class %s does not exist", $filter));
 		$commitClass = $filter::create();
 		// setup the environment to check for commits
 		$commitClass->env = $dependsOnEnv;

code/model/DNFilteredCommits.php

Spacing +2 added lines, -2 removed lines

@@ -43,7 +43,7 @@ 
 	}
 
 	public function getCommits() {
-		if (!isset($this->env)) {
+		if(!isset($this->env)) {
 			$this->environmentNotSetException();
 		}
 		$successfulCommits =
@@ -54,7 +54,7 @@ 
 	}
 
 	public function getLatestCommit() {
-		if (!isset($this->env)) {
+		if(!isset($this->env)) {
 			$this->environmentNotSetException();
 		}
 		$commits = $this->getCommits();

code/model/DNProject.php

Spacing +13 added lines, -13 removed lines

@@ -238,7 +238,7 @@ 
 	 * @return array
 	 */
 	public function getProcessEnv() {
-		if (file_exists($this->getPrivateKeyPath())) {
+		if(file_exists($this->getPrivateKeyPath())) {
 			// Key-pair is available, use it.
 			$processEnv = array(
 				'IDENT_KEY' => $this->getPrivateKeyPath(),
@@ -324,21 +324,21 @@ 
 	 * Returns a map of envrionment name to build name
 	 */
 	public function currentBuilds() {
-		if(!isset(self::$relation_cache['currentBuilds.'.$this->ID])) {
+		if(!isset(self::$relation_cache['currentBuilds.' . $this->ID])) {
 			$currentBuilds = array();
 			foreach($this->Environments() as $env) {
 				$currentBuilds[$env->Name] = $env->CurrentBuild();
 			}
-			self::$relation_cache['currentBuilds.'.$this->ID] = $currentBuilds;
+			self::$relation_cache['currentBuilds.' . $this->ID] = $currentBuilds;
 		}
-		return self::$relation_cache['currentBuilds.'.$this->ID];
+		return self::$relation_cache['currentBuilds.' . $this->ID];
 	}
 
 	/**
 	 *
 	 * @return string
 	 */
-	public function Link($action='') {
+	public function Link($action = '') {
 		return Controller::join_links("naut", "project", $this->Name, $action);
 	}
 
@@ -417,7 +417,7 @@ 
 	 * @return boolean
 	 */
 	public function projectFolderExists() {
-		if(file_exists($this->DNData()->getEnvironmentDir().'/'.$this->Name)) {
+		if(file_exists($this->DNData()->getEnvironmentDir() . '/' . $this->Name)) {
 			return true;
 		}
 		return false;
@@ -428,7 +428,7 @@ 
 	 * @return bool
 	 */
 	public function repoExists() {
-		return file_exists(DEPLOYNAUT_LOCAL_VCS_PATH . '/' . $this->Name.'/HEAD');
+		return file_exists(DEPLOYNAUT_LOCAL_VCS_PATH . '/' . $this->Name . '/HEAD');
 	}
 
 	/**
@@ -468,7 +468,7 @@ 
 	protected function checkProjectPath() {
 		// Create the project capistrano folder
 		if($this->CreateEnvFolder && !file_exists($this->getProjectFolderPath())) {
-			mkdir($this->DNData()->getEnvironmentDir().'/'.$this->Name);
+			mkdir($this->DNData()->getEnvironmentDir() . '/' . $this->Name);
 		}
 	}
 
@@ -477,10 +477,10 @@ 
 	 */
 	protected function checkCVSPath() {
 		$changedFields = $this->getChangedFields(true, 2);
-		if (!$this->CVSPath) {
+		if(!$this->CVSPath) {
 			return;
 		}
-		if (isset($changedFields['CVSPath']) || isset($changedFields['Name'])) {
+		if(isset($changedFields['CVSPath']) || isset($changedFields['Name'])) {
 			$this->cloneRepo();
 		}
 	}
@@ -511,7 +511,7 @@ 
 	public function getPublicKey() {
 		$key = $this->getPublicKeyPath();
 
-		if (file_exists($key)) {
+		if(file_exists($key)) {
 			return file_get_contents($key);
 		}
 	}
@@ -592,7 +592,7 @@ 
 	 */
 	public function getRepositoryURL() {
 		$showUrl = Config::inst()->get($this->class, 'show_repository_url');
-		if ($showUrl) {
+		if($showUrl) {
 			return $this->CVSPath;
 		}
 	}
@@ -602,6 +602,6 @@ 
 	 * @return string
 	 */
 	protected function getProjectFolderPath() {
-		return $this->DNData()->getEnvironmentDir().'/'.$this->Name;
+		return $this->DNData()->getEnvironmentDir() . '/' . $this->Name;
 	}
 }

code/model/GitonomyCache.php

Spacing +1 added lines, -1 removed lines

@@ -7,7 +7,7 @@
 	public static $cache = array();
 
 	public static function getIncludingBranches($commit) {
-		$cacheKey = 'getIncludingBranches-' .$commit->getRepository()->getPath() . '-' . $commit->gethash();
+		$cacheKey = 'getIncludingBranches-' . $commit->getRepository()->getPath() . '-' . $commit->gethash();
 		if(!isset(self::$cache[$cacheKey])) {
 			self::$cache[$cacheKey] = $commit->getIncludingBranches();
 		}