silverstripe / deploynaut

code/control/DeployForm.php

Spacing +2 added lines, -2 removed lines

@@ -94,7 +94,7 @@ 
 				substr($sha, 0, 8),
 				$branch->LastUpdated()->TimeDiff()
 			);
-			$branches[$sha . '-' . $name] = $branchValue;
+			$branches[$sha.'-'.$name] = $branchValue;
 		}
 
 		// Tags
@@ -107,7 +107,7 @@ 
 				substr($sha, 0, 8),
 				$branch->LastUpdated()->TimeDiff()
 			);
-			$tags[$sha . '-' . $name] = $tagValue;
+			$tags[$sha.'-'.$name] = $tagValue;
 		}
 		$tags = array_reverse($tags);
 

code/api/DeploynautAPIFormatter.php

Indentation -1 removed lines

@@ -117,7 +117,6 @@
 
 	/**
 	 * Return data about a particular {@link Member} of the stack for use in API response.
-
 	 * Notes:
 	 * 1) This method returns null instead of an array if the member doesn't exists anymore
 	 * 2) 'role' can be null in the response. This is the case of an admin, or an operations

Spacing +2 added lines, -2 removed lines

@@ -40,7 +40,7 @@ 
 		$startedNice = null;
 		$startedAgo = null;
 		// we check first, before we do a expensive ->Nice() and ->Ago()
-		if(!$deployment->DeployStarted) {
+		if (!$deployment->DeployStarted) {
 			$started = $deployment->Created;
 			$startedNice = $deployment->obj('Created')->Nice();
 			$startedAgo = $deployment->obj('Created')->Ago();
@@ -145,7 +145,7 @@ 
 			self::$_cache_members[$memberID] = \DataObject::get_by_id("Member", $memberID);
 		}
 
-		if(!self::$_cache_members[$memberID]) {
+		if (!self::$_cache_members[$memberID]) {
 			return null;
 		}
 

code/control/EnvironmentOverview.php

Spacing +4 added lines, -4 removed lines

@@ -82,11 +82,11 @@
 
 		$base = Director::absoluteBaseURL();
 		return [
-			'basename' => Director::baseURL() . $this->getCurrentEnvironment()->Link(self::ACTION_OVERVIEW),
+			'basename' => Director::baseURL().$this->getCurrentEnvironment()->Link(self::ACTION_OVERVIEW),
 			'dispatchers' => [
-				'git' => $base . $this->getCurrentProject()->Link('git'),
-				'deploys' => $base . $this->getCurrentEnvironment()->Link('deploys'),
-				'approvals' => $base . $this->getCurrentEnvironment()->Link('approvals')
+				'git' => $base.$this->getCurrentProject()->Link('git'),
+				'deploys' => $base.$this->getCurrentEnvironment()->Link('deploys'),
+				'approvals' => $base.$this->getCurrentEnvironment()->Link('approvals')
 			],
 			'api_auth' => [
 				'name' => $this->getSecurityToken()->getName(),

code/model/DNProject.php

Spacing +25 added lines, -25 removed lines

@@ -162,7 +162,7 @@ 
 		$cache = self::get_git_cache();
 		// we only need to clear the tag cache since everything else is cached by SHA, that is for commit and
 		// commit message.
-		$cache->clean(Zend_Cache::CLEANING_MODE_MATCHING_TAG, ['gitonomy', 'tags', 'project_' . $this->ID]);
+		$cache->clean(Zend_Cache::CLEANING_MODE_MATCHING_TAG, ['gitonomy', 'tags', 'project_'.$this->ID]);
 	}
 
 	/**
@@ -333,7 +333,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();
 	}
@@ -354,7 +354,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();
 	}
@@ -375,7 +375,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();
 	}
@@ -396,7 +396,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();
 	}
@@ -455,7 +455,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 = [];
@@ -543,7 +543,7 @@ 
 
 		$currentMember = self::$_current_member_cache;
 		return $this->Environments()
-			->filterByCallBack(function ($item) use ($currentMember) {
+			->filterByCallBack(function($item) use ($currentMember) {
 				return $item->canView($currentMember);
 			});
 	}
@@ -562,14 +562,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];
 	}
 
 	/**
@@ -823,7 +823,7 @@ 
 	 */
 	public function getPublicKeyPath() {
 		if ($privateKey = $this->getPrivateKeyPath()) {
-			return $privateKey . '.pub';
+			return $privateKey.'.pub';
 		}
 		return null;
 	}
@@ -838,7 +838,7 @@ 
 		if (!empty($keyDir)) {
 			$filter = FileNameFilter::create();
 			$name = $filter->filter($this->Name);
-			return $keyDir . '/' . $name;
+			return $keyDir.'/'.$name;
 		}
 		return null;
 	}
@@ -857,7 +857,7 @@ 
 		$filter = FileNameFilter::create();
 		$name = $filter->filter($this->Name);
 
-		return $this->DNData()->getKeyDir() . '/' . $name;
+		return $this->DNData()->getKeyDir().'/'.$name;
 	}
 
 	/**
@@ -883,7 +883,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];
 
@@ -894,10 +894,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;
@@ -1024,7 +1024,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);
 			});
 
@@ -1109,11 +1109,11 @@ 
 			return false;
 		}
 
-		$cachekey = $this->ID . '_commit_' . $sha;
+		$cachekey = $this->ID.'_commit_'.$sha;
 		$cache = self::get_git_cache();
 		if (!($result = $cache->load($cachekey))) {
 			$result = $repo->getCommit($sha);
-			$cache->save($result, $cachekey, ['gitonomy', 'commit', 'project_' . $this->ID]);
+			$cache->save($result, $cachekey, ['gitonomy', 'commit', 'project_'.$this->ID]);
 		}
 		return $result;
 	}
@@ -1123,11 +1123,11 @@ 
 	 * @return string
 	 */
 	public function getCommitMessage(\Gitonomy\Git\Commit $commit) {
-		$cachekey = $this->ID . '_message_' . $commit->getRevision();
+		$cachekey = $this->ID.'_message_'.$commit->getRevision();
 		$cache = self::get_git_cache();
 		if (!($result = $cache->load($cachekey))) {
 			$result = $commit->getMessage();
-			$cache->save($result, $cachekey, ['gitonomy', 'message', 'project_' . $this->ID]);
+			$cache->save($result, $cachekey, ['gitonomy', 'message', 'project_'.$this->ID]);
 		}
 		return $result;
 	}
@@ -1139,11 +1139,11 @@ 
 	 * @return string
 	 */
 	public function getCommitSubjectMessage(\Gitonomy\Git\Commit $commit) {
-		$cachekey = $this->ID . '_message_subject' . $commit->getRevision();
+		$cachekey = $this->ID.'_message_subject'.$commit->getRevision();
 		$cache = self::get_git_cache();
 		if (!($result = $cache->load($cachekey))) {
 			$result = $commit->getSubjectMessage();
-			$cache->save($result, $cachekey, ['gitonomy', 'message', 'project_' . $this->ID]);
+			$cache->save($result, $cachekey, ['gitonomy', 'message', 'project_'.$this->ID]);
 		}
 		return $result;
 	}
@@ -1153,14 +1153,14 @@ 
 	 * @return mixed
 	 */
 	public function getCommitTags(\Gitonomy\Git\Commit $commit) {
-		$cachekey = $this->ID . '_tags_' . $commit->getRevision();
+		$cachekey = $this->ID.'_tags_'.$commit->getRevision();
 		$cache = self::get_git_cache();
 		$result = $cache->load($cachekey);
 		// we check against false, because in many cases the tag list is an empty array
 		if ($result === false) {
 			$repo = $this->getRepository();
 			$result = $repo->getReferences()->resolveTags($commit->getRevision());
-			$cache->save($result, $cachekey, ['gitonomy', 'tags', 'project_' . $this->ID]);
+			$cache->save($result, $cachekey, ['gitonomy', 'tags', 'project_'.$this->ID]);
 		}
 		return $result;
 	}