silverstripe / deploynaut

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

code/backends/CapistranoDeploymentBackend.php

Spacing +41 added lines, -41 removed lines

@@ -25,7 +25,7 @@ 
 
 		$currentBuild = $environment->CurrentBuild();
 		$currentSha = $currentBuild ? $currentBuild->SHA : '-';
-		if($currentSha !== $options['sha']) {
+		if ($currentSha !== $options['sha']) {
 			$strategy->setChange('Code version', $currentSha, $options['sha']);
 		}
 		$strategy->setActionTitle('Confirm deployment');
@@ -66,7 +66,7 @@ 
 
 		// Use a package generator if specified, otherwise run a direct deploy, which is the default behaviour
 		// if build_filename isn't specified
-		if($this->packageGenerator) {
+		if ($this->packageGenerator) {
 			$log->write(sprintf('Using package generator "%s"', get_class($this->packageGenerator)));
 
 			try {
@@ -76,7 +76,7 @@ 
 				throw $e;
 			}
 
-			if(empty($args['build_filename'])) {
+			if (empty($args['build_filename'])) {
 				throw new RuntimeException('Failed to generate package.');
 			}
 		}
@@ -119,14 +119,14 @@ 
 		$cleanup->run(function($type, $buffer) use($log) {
 			$log->write($buffer);
 		});
-		if(!$cleanup->isSuccessful()) {
+		if (!$cleanup->isSuccessful()) {
 			$this->extend('cleanupFailure', $environment, $sha, $log, $project);
 			$log->write('Warning: Cleanup failed, but fine to continue. Needs manual cleanup sometime.');
 		}
 
 		$this->extend('deployEnd', $environment, $sha, $log, $project);
 
-		if ($error!==null) {
+		if ($error !== null) {
 			throw new RuntimeException($error);
 		}
 
@@ -180,7 +180,7 @@ 
 		$command->run(function($type, $buffer) use($log) {
 			$log->write($buffer);
 		});
-		if(!$command->isSuccessful()) {
+		if (!$command->isSuccessful()) {
 			$this->extend('maintenanceEnableFailure', $environment, $log);
 			throw new RuntimeException($command->getErrorOutput());
 		}
@@ -196,7 +196,7 @@ 
 		$command->run(function($type, $buffer) use($log) {
 			$log->write($buffer);
 		});
-		if(!$command->isSuccessful()) {
+		if (!$command->isSuccessful()) {
 			$this->extend('maintenanceDisableFailure', $environment, $log);
 			throw new RuntimeException($command->getErrorOutput());
 		}
@@ -218,25 +218,25 @@ 
 	 * @inheritdoc
 	 */
 	public function dataTransfer(\DNDataTransfer $dataTransfer, \DeploynautLogFile $log) {
-		if($dataTransfer->Direction == 'get') {
+		if ($dataTransfer->Direction == 'get') {
 			$this->dataTransferBackup($dataTransfer, $log);
 		} else {
 			$environment = $dataTransfer->Environment();
 			$project = $environment->Project();
-			$workingDir = TEMP_FOLDER . DIRECTORY_SEPARATOR . 'deploynaut-transfer-' . $dataTransfer->ID;
+			$workingDir = TEMP_FOLDER.DIRECTORY_SEPARATOR.'deploynaut-transfer-'.$dataTransfer->ID;
 			$archive = $dataTransfer->DataArchive();
 
 			// extract the sspak contents, we'll need these so capistrano can restore that content
 			try {
 				$archive->extractArchive($workingDir);
-			} catch(Exception $e) {
+			} catch (Exception $e) {
 				$log->write($e->getMessage());
 				throw new RuntimeException($e->getMessage());
 			}
 
 			// validate the contents match the requested transfer mode
 			$result = $archive->validateArchiveContents($dataTransfer->Mode);
-			if(!$result->valid()) {
+			if (!$result->valid()) {
 				// do some cleaning, get rid of the extracted archive lying around
 				$process = new AbortableProcess(sprintf('rm -rf %s', escapeshellarg($workingDir)));
 				$process->setTimeout(120);
@@ -266,41 +266,41 @@ 
 		$name = $environment->getFullName();
 		$env = $environment->Project()->getProcessEnv();
 
-		if(!$args) {
+		if (!$args) {
 			$args = array();
 		}
-		$args['history_path'] = realpath(DEPLOYNAUT_LOG_PATH . '/');
+		$args['history_path'] = realpath(DEPLOYNAUT_LOG_PATH.'/');
 		$args['environment_id'] = $environment->ID;
 
 		// Inject env string directly into the command.
 		// Capistrano doesn't like the $process->setEnv($env) we'd normally do below.
 		$envString = '';
-		if(!empty($env)) {
+		if (!empty($env)) {
 			$envString .= 'env ';
-			foreach($env as $key => $value) {
+			foreach ($env as $key => $value) {
 				$envString .= "$key=\"$value\" ";
 			}
 		}
 
 		$data = DNData::inst();
 		// Generate a capfile from a template
-		$capTemplate = file_get_contents(BASE_PATH . '/deploynaut/Capfile.template');
+		$capTemplate = file_get_contents(BASE_PATH.'/deploynaut/Capfile.template');
 		$cap = str_replace(
 			array('<config root>', '<ssh key>', '<base path>'),
 			array($data->getEnvironmentDir(), DEPLOYNAUT_SSH_KEY, BASE_PATH),
 			$capTemplate
 		);
 
-		if(defined('DEPLOYNAUT_CAPFILE')) {
+		if (defined('DEPLOYNAUT_CAPFILE')) {
 			$capFile = DEPLOYNAUT_CAPFILE;
 		} else {
-			$capFile = ASSETS_PATH . '/Capfile';
+			$capFile = ASSETS_PATH.'/Capfile';
 		}
 		file_put_contents($capFile, $cap);
 
-		$command = "{$envString}cap -f " . escapeshellarg($capFile) . " -vv $name $action ROLES=$roles";
-		foreach($args as $argName => $argVal) {
-			$command .= ' -s ' . escapeshellarg($argName) . '=' . escapeshellarg($argVal);
+		$command = "{$envString}cap -f ".escapeshellarg($capFile)." -vv $name $action ROLES=$roles";
+		foreach ($args as $argName => $argVal) {
+			$command .= ' -s '.escapeshellarg($argName).'='.escapeshellarg($argVal);
 		}
 
 		$log->write(sprintf('Running command: %s', $command));
@@ -334,16 +334,16 @@ 
 		$filepathBase = $dataArchive->generateFilepath($dataTransfer);
 		mkdir($filepathBase, 0700, true);
 
-		$databasePath = $filepathBase . DIRECTORY_SEPARATOR . 'database.sql.gz';
+		$databasePath = $filepathBase.DIRECTORY_SEPARATOR.'database.sql.gz';
 
 		// Backup database
-		if(in_array($dataTransfer->Mode, array('all', 'db'))) {
+		if (in_array($dataTransfer->Mode, array('all', 'db'))) {
 			$log->write(sprintf('Backup of database from "%s" started', $name));
 			$command = $this->getCommand('data:getdb', 'db', $environment, array('data_path' => $databasePath), $log);
 			$command->run(function($type, $buffer) use($log) {
 				$log->write($buffer);
 			});
-			if(!$command->isSuccessful()) {
+			if (!$command->isSuccessful()) {
 				$this->extend('dataTransferFailure', $environment, $log);
 				throw new RuntimeException($command->getErrorOutput());
 			}
@@ -351,13 +351,13 @@ 
 		}
 
 		// Backup assets
-		if(in_array($dataTransfer->Mode, array('all', 'assets'))) {
+		if (in_array($dataTransfer->Mode, array('all', 'assets'))) {
 			$log->write(sprintf('Backup of assets from "%s" started', $name));
 			$command = $this->getCommand('data:getassets', 'web', $environment, array('data_path' => $filepathBase), $log);
 			$command->run(function($type, $buffer) use($log) {
 				$log->write($buffer);
 			});
-			if(!$command->isSuccessful()) {
+			if (!$command->isSuccessful()) {
 				$this->extend('dataTransferFailure', $environment, $log);
 				throw new RuntimeException($command->getErrorOutput());
 			}
@@ -372,12 +372,12 @@ 
 		$log->write('Creating sspak...');
 
 		$sspakFilename = sprintf('%s.sspak', $dataArchive->generateFilename($dataTransfer));
-		$sspakFilepath = $filepathBase . DIRECTORY_SEPARATOR . $sspakFilename;
+		$sspakFilepath = $filepathBase.DIRECTORY_SEPARATOR.$sspakFilename;
 
 		try {
 			$dataArchive->attachFile($sspakFilepath, $dataTransfer);
 			$dataArchive->setArchiveFromFiles($filepathBase);
-		} catch(Exception $e) {
+		} catch (Exception $e) {
 			$log->write($e->getMessage());
 			throw new RuntimeException($e->getMessage());
 		}
@@ -388,7 +388,7 @@ 
 		$process = new AbortableProcess(sprintf('rm -rf %s/assets && rm -f %s', escapeshellarg($filepathBase), escapeshellarg($databasePath)));
 		$process->setTimeout(120);
 		$process->run();
-		if(!$process->isSuccessful()) {
+		if (!$process->isSuccessful()) {
 			$log->write('Could not delete temporary files');
 			throw new RuntimeException($process->getErrorOutput());
 		}
@@ -407,7 +407,7 @@ 
 		$command->run(function($type, $buffer) use($log) {
 			$log->write($buffer);
 		});
-		if(!$command->isSuccessful()) {
+		if (!$command->isSuccessful()) {
 			$log->write(sprintf('Rebuild of "%s" failed: %s', $name, $command->getErrorOutput()));
 			throw new RuntimeException($command->getErrorOutput());
 		}
@@ -437,14 +437,14 @@ 
 		};
 
 		// Restore database into target environment
-		if(in_array($dataTransfer->Mode, array('all', 'db'))) {
+		if (in_array($dataTransfer->Mode, array('all', 'db'))) {
 			$log->write(sprintf('Restore of database to "%s" started', $name));
-			$args = array('data_path' => $workingDir . DIRECTORY_SEPARATOR . 'database.sql');
+			$args = array('data_path' => $workingDir.DIRECTORY_SEPARATOR.'database.sql');
 			$command = $this->getCommand('data:pushdb', 'db', $environment, $args, $log);
 			$command->run(function($type, $buffer) use($log) {
 				$log->write($buffer);
 			});
-			if(!$command->isSuccessful()) {
+			if (!$command->isSuccessful()) {
 				$cleanupFn();
 				$log->write(sprintf('Restore of database to "%s" failed: %s', $name, $command->getErrorOutput()));
 				$this->extend('dataTransferFailure', $environment, $log);
@@ -454,14 +454,14 @@ 
 		}
 
 		// Restore assets into target environment
-		if(in_array($dataTransfer->Mode, array('all', 'assets'))) {
+		if (in_array($dataTransfer->Mode, array('all', 'assets'))) {
 			$log->write(sprintf('Restore of assets to "%s" started', $name));
-			$args = array('data_path' => $workingDir . DIRECTORY_SEPARATOR . 'assets');
+			$args = array('data_path' => $workingDir.DIRECTORY_SEPARATOR.'assets');
 			$command = $this->getCommand('data:pushassets', 'web', $environment, $args, $log);
 			$command->run(function($type, $buffer) use($log) {
 				$log->write($buffer);
 			});
-			if(!$command->isSuccessful()) {
+			if (!$command->isSuccessful()) {
 				$cleanupFn();
 				$log->write(sprintf('Restore of assets to "%s" failed: %s', $name, $command->getErrorOutput()));
 				$this->extend('dataTransferFailure', $environment, $log);
@@ -486,7 +486,7 @@ 
 		$timeout = 600;
 		$tick = 60;
 
-		if(!$url) {
+		if (!$url) {
 			$log->write('Skipping site accessible check: no URL found.');
 			return true;
 		}
@@ -517,7 +517,7 @@ 
 		// query the site every second. Note that if the URL doesn't respond,
 		// curl_exec will take 5 seconds to timeout (see CURLOPT_CONNECTTIMEOUT and CURLOPT_TIMEOUT above)
 		do {
-			if(time() > $start + $timeout) {
+			if (time() > $start + $timeout) {
 				$log->write(sprintf(' * Failed: check for %s timed out after %smin', $url, $timeout / 60));
 				return false;
 			}
@@ -526,13 +526,13 @@ 
 
 			// check the HTTP response code for HTTP protocols
 			$status = curl_getinfo($ch, CURLINFO_HTTP_CODE);
-			if($status && !in_array($status, [500, 501, 502, 503, 504])) {
+			if ($status && !in_array($status, [500, 501, 502, 503, 504])) {
 				$success = true;
 			}
 
 			// check for any curl errors, mostly for checking the response state of non-HTTP protocols,
 			// but applies to checks of any protocol
-			if($response && !curl_errno($ch)) {
+			if ($response && !curl_errno($ch)) {
 				$success = true;
 			}
 
@@ -560,7 +560,7 @@ 
 			}
 
 			sleep(1);
-		} while(!$success);
+		} while (!$success);
 
 		curl_close($ch);
 		$log->write(' * Success: site is accessible!');

code/tasks/MigrateDeploymentBranchTask.php

Spacing +2 added lines, -2 removed lines

@@ -4,8 +4,8 @@
 
 	public function run($request) {
 		$log = function($message) {
-			$message = sprintf('[%s] ', date('Y-m-d H:i:s')) . $message;
-			echo $message . PHP_EOL;
+			$message = sprintf('[%s] ', date('Y-m-d H:i:s')).$message;
+			echo $message.PHP_EOL;
 		};
 
 		if (!Director::is_cli()) {