silverstripe / deploynaut

code/control/EnvironmentOverview.php

Spacing +3 added lines, -3 removed lines

@@ -63,9 +63,9 @@
 		$base = Director::absoluteBaseURL();
 		return [
 			'dispatchers' => [
-				'git' => $base . $this->getCurrentProject()->Link('git'),
-				'plan' => $base . $this->getCurrentEnvironment()->Link('plan'),
-				'deploys' => $base . $this->getCurrentEnvironment()->Link('deploys')
+				'git' => $base.$this->getCurrentProject()->Link('git'),
+				'plan' => $base.$this->getCurrentEnvironment()->Link('plan'),
+				'deploys' => $base.$this->getCurrentEnvironment()->Link('deploys')
 			],
 			'api_auth' => [
 				'name' => $this->getSecurityToken()->getName(),

code/control/DNDeploymentDispatcher.php

Spacing +1 added lines, -1 removed lines

@@ -96,7 +96,7 @@
 		// It gives a chance to perform a dry-run, and reject the transition, for example
 		// in case the user is unauthorised.
 			'finite.test_transition',
-			function (Finite\Event\TransitionEvent $e) use ($project) {
+			function(Finite\Event\TransitionEvent $e) use ($project) {
 				$code = null;
 
 				switch ($e->getTransition()->getName()) {

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.');
 			}
 		}
@@ -94,7 +94,7 @@ 
 				$log->write($buffer);
 			});
 
-			if(!$command->isSuccessful()) {
+			if (!$command->isSuccessful()) {
 				$self->extend('cleanupFailure', $environment, $sha, $log, $project);
 				$log->write('Warning: Cleanup failed, but fine to continue. Needs manual cleanup sometime.');
 			}
@@ -105,7 +105,7 @@ 
 		$this->enableMaintenance($environment, $log, $project);
 
 		$rolledBack = null;
-		if(!$command->isSuccessful() || !$this->smokeTest($environment, $log)) {
+		if (!$command->isSuccessful() || !$this->smokeTest($environment, $log)) {
 			$cleanupFn();
 			$this->extend('deployFailure', $environment, $sha, $log, $project);
 
@@ -171,7 +171,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());
 		}
@@ -187,7 +187,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());
 		}
@@ -209,25 +209,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);
@@ -257,41 +257,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));
@@ -325,16 +325,16 @@ 
 		$filepathBase = $dataArchive->generateFilepath($dataTransfer);
 		mkdir($filepathBase, 0700, true);
 
-		$databasePath = $filepathBase . DIRECTORY_SEPARATOR . 'database.sql';
+		$databasePath = $filepathBase.DIRECTORY_SEPARATOR.'database.sql';
 
 		// 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());
 			}
@@ -342,13 +342,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());
 			}
@@ -363,12 +363,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());
 		}
@@ -379,7 +379,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());
 		}
@@ -398,7 +398,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());
 		}
@@ -428,14 +428,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);
@@ -445,14 +445,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);
@@ -477,7 +477,7 @@ 
 		$timeout = 600;
 		$tick = 60;
 
-		if(!$url) {
+		if (!$url) {
 			$log->write('Skipping site accessible check: no URL found.');
 			return true;
 		}
@@ -508,7 +508,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;
 			}
@@ -517,13 +517,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;
 			}
 
@@ -551,7 +551,7 @@ 
 			}
 
 			sleep(1);
-		} while(!$success);
+		} while (!$success);
 
 		curl_close($ch);
 		$log->write(' * Success: site is accessible!');

code/backends/PackageGenerator.php

Spacing +4 added lines, -4 removed lines

@@ -50,14 +50,14 @@
 	 */
 	public function getPackageFilename($identifier, $sha, $repositoryDir, DeploynautLogFile $log) {
 		// Fetch through the cache
-		if($this->cache) {
-			$identifier .= '-' . get_class($this) . '-' . $this->getIdentifier();
+		if ($this->cache) {
+			$identifier .= '-'.get_class($this).'-'.$this->getIdentifier();
  			return $this->cache->getPackageFilename($this, $identifier, $sha, $repositoryDir, $log);
 
  		// Default, cacheless implementation
  		} else {
- 			$filename = TEMP_FOLDER . '/' . $sha . '.tar.gz';
- 			if($this->generatePackage($sha, $repositoryDir, $filename, $log)) {
+ 			$filename = TEMP_FOLDER.'/'.$sha.'.tar.gz';
+ 			if ($this->generatePackage($sha, $repositoryDir, $filename, $log)) {
  				return $filename;
  			}
  		}

code/backends/SimplePackageGenerator.php

Spacing +7 added lines, -7 removed lines

@@ -30,8 +30,8 @@ 
 	 * Generate the package
 	 */
 	public function generatePackage($sha, $baseDir, $outputFilename, DeploynautLogFile $log) {
-		$tempPath = TEMP_FOLDER . "/" . str_replace(".tar.gz", "", basename($outputFilename));
-		if(!file_exists($tempPath)) {
+		$tempPath = TEMP_FOLDER."/".str_replace(".tar.gz", "", basename($outputFilename));
+		if (!file_exists($tempPath)) {
 			mkdir($tempPath);
 		}
 
@@ -42,22 +42,22 @@ 
 		// Execute these in sequence until there's a failure
 		$processes = array(
 			// Export the relevant SHA into a temp folder
-			new AbortableProcess("git archive $sha | tar -x -C " . $escapedTempPath, $baseDir),
+			new AbortableProcess("git archive $sha | tar -x -C ".$escapedTempPath, $baseDir),
 			// Run build script
 			new AbortableProcess($this->buildScript, $tempPath, null, null, 3600),
 			// Compress the result
-			new AbortableProcess("tar -czf " . $escapedOutputFile . " " . $escapedTempDir, dirname($tempPath)),
+			new AbortableProcess("tar -czf ".$escapedOutputFile." ".$escapedTempDir, dirname($tempPath)),
 		);
 
 		// Call at the end, regardless of success or failure
 		$cleanup = array(
 			// Delete the temporary staging folder
-			new AbortableProcess("rm -rf " . $escapedTempPath),
+			new AbortableProcess("rm -rf ".$escapedTempPath),
 		);
 
 		try {
 			$this->executeProcesses($processes, $log);
-		} catch(Exception $e) {
+		} catch (Exception $e) {
 			// Execute cleanup on failure
 			$this->executeProcesses($cleanup, $log);
 			throw $e;
@@ -75,7 +75,7 @@ 
 	 * @param DeploynautLogFile $log The log to send output to
 	 */
 	protected function executeProcesses($processes, DeploynautLogFile $log) {
-		foreach($processes as $process) {
+		foreach ($processes as $process) {
 			$process->mustRun(function($type, $buffer) use($log) {
 				$log->write($buffer);
 			});

code/backends/SizeRestrictedPackageCache.php

Spacing +13 added lines, -13 removed lines

@@ -48,25 +48,25 @@ 
 		$repositoryDir,
 		DeploynautLogFile $log
 	) {
-		if(!$this->baseDir) {
+		if (!$this->baseDir) {
 			throw new \LogicException("Can't use PackageCache without setting BaseDir");
 		}
 
-		$buildPath = $this->baseDir . '/' . $this->sanitiseDirName($identifier);
+		$buildPath = $this->baseDir.'/'.$this->sanitiseDirName($identifier);
 		$filename = "$buildPath/$sha.tar.gz";
 
-		if(!file_exists($this->baseDir)) {
-			if(!mkdir($this->baseDir)) {
+		if (!file_exists($this->baseDir)) {
+			if (!mkdir($this->baseDir)) {
 				throw new \LogicException("Can't create base dir {$this->baseDir}");
 			}
 		}
-		if(!file_exists($buildPath)) {
-			if(!mkdir($buildPath)) {
+		if (!file_exists($buildPath)) {
+			if (!mkdir($buildPath)) {
 				throw new \LogicException("Can't create build path $buildPath");
 			}
 		}
 
-		if(file_exists($filename)) {
+		if (file_exists($filename)) {
 			$log->write("Using previously generated package $filename");
 			// This will ensure that our cache garbage collection will remove least-recently-accessed,
 			// rather than oldest.
@@ -74,11 +74,11 @@ 
 			return $filename;
 
 		} else {
-			if($this->cacheSize) {
+			if ($this->cacheSize) {
 				$this->reduceDirSizeTo($buildPath, $this->cacheSize - 1, $log);
 			}
 
-			if($generator->generatePackage($sha, $repositoryDir, $filename, $log)) {
+			if ($generator->generatePackage($sha, $repositoryDir, $filename, $log)) {
 				return $filename;
 			}
 		}
@@ -103,14 +103,14 @@ 
 	 * @param DeploynautLogFile $log The log to send removal status messages to
 	 */
 	protected function reduceDirSizeTo($dir, $count, DeploynautLogFile $log) {
-		$files = glob($dir . '/*.tar.gz');
-		if(sizeof($files) > $count) {
+		$files = glob($dir.'/*.tar.gz');
+		if (sizeof($files) > $count) {
 			usort($files, function($a, $b) {
 				return filemtime($a) > filemtime($b);
 			});
 
-			for($i = 0; $i < sizeof($files) - $count; $i++) {
-				$log->write("Removing " . $files[$i] . " from package cache");
+			for ($i = 0; $i < sizeof($files) - $count; $i++) {
+				$log->write("Removing ".$files[$i]." from package cache");
 				unlink($files[$i]);
 			}
 		}

code/backends/DemoDeploymentBackend.php

Spacing +2 added lines, -2 removed lines

@@ -41,7 +41,7 @@ 
 
 		$file = sprintf('%s/%s.deploy-history.txt', DEPLOYNAUT_LOG_PATH, $environment->getFullName());
 		$CLI_file = escapeshellarg($file);
-		$CLI_line = escapeshellarg(date('Y-m-d H:i:s') . " => $sha");
+		$CLI_line = escapeshellarg(date('Y-m-d H:i:s')." => $sha");
 
 		// Put maintenance page up
 		$this->enableMaintenance($environment, $log, $project);
@@ -54,7 +54,7 @@ 
 		$log->write("Well, that was a waste of time");
 
 		// Once the deployment has run it's necessary to update the maintenance page status
-		if(!empty($options['leaveMaintenancePage'])) {
+		if (!empty($options['leaveMaintenancePage'])) {
 			$this->enableMaintenance($environment, $log, $project);
 		} else {
 			// Remove maintenance page if we want it to

code/events/GenericEvent.php

Spacing +1 added lines, -1 removed lines

@@ -70,7 +70,7 @@
 	 * @return string
 	 */
 	public function get($keyname) {
-		if(array_key_exists($keyname, $this->data)) {
+		if (array_key_exists($keyname, $this->data)) {
 			return $this->data[$keyname];
 		}
 		return '';

code/api/nouns/APINoun.php

Spacing +5 added lines, -5 removed lines

@@ -59,7 +59,7 @@ 
 	 */
 	protected function getAPIResponse($output) {
 		$response = $this->getResponse();
-		if($this->respondWithText()) {
+		if ($this->respondWithText()) {
 			$body = print_r($output, true);
 			$response->addHeader('Content-Type', 'text/plain');
 		} else {
@@ -74,10 +74,10 @@ 
 	 * @return boolean
 	 */
 	protected function respondWithJSON() {
-		if($this->getRequest()->getExtension() == 'json') {
+		if ($this->getRequest()->getExtension() == 'json') {
 			return true;
 		}
-		if(strpos($this->getRequest()->getHeader('Accept'), 'application/json') !== false) {
+		if (strpos($this->getRequest()->getHeader('Accept'), 'application/json') !== false) {
 			return true;
 		}
 		return false;
@@ -87,10 +87,10 @@ 
 	 * @return boolean
 	 */
 	protected function respondWithText() {
-		if($this->getRequest()->getExtension() == 'txt') {
+		if ($this->getRequest()->getExtension() == 'txt') {
 			return true;
 		}
-		if(strpos($this->getRequest()->getHeader('Accept'), 'text/plain') !== false) {
+		if (strpos($this->getRequest()->getHeader('Accept'), 'text/plain') !== false) {
 			return true;
 		}
 		return false;