silverstripe / deploynaut

code/queuereport/ResqueJob.php

Spacing +1 added lines, -1 removed lines

@@ -60,7 +60,7 @@
 	 * @return mixed
 	 */
 	public function __get($property) {
-		if(isset($this->record[$property])) {
+		if (isset($this->record[$property])) {
 			return $this->record[$property];
 		}
 		return null;

code/queuereport/ResqueQueue.php

Spacing +7 added lines, -7 removed lines

@@ -49,20 +49,20 @@ 
 	protected function getJobs() {
 		$jobs = new ArrayList();
 
-		$resqueJobs = Resque::redis()->lrange('queue:' . $this->Name, 0, -1);
-		if(!$resqueJobs) {
+		$resqueJobs = Resque::redis()->lrange('queue:'.$this->Name, 0, -1);
+		if (!$resqueJobs) {
 			$jobs->push(new ResqueJob(array(
 				'Name' => 'null',
 				'Value' => 'null',
 			)));
 			return $jobs;
 		}
-		foreach($resqueJobs as $idx => $job) {
+		foreach ($resqueJobs as $idx => $job) {
 			$stdClass = json_decode($job);
-			if($stdClass->class === 'CapistranoDeploy' || $stdClass->class === 'DeployJob') {
+			if ($stdClass->class === 'CapistranoDeploy' || $stdClass->class === 'DeployJob') {
 				$value = $stdClass->args[0]->projectName
-					. ':' . $stdClass->args[0]->environment
-					. ' - ' . $stdClass->args[0]->sha;
+					. ':'.$stdClass->args[0]->environment
+					. ' - '.$stdClass->args[0]->sha;
 				$jobs->push(new ResqueJob(array(
 					'Name' => $stdClass->class,
 					'Value' => $value,
@@ -111,7 +111,7 @@ 
 	 * @return mixed
 	 */
 	public function __get($property) {
-		if(isset($this->record[$property])) {
+		if (isset($this->record[$property])) {
 			return $this->record[$property];
 		}
 		return null;

code/AbortableProcess.php

Spacing +1 added lines, -1 removed lines

@@ -15,7 +15,7 @@
 class AbortableProcess extends \Symfony\Component\Process\Process {
 	public function run($callback = null) {
 		$this->start($callback);
-		while($this->isRunning()) {
+		while ($this->isRunning()) {
 			$this->checkTimeout();
 			sleep(1);
 		}

code/jobs/DeployJob.php

Spacing +14 added lines, -14 removed lines

@@ -18,8 +18,8 @@ 
 	public function alarmHandler() {
 		$sigFile = $this->args['sigFile'];
 		if (file_exists($sigFile) && is_readable($sigFile) && is_writable($sigFile)) {
-			$signal = (int)file_get_contents($sigFile);
-			if (is_int($signal) && in_array((int)$signal, [
+			$signal = (int) file_get_contents($sigFile);
+			if (is_int($signal) && in_array((int) $signal, [
 				// The following signals are trapped by both Resque and Rainforest.
 				SIGTERM,
 				SIGINT,
@@ -30,7 +30,7 @@ 
 				SIGCONT
 			])) {
 				echo sprintf(
-					'[-] Signal "%s" received, delivering to own process group, PID "%s".' . PHP_EOL,
+					'[-] Signal "%s" received, delivering to own process group, PID "%s".'.PHP_EOL,
 					$signal,
 					getmypid()
 				);
@@ -40,9 +40,9 @@ 
 
 				// Dispatch to own process group.
 				$pgid = posix_getpgid(getmypid());
-				if ($pgid<=0) {
+				if ($pgid <= 0) {
 					echo sprintf(
-						'[-] Unable to send signal to invalid PGID "%s".' . PHP_EOL,
+						'[-] Unable to send signal to invalid PGID "%s".'.PHP_EOL,
 						$pgid
 					);
 				} else {
@@ -60,9 +60,9 @@ 
 		// to this job as a whole (including any subprocesses such as spawned by Symfony).
 		posix_setsid();
 
-		if(function_exists('pcntl_alarm') && function_exists('pcntl_signal')) {
+		if (function_exists('pcntl_alarm') && function_exists('pcntl_signal')) {
 			if (!empty($this->args['sigFile'])) {
-				echo sprintf('[-] Signal file requested, polling "%s".' . PHP_EOL, $this->args['sigFile']);
+				echo sprintf('[-] Signal file requested, polling "%s".'.PHP_EOL, $this->args['sigFile']);
 				declare(ticks = 1);
 				pcntl_signal(SIGALRM, [$this, 'alarmHandler']);
 				pcntl_alarm(1);
@@ -74,7 +74,7 @@ 
 	}
 
 	public function perform() {
-		echo "[-] DeployJob starting" . PHP_EOL;
+		echo "[-] DeployJob starting".PHP_EOL;
 		$log = new DeploynautLogFile($this->args['logfile']);
 
 		$deployment = DNDeployment::get()->byID($this->args['deploymentID']);
@@ -92,7 +92,7 @@ 
 		// deploy onto a clean environment will not be performing any backup regardless of
 		// whether the predeploy_backup option was passed or not.
 		// Sometimes predeploy_backup comes through as string false from the frontend.
-		if(
+		if (
 			!empty($this->args['predeploy_backup'])
 			&& $this->args['predeploy_backup'] !== 'false'
 			&& !empty($currentBuild)
@@ -114,7 +114,7 @@ 
 			// Disallow concurrent deployments (don't rely on queuing implementation to restrict this)
 			// Only consider deployments started in the last 30 minutes (older jobs probably got stuck)
 			$runningDeployments = $environment->runningDeployments()->exclude('ID', $this->args['deploymentID']);
-			if($runningDeployments->count()) {
+			if ($runningDeployments->count()) {
 				$runningDeployment = $runningDeployments->first();
 				$message = sprintf(
 					'Error: another deployment is in progress (started at %s by %s)',
@@ -134,14 +134,14 @@ 
 				// all options from the DeploymentStrategy merged in, including sha.
 				$this->args
 			);
-		} catch(Exception $e) {
+		} catch (Exception $e) {
 			// DeploynautJob will automatically trigger onFailure.
-			echo "[-] DeployJob failed" . PHP_EOL;
+			echo "[-] DeployJob failed".PHP_EOL;
 			throw $e;
 		}
 
 		$this->updateStatus(DNDeployment::TR_COMPLETE);
-		echo "[-] DeployJob finished" . PHP_EOL;
+		echo "[-] DeployJob finished".PHP_EOL;
 	}
 
 	public function onFailure(Exception $exception) {
@@ -160,7 +160,7 @@ 
 			DB::connect($databaseConfig);
 			$backupDataTransfer->Status = 'Finished';
 			$backupDataTransfer->write();
-		} catch(Exception $e) {
+		} catch (Exception $e) {
 			global $databaseConfig;
 			DB::connect($databaseConfig);
 			$backupDataTransfer->Status = 'Failed';

code/control/DeploynautLogFile.php

Spacing +3 added lines, -3 removed lines

@@ -45,7 +45,7 @@ 
 	 * @return string
 	 */
 	public function getRawFilePath() {
-		return $this->basePath . '/' . $this->logFile;
+		return $this->basePath.'/'.$this->logFile;
 	}
 
 	/**
@@ -53,7 +53,7 @@ 
 	 * @return string
 	 */
 	public function getSanitisedLogFilePath() {
-		return $this->basePath . '/' . strtolower(FileNameFilter::create()->filter($this->logFile));
+		return $this->basePath.'/'.strtolower(FileNameFilter::create()->filter($this->logFile));
 	}
 
 	/**
@@ -83,7 +83,7 @@ 
 		// Make sure we write into the old path for existing logs. New logs use the sanitised file path instead.
 		$path = file_exists($this->getRawFilePath()) ? $this->getRawFilePath() : $this->getSanitisedLogFilePath();
 
-		error_log('[' . date('Y-m-d H:i:s') . '] ' . $message . PHP_EOL, 3, $path);
+		error_log('['.date('Y-m-d H:i:s').'] '.$message.PHP_EOL, 3, $path);
 		@chmod($path, 0666);
 	}
 

code/tasks/SyncProjectsAndEnvironments.php

Spacing +33 added lines, -33 removed lines

@@ -9,19 +9,19 @@ 
 		$remove = true;
 		$dryRun = true;
 
-		if($request && $request->requestVar('remove') !== null) {
-			$remove = (bool)$request->requestVar('remove');
+		if ($request && $request->requestVar('remove') !== null) {
+			$remove = (bool) $request->requestVar('remove');
 		}
 
-		if($request && $request->requestVar('dryrun') !== null) {
-			$dryRun = (bool)$request->requestVar('dryrun');
+		if ($request && $request->requestVar('dryrun') !== null) {
+			$dryRun = (bool) $request->requestVar('dryrun');
 		}
 
-		if($dryRun) {
+		if ($dryRun) {
 			echo "Running in dry run mode, no changes commited, ";
-			echo "the output shows a prediction on what will happen." . PHP_EOL;
-			echo "To skip dryrun, run the task like this:" . PHP_EOL;
-			echo "./framework/sake dev/tasks/SyncProjectsAndEnvironments dryrun=0" . PHP_EOL . PHP_EOL;
+			echo "the output shows a prediction on what will happen.".PHP_EOL;
+			echo "To skip dryrun, run the task like this:".PHP_EOL;
+			echo "./framework/sake dev/tasks/SyncProjectsAndEnvironments dryrun=0".PHP_EOL.PHP_EOL;
 			sleep(3);
 		}
 
@@ -30,7 +30,7 @@ 
 
 		// Sync projects
 		$projects = DNProject::get();
-		if($remove) {
+		if ($remove) {
 			$this->echoHeader('Removing obsolete projects');
 			$this->removeObsoleteProjects($projectPaths, $dryRun);
 		}
@@ -38,7 +38,7 @@ 
 		$this->syncProjectPaths($projectPaths, $dryRun);
 
 		$this->echoHeader('Syncing environment files');
-		foreach($projects as $project) {
+		foreach ($projects as $project) {
 			$this->echoHeader($project->Name);
 			// Sync environments for each project
 			$environmentPaths = $data->getEnvironmentPaths($project->Name);
@@ -62,13 +62,13 @@ 
 		}, $paths);
 
 		$removeList = $list->filter('Filename:not', $basePaths);
-		if($removeList->count() === 0) {
+		if ($removeList->count() === 0) {
 			return;
 		}
 
-		foreach($removeList as $remove) {
-			$this->message('Removing "' . basename($remove->Name) . '" from db');
-			if(!$dryRun) {
+		foreach ($removeList as $remove) {
+			$this->message('Removing "'.basename($remove->Name).'" from db');
+			if (!$dryRun) {
 				$removeList->remove($remove);
 			}
 		}
@@ -83,13 +83,13 @@ 
 	 */
 	protected function removeObsoleteProjects($paths, $dryrun = false) {
 		$removeList = DNProject::get()->filter('Name:not', $paths);
-		if($removeList->count() == 0) {
+		if ($removeList->count() == 0) {
 			return;
 		}
 
-		foreach($removeList as $remove) {
-			$this->message($remove->Name . ' ' . $remove->Path);
-			if(!$dryrun) {
+		foreach ($removeList as $remove) {
+			$this->message($remove->Name.' '.$remove->Path);
+			if (!$dryrun) {
 				$removeList->remove($remove);
 			}
 		}
@@ -106,22 +106,22 @@ 
 		$list = $project->Environments();
 
 		// Normalise paths in DB
-		foreach($list as $item) {
+		foreach ($list as $item) {
 			$real = realpath($item->Filename);
-			if($real && $real != $item->Filename) {
+			if ($real && $real != $item->Filename) {
 				$item->Filename = $real;
 				$item->write();
 			}
 		}
 
-		foreach($paths as $path) {
+		foreach ($paths as $path) {
 			$path = basename($path);
-			if($list->filter('Filename', $path)->count()) {
+			if ($list->filter('Filename', $path)->count()) {
 				continue;
 			}
 
-			$this->message('Adding "' . basename($path) . '" to db');
-			if(!$dryRun) {
+			$this->message('Adding "'.basename($path).'" to db');
+			if (!$dryRun) {
 				$environment = DNEnvironment::create_from_path($path);
 				$environment->ProjectID = $project->ID;
 				$environment->write();
@@ -136,10 +136,10 @@ 
 	 * @param boolean $dryRun
 	 */
 	public function syncProjectPaths($paths, $dryRun = false) {
-		foreach($paths as $path) {
-			if(!DNProject::get()->filter('Name', $path)->count()) {
+		foreach ($paths as $path) {
+			if (!DNProject::get()->filter('Name', $path)->count()) {
 				$this->message($path);
-				if(!$dryRun) {
+				if (!$dryRun) {
 					DNProject::create_from_path($path)->write();
 				}
 			}
@@ -150,20 +150,20 @@ 
 	 * @param string $text
 	 */
 	protected function message($text) {
-		if(PHP_SAPI !== 'cli') {
-			$text = '<p>' . $text . '</p>' . PHP_EOL;
+		if (PHP_SAPI !== 'cli') {
+			$text = '<p>'.$text.'</p>'.PHP_EOL;
 		}
-		echo ' - ' . $text . PHP_EOL;
+		echo ' - '.$text.PHP_EOL;
 	}
 
 	/**
 	 * @param string $text
 	 */
 	protected function echoHeader($text) {
-		if(PHP_SAPI !== 'cli') {
-			echo '<h2>' . $text . '</h2>' . PHP_EOL;
+		if (PHP_SAPI !== 'cli') {
+			echo '<h2>'.$text.'</h2>'.PHP_EOL;
 		} else {
-			echo '# ' . $text . PHP_EOL;
+			echo '# '.$text.PHP_EOL;
 		}
 	}
 }

code/model/DNEnvironment.php

Spacing +6 added lines, -6 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;
 	}
 
 	/**
@@ -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);

code/model/DNBranch.php

Spacing +6 added lines, -6 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());
 	}
 
 	/**
@@ -78,12 +78,12 @@ 
 	 */
 	public function LastUpdated() {
 
-		if($this->_lastUpdatedCache) {
+		if ($this->_lastUpdatedCache) {
 			return $this->_lastUpdatedCache;
 		}
 		try {
 			$created = $this->branch->getCommit()->getCommitterDate();
-		} catch(Exception $e) {
+		} catch (Exception $e) {
 			//occasionally parsing will fail this is a fallback to make it still work
 			return new SS_Datetime();
 		}
@@ -103,7 +103,7 @@ 
 	 * @return string
 	 */
 	public function IsOpenByDefault() {
-		if($this->Name() == 'master') {
+		if ($this->Name() == 'master') {
 			return " open";
 		} else {
 			return "";

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.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());
 			}
@@ -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!');