silverstripe / deploynaut

code/backends/DeploymentStrategy.php

Spacing +3 added lines, -3 removed lines

@@ -130,10 +130,10 @@
 	 */
 	public function getChangesModificationNeeded() {
 		$filtered = [];
-		foreach ($this->changes as $change => $details) {
-			if (array_key_exists('description', $details)) {
+		foreach($this->changes as $change => $details) {
+			if(array_key_exists('description', $details)) {
 				$filtered[$change] = $details;
-			} else if (
+			} else if(
 				(array_key_exists('from', $details) || array_key_exists('to', $details))
 				&& $details['from'] !== $details['to']
 			) {

code/control/Dispatcher.php

Spacing +2 added lines, -2 removed lines

@@ -63,7 +63,7 @@ 
 	 */
 	public function asJSONValidatorErrors($code, $validatorErrors) {
 		$fieldErrors = [];
-		foreach ($validatorErrors as $error) {
+		foreach($validatorErrors as $error) {
 			$fieldErrors[$error['fieldName']] = $error['message'];
 		}
 		return $this->asJSONFormFieldErrors($code, $fieldErrors);
@@ -105,7 +105,7 @@ 
 		// To get around that, upon spotting an active redirect, we change the response code to 200,
 		// and move the redirect into the "RedirectTo" field in the JSON response. Frontend can
 		// then interpret this and trigger a redirect.
-		if ($this->redirectedTo()) {
+		if($this->redirectedTo()) {
 			$data['RedirectTo'] = $this->response->getHeader('Location');
 			// Pop off the header - we are no longer redirecting via the usual mechanism.
 			$this->response->removeHeader('Location');

code/extensions/FrontendLink.php

Spacing +1 added lines, -1 removed lines

@@ -3,7 +3,7 @@
 class FrontendLink extends DataExtension {
 
 	public function updateItemEditForm($form) {
-		if ($this->owner->record->hasMethod('Link')) {
+		if($this->owner->record->hasMethod('Link')) {
 			$link = sprintf(
 				'<a style="margin: 0.5em" target="deploynaut-frontend" href="%s">Preview &raquo;</a>',
 				$this->owner->record->Link()

code/model/DNDataArchive.php

Spacing +4 added lines, -4 removed lines

@@ -229,7 +229,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);
 		}
@@ -250,7 +250,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);
 		}
@@ -437,7 +437,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 Process('gunzip database.sql.gz', $workingDir);
 			$process->setTimeout(3600);
 			$process->run();
@@ -448,7 +448,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 Process('tar xzf assets.tar.gz', $workingDir);
 			$process->setTimeout(3600);
 			$process->run();

code/model/DNProject.php

Spacing +13 added lines, -13 removed lines

@@ -262,7 +262,7 @@ 
 	 * @return bool
 	 */
 	public function canRestore($member = null) {
-		if ($this->allowedAny(
+		if($this->allowedAny(
 			array(
 				DNRoot::ALLOW_PROD_SNAPSHOT,
 				DNRoot::ALLOW_NON_PROD_SNAPSHOT
@@ -282,7 +282,7 @@ 
 	 * @return bool
 	 */
 	public function canBackup($member = null) {
-		if ($this->allowedAny(
+		if($this->allowedAny(
 			array(
 				DNRoot::ALLOW_PROD_SNAPSHOT,
 				DNRoot::ALLOW_NON_PROD_SNAPSHOT
@@ -302,7 +302,7 @@ 
 	 * @return bool
 	 */
 	public function canUploadArchive($member = null) {
-		if ($this->allowedAny(
+		if($this->allowedAny(
 			array(
 				DNRoot::ALLOW_PROD_SNAPSHOT,
 				DNRoot::ALLOW_NON_PROD_SNAPSHOT
@@ -322,7 +322,7 @@ 
 	 * @return bool
 	 */
 	public function canDownloadArchive($member = null) {
-		if ($this->allowedAny(
+		if($this->allowedAny(
 			array(
 				DNRoot::ALLOW_PROD_SNAPSHOT,
 				DNRoot::ALLOW_NON_PROD_SNAPSHOT
@@ -391,7 +391,7 @@ 
 			// Key-pair is available, use it.
 			$processEnv = array(
 				'IDENT_KEY' => $this->getPrivateKeyPath(),
-				'GIT_SSH' => BASE_PATH . "/deploynaut/git-deploy.sh"
+				'GIT_SSH' => BASE_PATH."/deploynaut/git-deploy.sh"
 			);
 		} else {
 			$processEnv = array();
@@ -746,7 +746,7 @@ 
 	 */
 	public function getPublicKeyPath() {
 		if($privateKey = $this->getPrivateKeyPath()) {
-			return $privateKey . '.pub';
+			return $privateKey.'.pub';
 		}
 		return null;
 	}
@@ -761,7 +761,7 @@ 
 		if(!empty($keyDir)) {
 			$filter = FileNameFilter::create();
 			$name = $filter->filter($this->Name);
-			return $keyDir . '/' . $name;
+			return $keyDir.'/'.$name;
 		}
 		return null;
 	}
@@ -780,7 +780,7 @@ 
 		$filter = FileNameFilter::create();
 		$name = $filter->filter($this->Name);
 
-		return $this->DNData()->getKeyDir() . '/' . $name;
+		return $this->DNData()->getKeyDir().'/'.$name;
 	}
 
 	/**
@@ -869,7 +869,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];
 
@@ -880,10 +880,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;
@@ -987,14 +987,14 @@ 
 	 * @return bool
 	 */
 	public function allowedAny($codes, $member = null) {
-		if (!$member) {
+		if(!$member) {
 			$member = Member::currentUser();
 		}
 
 		if(Permission::checkMember($member, 'ADMIN')) return true;
 
 		$hits = $this->whoIsAllowedAny($codes)->filter('Member.ID', $member->ID)->count();
-		return ($hits>0 ? true : false);
+		return ($hits > 0 ? true : false);
 	}
 
 	/**

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

code/model/DNBranch.php

Spacing +1 added lines, -1 removed lines

@@ -55,7 +55,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/jobs/DNPing.php

Spacing +1 added lines, -1 removed lines

@@ -37,7 +37,7 @@
 	 * @return string
 	 */
 	public function LogLink() {
-		return $this->Link() . '/log';
+		return $this->Link().'/log';
 	}
 
 	/**

code/model/jobs/DNCreateEnvironment.php

Spacing +2 added lines, -2 removed lines

@@ -68,7 +68,7 @@ 
 	 * @return string
 	 */
 	public function LogLink() {
-		return $this->Link() . '/log';
+		return $this->Link().'/log';
 	}
 
 	/**
@@ -190,7 +190,7 @@ 
 			if($env instanceof EnvironmentCreateBackend) {
 				return $env;
 			} else {
-				throw new Exception("Invalid backend: " . $data['EnvironmentType']);
+				throw new Exception("Invalid backend: ".$data['EnvironmentType']);
 			}
 		}
 		return null;