silverstripe / deploynaut

code/model/jobs/DNDataTransfer.php

Spacing +5 added lines, -5 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() {
@@ -233,14 +233,14 @@ 
 		$envName = $this->Environment()->getFullName();
 		if($this->Direction == 'get') {
 			if($this->Origin == 'ManualUpload') {
-				$description = 'Manual upload of ' . $this->getModeNice() . ' to ' . $envName;
+				$description = 'Manual upload of '.$this->getModeNice().' to '.$envName;
 			} elseif($this->IsBackupDataTransfer()) {
-				$description = 'Automated backup of ' . $this->getModeNice() . ' from ' . $envName;
+				$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;

code/model/DNBranch.php

Spacing +3 added lines, -3 removed lines

@@ -50,19 +50,19 @@
 	 * @return string
 	 */
 	public function Name() {
-		return (string) htmlentities($this->branch->getName());
+		return (string)htmlentities($this->branch->getName());
 	}
 
 	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()));
 	}
 
 	/**
 	 * @return string
 	 */
 	public function SHA() {
-		return (string) htmlentities($this->branch->getCommit()->getHash());
+		return (string)htmlentities($this->branch->getCommit()->getHash());
 	}
 
 	/**

code/model/jobs/DNDeployment.php

Spacing +2 added lines, -2 removed lines

@@ -101,7 +101,7 @@ 
 	}
 
 	public function LogLink() {
-		return $this->Link() . '/log';
+		return $this->Link().'/log';
 	}
 
 	public function canView($member = null) {
@@ -176,7 +176,7 @@ 
 		if (!$interface) {
 			return null;
 		}
-		return $interface->CommitURL . '/' . $this->SHA;
+		return $interface->CommitURL.'/'.$this->SHA;
 	}
 
 	/**

code/model/DNDataArchive.php

Spacing +6 added lines, -6 removed lines

@@ -227,7 +227,7 @@ 
 			return false;
 		}
 
-		$key = $memberID . '-' . $this->EnvironmentID;
+		$key = $memberID.'-'.$this->EnvironmentID;
 		if (!isset(self::$_cache_can_restore[$key])) {
 			self::$_cache_can_restore[$key] = $this->Environment()->canUploadArchive($member);
 		}
@@ -248,7 +248,7 @@ 
 			return false;
 		}
 
-		$key = $memberID . '-' . $this->EnvironmentID;
+		$key = $memberID.'-'.$this->EnvironmentID;
 		if (!isset(self::$_cache_can_download[$key])) {
 			self::$_cache_can_download[$key] = $this->Environment()->canDownloadArchive($member);
 		}
@@ -313,7 +313,7 @@ 
 	public function validTargetEnvironments() {
 		$archive = $this;
 		$envs = $this->Environment()->Project()->DNEnvironmentList()
-			->filterByCallback(function ($item) use ($archive) {
+			->filterByCallback(function($item) use ($archive) {
 				return $archive->EnvironmentID != $item->ID && $archive->canMoveTo($item);
 			});
 
@@ -407,7 +407,7 @@ 
 			mkdir($workingDir, 0700, true);
 		}
 
-		$cleanupFn = function () use ($workingDir) {
+		$cleanupFn = function() use ($workingDir) {
 			$process = new AbortableProcess(sprintf('rm -rf %s', escapeshellarg($workingDir)));
 			$process->setTimeout(120);
 			$process->run();
@@ -428,7 +428,7 @@ 
 		}
 
 		// Extract database.sql.gz to <workingdir>/database.sql
-		if (file_exists($workingDir . DIRECTORY_SEPARATOR . 'database.sql.gz')) {
+		if (file_exists($workingDir.DIRECTORY_SEPARATOR.'database.sql.gz')) {
 			$process = new AbortableProcess('gunzip database.sql.gz', $workingDir);
 			$process->setTimeout(3600);
 			$process->run();
@@ -439,7 +439,7 @@ 
 		}
 
 		// Extract assets.tar.gz to <workingdir>/assets/
-		if (file_exists($workingDir . DIRECTORY_SEPARATOR . 'assets.tar.gz')) {
+		if (file_exists($workingDir.DIRECTORY_SEPARATOR.'assets.tar.gz')) {
 			$process = new AbortableProcess('tar xzf assets.tar.gz', $workingDir);
 			$process->setTimeout(3600);
 			$process->run();

code/model/DNProject.php

Spacing +16 added lines, -16 removed lines

@@ -311,7 +311,7 @@ 
 			return true;
 		}
 
-		return (bool) $this->Environments()->filterByCallback(function ($env) use ($member) {
+		return (bool)$this->Environments()->filterByCallback(function($env) use ($member) {
 			return $env->canRestore($member);
 		})->Count();
 	}
@@ -332,7 +332,7 @@ 
 			return true;
 		}
 
-		return (bool) $this->Environments()->filterByCallback(function ($env) use ($member) {
+		return (bool)$this->Environments()->filterByCallback(function($env) use ($member) {
 			return $env->canBackup($member);
 		})->Count();
 	}
@@ -353,7 +353,7 @@ 
 			return true;
 		}
 
-		return (bool) $this->Environments()->filterByCallback(function ($env) use ($member) {
+		return (bool)$this->Environments()->filterByCallback(function($env) use ($member) {
 			return $env->canUploadArchive($member);
 		})->Count();
 	}
@@ -374,7 +374,7 @@ 
 			return true;
 		}
 
-		return (bool) $this->Environments()->filterByCallback(function ($env) use ($member) {
+		return (bool)$this->Environments()->filterByCallback(function($env) use ($member) {
 			return $env->canDownloadArchive($member);
 		})->Count();
 	}
@@ -433,7 +433,7 @@ 
 			// Key-pair is available, use it.
 			$processEnv = [
 				'IDENT_KEY' => $this->getPrivateKeyPath(),
-				'GIT_SSH' => BASE_PATH . "/deploynaut/git-deploy.sh"
+				'GIT_SSH' => BASE_PATH."/deploynaut/git-deploy.sh"
 			];
 		} else {
 			$processEnv = [];
@@ -521,7 +521,7 @@ 
 
 		$currentMember = self::$_current_member_cache;
 		return $this->Environments()
-			->filterByCallBack(function ($item) use ($currentMember) {
+			->filterByCallBack(function($item) use ($currentMember) {
 				return $item->canView($currentMember);
 			});
 	}
@@ -540,14 +540,14 @@ 
 	 * @return false|DNDeployment
 	 */
 	public function currentBuilds() {
-		if (!isset(self::$relation_cache['currentBuilds.' . $this->ID])) {
+		if (!isset(self::$relation_cache['currentBuilds.'.$this->ID])) {
 			$currentBuilds = [];
 			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];
 	}
 
 	/**
@@ -788,7 +788,7 @@ 
 	 */
 	public function getPublicKeyPath() {
 		if ($privateKey = $this->getPrivateKeyPath()) {
-			return $privateKey . '.pub';
+			return $privateKey.'.pub';
 		}
 		return null;
 	}
@@ -803,7 +803,7 @@ 
 		if (!empty($keyDir)) {
 			$filter = FileNameFilter::create();
 			$name = $filter->filter($this->Name);
-			return $keyDir . '/' . $name;
+			return $keyDir.'/'.$name;
 		}
 		return null;
 	}
@@ -822,7 +822,7 @@ 
 		$filter = FileNameFilter::create();
 		$name = $filter->filter($this->Name);
 
-		return $this->DNData()->getKeyDir() . '/' . $name;
+		return $this->DNData()->getKeyDir().'/'.$name;
 	}
 
 	/**
@@ -848,7 +848,7 @@ 
 		/* Look for each whitelisted hostname */
 		foreach ($interfaces as $host => $interface) {
 			/* See if the CVS Path is for this hostname, followed by some junk (maybe a port), then the path */
-			if (preg_match('{^[^.]*' . $host . '(.*?)([/a-zA-Z].+)}', $this->CVSPath, $match)) {
+			if (preg_match('{^[^.]*'.$host.'(.*?)([/a-zA-Z].+)}', $this->CVSPath, $match)) {
 
 				$path = $match[2];
 
@@ -859,10 +859,10 @@ 
 				$components = explode('.', $host);
 
 				foreach ($regex as $pattern => $replacement) {
-					$path = preg_replace('/' . $pattern . '/', $replacement, $path);
+					$path = preg_replace('/'.$pattern.'/', $replacement, $path);
 				}
 
-				$uxurl = Controller::join_links($scheme . '://', $host, $path);
+				$uxurl = Controller::join_links($scheme.'://', $host, $path);
 
 				if (array_key_exists('commit', $interface) && $interface['commit'] == false) {
 					$commiturl = false;
@@ -989,7 +989,7 @@ 
 		// {@see DataObject::extendedCan()}
 		$isDone = $this->extend('isProjectReady');
 		if ($isDone && is_array($isDone)) {
-			$isDone = array_filter($isDone, function ($val) {
+			$isDone = array_filter($isDone, function($val) {
 				return !is_null($val);
 			});
 

code/model/DNEnvironment.php

Spacing +9 added lines, -9 removed lines

@@ -774,7 +774,7 @@ 
 				->buildPermissionField('ArchiveUploaderGroups', 'ArchiveUploaders', $groups, $members)
 				->setTitle('Who can upload?')
 				->setDescription(
-					'Users who can upload archives linked to this environment into Deploynaut.<br />' .
+					'Users who can upload archives linked to this environment into Deploynaut.<br />'.
 					'Linking them to an environment allows limiting download permissions (see below).'
 				),
 
@@ -821,7 +821,7 @@ 
 		// Add actions
 		$action = new FormAction('check', 'Check Connection');
 		$action->setUseButtonTag(true);
-		$dataURL = Director::absoluteBaseURL() . 'naut/api/' . $this->Project()->Name . '/' . $this->Name . '/ping';
+		$dataURL = Director::absoluteBaseURL().'naut/api/'.$this->Project()->Name.'/'.$this->Name.'/ping';
 		$action->setAttribute('data-url', $dataURL);
 		$fields->insertBefore($action, 'Name');
 
@@ -834,8 +834,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();
@@ -885,7 +885,7 @@ 
 		if (!$this->Filename) {
 			return '';
 		}
-		return $this->DNData()->getEnvironmentDir() . '/' . $this->Project()->Name . '/' . $this->Filename;
+		return $this->DNData()->getEnvironmentDir().'/'.$this->Project()->Name.'/'.$this->Filename;
 	}
 
 	/**
@@ -947,9 +947,9 @@ 
 			if ($repo !== false) {
 				$commit = new \Gitonomy\Git\Commit($repo, $sha);
 				return [
-					'AuthorName' => (string) Convert::raw2xml($commit->getAuthorName()),
-					'AuthorEmail' => (string) Convert::raw2xml($commit->getAuthorEmail()),
-					'Message' => (string) Convert::raw2xml($commit->getMessage()),
+					'AuthorName' => (string)Convert::raw2xml($commit->getAuthorName()),
+					'AuthorEmail' => (string)Convert::raw2xml($commit->getAuthorEmail()),
+					'Message' => (string)Convert::raw2xml($commit->getMessage()),
 					'ShortHash' => Convert::raw2xml($commit->getFixedShortHash(8)),
 					'Hash' => Convert::raw2xml($commit->getHash())
 				];
@@ -1039,7 +1039,7 @@ 
 			&& $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);