silverstripe / deploynaut

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!');

code/jobs/CreateEnvJob.php

Spacing +5 added lines, -5 removed lines

@@ -19,27 +19,27 @@
 	 *
 	 */
 	public function perform() {
-		echo "[-] CreateEnvJob starting" . PHP_EOL;
+		echo "[-] CreateEnvJob starting".PHP_EOL;
 
 		$log = new DeploynautLogFile($this->args['logfile']);
 		$envCreate = DNCreateEnvironment::get()->byId($this->args['createID']);
 
 		// This is a bit icky, but there is no easy way of capturing a failed deploy by using the PHP Resque
 		try {
-			if(!($envCreate && $envCreate->exists())) {
+			if (!($envCreate && $envCreate->exists())) {
 				throw new RuntimeException(sprintf('Could not find create environment record %s', $args['createID']));
 			}
 
 			// This will throw and exception if it fails.
 			$envCreate->createEnvironment();
 
-		} catch(Exception $e) {
+		} catch (Exception $e) {
 			$log->write($e->getMessage());
-			echo "[-] CreateEnvJob failed" . PHP_EOL;
+			echo "[-] CreateEnvJob failed".PHP_EOL;
 			throw $e;
 		}
 		$this->updateStatus('Finished');
-		echo "[-] CreateEnvJob finished" . PHP_EOL;
+		echo "[-] CreateEnvJob finished".PHP_EOL;
 	}
 
 	/**

code/control/DNRoot.php

Spacing +30 added lines, -30 removed lines

@@ -179,7 +179,7 @@ 
 		Requirements::javascript('deploynaut/javascript/material.js');
 
 		// Load the buildable dependencies only if not loaded centrally.
-		if (!is_dir(BASE_PATH . DIRECTORY_SEPARATOR . 'static')) {
+		if (!is_dir(BASE_PATH.DIRECTORY_SEPARATOR.'static')) {
 			if (\Director::isDev()) {
 				\Requirements::javascript('deploynaut/static/bundle-debug.js');
 			} else {
@@ -243,7 +243,7 @@ 
 		}
 
 		// Block framework jquery
-		Requirements::block(FRAMEWORK_DIR . '/thirdparty/jquery/jquery.js');
+		Requirements::block(FRAMEWORK_DIR.'/thirdparty/jquery/jquery.js');
 
 		self::include_requirements();
 	}
@@ -262,7 +262,7 @@ 
 	 * @return \SS_HTTPResponse
 	 */
 	public function index(SS_HTTPRequest $request) {
-		return $this->redirect($this->Link() . 'projects/');
+		return $this->redirect($this->Link().'projects/');
 	}
 
 	/**
@@ -390,7 +390,7 @@ 
 		// Framing an environment as a "group of people with download access"
 		// makes more sense to the user here, while still allowing us to enforce
 		// environment specific restrictions on downloading the file later on.
-		$envs = $project->DNEnvironmentList()->filterByCallback(function ($item) {
+		$envs = $project->DNEnvironmentList()->filterByCallback(function($item) {
 			return $item->canUploadArchive();
 		});
 		$envsMap = [];
@@ -422,7 +422,7 @@ 
 		$form->disableSecurityToken();
 		$form->addExtraClass('fields-wide');
 		// Tweak the action so it plays well with our fake URL structure.
-		$form->setFormAction($project->Link() . '/UploadSnapshotForm');
+		$form->setFormAction($project->Link().'/UploadSnapshotForm');
 
 		return $form;
 	}
@@ -443,7 +443,7 @@ 
 		}
 
 		$validEnvs = $project->DNEnvironmentList()
-			->filterByCallback(function ($item) {
+			->filterByCallback(function($item) {
 				return $item->canUploadArchive();
 			});
 
@@ -472,9 +472,9 @@ 
 		$dataArchive->DataTransfers()->add($dataTransfer);
 		$form->saveInto($dataArchive);
 		$dataArchive->write();
-		$workingDir = TEMP_FOLDER . DIRECTORY_SEPARATOR . 'deploynaut-transfer-' . $dataTransfer->ID;
+		$workingDir = TEMP_FOLDER.DIRECTORY_SEPARATOR.'deploynaut-transfer-'.$dataTransfer->ID;
 
-		$cleanupFn = function () use ($workingDir, $dataTransfer, $dataArchive) {
+		$cleanupFn = function() use ($workingDir, $dataTransfer, $dataArchive) {
 			$process = new AbortableProcess(sprintf('rm -rf %s', escapeshellarg($workingDir)));
 			$process->setTimeout(120);
 			$process->run();
@@ -548,7 +548,7 @@ 
 		// Framing an environment as a "group of people with download access"
 		// makes more sense to the user here, while still allowing us to enforce
 		// environment specific restrictions on downloading the file later on.
-		$envs = $project->DNEnvironmentList()->filterByCallback(function ($item) {
+		$envs = $project->DNEnvironmentList()->filterByCallback(function($item) {
 			return $item->canUploadArchive();
 		});
 		$envsMap = [];
@@ -574,7 +574,7 @@ 
 		$form->disableSecurityToken();
 		$form->addExtraClass('fields-wide');
 		// Tweak the action so it plays well with our fake URL structure.
-		$form->setFormAction($project->Link() . '/PostSnapshotForm');
+		$form->setFormAction($project->Link().'/PostSnapshotForm');
 
 		return $form;
 	}
@@ -593,7 +593,7 @@ 
 			return $this->project404Response();
 		}
 
-		$validEnvs = $project->DNEnvironmentList()->filterByCallback(function ($item) {
+		$validEnvs = $project->DNEnvironmentList()->filterByCallback(function($item) {
 			return $item->canUploadArchive();
 		});
 
@@ -713,7 +713,7 @@ 
 		$branchName = $request->getVar('name');
 		$branch = $project->DNBranchList()->byName($branchName);
 		if (!$branch) {
-			return new SS_HTTPResponse("Branch '" . Convert::raw2xml($branchName) . "' not found.", 404);
+			return new SS_HTTPResponse("Branch '".Convert::raw2xml($branchName)."' not found.", 404);
 		}
 
 		return $this->render([
@@ -850,7 +850,7 @@ 
 		);
 
 		// Tweak the action so it plays well with our fake URL structure.
-		$form->setFormAction($project->Link() . '/CreateEnvironmentForm');
+		$form->setFormAction($project->Link().'/CreateEnvironmentForm');
 
 		return $form;
 	}
@@ -883,7 +883,7 @@ 
 		$job->write();
 		$job->start();
 
-		return $this->redirect($project->Link('createenv') . '/' . $job->ID);
+		return $this->redirect($project->Link('createenv').'/'.$job->ID);
 	}
 
 	/**
@@ -1081,7 +1081,7 @@ 
 			return $body;
 		}
 
-		$form->setFormAction($this->getRequest()->getURL() . '/DeployForm');
+		$form->setFormAction($this->getRequest()->getURL().'/DeployForm');
 		return $form;
 	}
 
@@ -1347,7 +1347,7 @@ 
 		$deployment->getMachine()->apply(DNDeployment::TR_QUEUE);
 
 		return json_encode([
-			'url' => Director::absoluteBaseURL() . $deployment->Link()
+			'url' => Director::absoluteBaseURL().$deployment->Link()
 		], JSON_PRETTY_PRINT);
 	}
 
@@ -1470,7 +1470,7 @@ 
 	 */
 	public function getDataTransferForm(SS_HTTPRequest $request = null) {
 		// Performs canView permission check by limiting visible projects
-		$envs = $this->getCurrentProject()->DNEnvironmentList()->filterByCallback(function ($item) {
+		$envs = $this->getCurrentProject()->DNEnvironmentList()->filterByCallback(function($item) {
 			return $item->canBackup();
 		});
 
@@ -1480,7 +1480,7 @@ 
 
 		$items = [];
 		$disabledEnvironments = [];
-		foreach($envs as $env) {
+		foreach ($envs as $env) {
 			$items[$env->ID] = $env->Title;
 			if ($env->CurrentBuild() === false) {
 				$items[$env->ID] = sprintf("%s - requires initial deployment", $env->Title);
@@ -1488,7 +1488,7 @@ 
 			}
 		}
 
-		$envsField =  DropdownField::create('EnvironmentID', 'Environment', $items)
+		$envsField = DropdownField::create('EnvironmentID', 'Environment', $items)
 			->setEmptyString('Select an environment');
 		$envsField->setDisabledItems($disabledEnvironments);
 
@@ -1509,7 +1509,7 @@ 
 			),
 			FieldList::create($formAction)
 		);
-		$form->setFormAction($this->getRequest()->getURL() . '/DataTransferForm');
+		$form->setFormAction($this->getRequest()->getURL().'/DataTransferForm');
 
 		return $form;
 	}
@@ -1535,12 +1535,12 @@ 
 		// Validate direction.
 		if ($data['Direction'] == 'get') {
 			$validEnvs = $this->getCurrentProject()->DNEnvironmentList()
-				->filterByCallback(function ($item) {
+				->filterByCallback(function($item) {
 					return $item->canBackup();
 				});
 		} else if ($data['Direction'] == 'push') {
 			$validEnvs = $this->getCurrentProject()->DNEnvironmentList()
-				->filterByCallback(function ($item) {
+				->filterByCallback(function($item) {
 					return $item->canRestore();
 				});
 		} else {
@@ -1671,7 +1671,7 @@ 
 
 		// Performs canView permission check by limiting visible projects
 		$project = $this->getCurrentProject();
-		$envs = $project->DNEnvironmentList()->filterByCallback(function ($item) {
+		$envs = $project->DNEnvironmentList()->filterByCallback(function($item) {
 			return $item->canRestore();
 		});
 
@@ -1696,7 +1696,7 @@ 
 
 		$items = [];
 		$disabledEnvironments = [];
-		foreach($envs as $env) {
+		foreach ($envs as $env) {
 			$items[$env->ID] = $env->Title;
 			if ($env->CurrentBuild() === false) {
 				$items[$env->ID] = sprintf("%s - requires initial deployment", $env->Title);
@@ -1725,7 +1725,7 @@ 
 			),
 			FieldList::create($formAction)
 		);
-		$form->setFormAction($project->Link() . '/DataTransferRestoreForm');
+		$form->setFormAction($project->Link().'/DataTransferRestoreForm');
 
 		return $form;
 	}
@@ -1823,7 +1823,7 @@ 
 					->addExtraClass('btn')
 			)
 		);
-		$form->setFormAction($project->Link() . '/DeleteForm');
+		$form->setFormAction($project->Link().'/DeleteForm');
 
 		return $form;
 	}
@@ -1929,7 +1929,7 @@ 
 					->addExtraClass('btn')
 			)
 		);
-		$form->setFormAction($this->getCurrentProject()->Link() . '/MoveForm');
+		$form->setFormAction($this->getCurrentProject()->Link().'/MoveForm');
 
 		return $form;
 	}
@@ -2190,7 +2190,7 @@ 
 		$transfers = DNDataTransfer::get()
 			->filter('EnvironmentID', $environments)
 			->filterByCallback(
-				function ($record) {
+				function($record) {
 					return
 						$record->Environment()->canRestore() || // Ensure member can perform an action on the transfers env
 						$record->Environment()->canBackup() ||
@@ -2315,7 +2315,7 @@ 
 	 */
 	protected function project404Response() {
 		return new SS_HTTPResponse(
-			"Project '" . Convert::raw2xml($this->getRequest()->param('Project')) . "' not found.",
+			"Project '".Convert::raw2xml($this->getRequest()->param('Project'))."' not found.",
 			404
 		);
 	}
@@ -2325,7 +2325,7 @@ 
 	 */
 	protected function environment404Response() {
 		$envName = Convert::raw2xml($this->getRequest()->param('Environment'));
-		return new SS_HTTPResponse("Environment '" . $envName . "' not found.", 404);
+		return new SS_HTTPResponse("Environment '".$envName."' not found.", 404);
 	}
 
 	/**

code/api/DeploynautAPIFormatter.php

Spacing +1 added lines, -1 removed lines

@@ -41,7 +41,7 @@
 		// failover for older deployments
 		$started = $deployment->Created;
 		$startedNice = $deployment->obj('Created')->Nice();
-		if($deployment->DeployStarted) {
+		if ($deployment->DeployStarted) {
 			$started = $deployment->DeployStarted;
 			$startedNice = $deployment->obj('DeployStarted')->Nice();
 		}

code/SS_Datetimezone.php

Spacing +1 added lines, -1 removed lines

@@ -9,7 +9,7 @@
 	* Returns the date in the raw SQL-format specific to a given timezone passed from the Member class, e.g. “2006-01-18 16:32:04”
 	*/
 	public function Format($format) {
-		if($this->value){
+		if ($this->value) {
 			$date = new DateTime($this->value);
 			//if the current user has set a timezone that is not the default then use that
 			$member = Member::currentUser();

code/model/DNDataArchive.php

Spacing +31 added lines, -31 removed lines

@@ -121,7 +121,7 @@ 
 	}
 
 	public function onBeforeWrite() {
-		if(!$this->AuthorID) {
+		if (!$this->AuthorID) {
 			$this->AuthorID = Member::currentUserID();
 		}
 
@@ -179,7 +179,7 @@ 
 	 * @return string The human-readable size of this archive file
 	 */
 	public function FileSize() {
-		if($this->ArchiveFile()->exists()) {
+		if ($this->ArchiveFile()->exists()) {
 			return $this->ArchiveFile()->getSize();
 		} else {
 			return "N/A";
@@ -187,7 +187,7 @@ 
 	}
 
 	public function getModeNice() {
-		if($this->Mode == 'all') {
+		if ($this->Mode == 'all') {
 			return 'database and assets';
 		} else {
 			return $this->Mode;
@@ -223,12 +223,12 @@ 
 	 */
 	public function canRestore($member = null) {
 		$memberID = $member ? $member->ID : Member::currentUserID();
-		if(!$memberID) {
+		if (!$memberID) {
 			return false;
 		}
 
-		$key = $memberID . '-' . $this->EnvironmentID;
-		if(!isset(self::$_cache_can_restore[$key])) {
+		$key = $memberID.'-'.$this->EnvironmentID;
+		if (!isset(self::$_cache_can_restore[$key])) {
 			self::$_cache_can_restore[$key] = $this->Environment()->canUploadArchive($member);
 		}
 
@@ -244,12 +244,12 @@ 
 	 */
 	public function canDownload($member = null) {
 		$memberID = $member ? $member->ID : Member::currentUserID();
-		if(!$memberID) {
+		if (!$memberID) {
 			return false;
 		}
 
-		$key = $memberID . '-' . $this->EnvironmentID;
-		if(!isset(self::$_cache_can_download[$key])) {
+		$key = $memberID.'-'.$this->EnvironmentID;
+		if (!isset(self::$_cache_can_download[$key])) {
 			self::$_cache_can_download[$key] = $this->Environment()->canDownloadArchive($member);
 		}
 		return self::$_cache_can_download[$key];
@@ -274,27 +274,27 @@ 
 	 * @return boolean true if $member can upload archives linked to this environment, false if they can't.
 	 */
 	public function canMoveTo($targetEnv, $member = null) {
-		if($this->Environment()->Project()->ID != $targetEnv->Project()->ID) {
+		if ($this->Environment()->Project()->ID != $targetEnv->Project()->ID) {
 			// We don't permit moving snapshots between projects at this stage.
 			return false;
 		}
 
-		if(!$member) {
+		if (!$member) {
 			$member = Member::currentUser();
 		}
 
 		// Must be logged in to check permissions
-		if(!$member) {
+		if (!$member) {
 			return false;
 		}
 
 		// Admin can always move.
-		if(Permission::checkMember($member, 'ADMIN')) {
+		if (Permission::checkMember($member, 'ADMIN')) {
 			return true;
 		}
 
 		// Checks if the user can actually access the archive.
-		if(!$this->canDownload($member)) {
+		if (!$this->canDownload($member)) {
 			return false;
 		}
 
@@ -403,7 +403,7 @@ 
 	 * @return bool
 	 */
 	public function extractArchive($workingDir = null) {
-		if(!is_dir($workingDir)) {
+		if (!is_dir($workingDir)) {
 			mkdir($workingDir, 0700, true);
 		}
 
@@ -422,28 +422,28 @@ 
 		));
 		$process->setTimeout(3600);
 		$process->run();
-		if(!$process->isSuccessful()) {
+		if (!$process->isSuccessful()) {
 			$cleanupFn();
 			throw new RuntimeException(sprintf('Could not extract the sspak file: %s', $process->getErrorOutput()));
 		}
 
 		// 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 AbortableProcess('gunzip database.sql.gz', $workingDir);
 			$process->setTimeout(3600);
 			$process->run();
-			if(!$process->isSuccessful()) {
+			if (!$process->isSuccessful()) {
 				$cleanupFn();
 				throw new RuntimeException(sprintf('Could not extract the db archive: %s', $process->getErrorOutput()));
 			}
 		}
 
 		// 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 AbortableProcess('tar xzf assets.tar.gz', $workingDir);
 			$process->setTimeout(3600);
 			$process->run();
-			if(!$process->isSuccessful()) {
+			if (!$process->isSuccessful()) {
 				$cleanupFn();
 				throw new RuntimeException(sprintf('Could not extract the assets archive: %s', $process->getErrorOutput()));
 			}
@@ -467,7 +467,7 @@ 
 
 		$file = $this->ArchiveFile()->FullPath;
 
-		if(!is_readable($file)) {
+		if (!is_readable($file)) {
 			$result->error(sprintf('SSPak file "%s" cannot be read.', $file));
 			return $result;
 		}
@@ -475,19 +475,19 @@ 
 		$process = new AbortableProcess(sprintf('tar -tf %s', escapeshellarg($file)));
 		$process->setTimeout(120);
 		$process->run();
-		if(!$process->isSuccessful()) {
+		if (!$process->isSuccessful()) {
 			throw new RuntimeException(sprintf('Could not list files in archive: %s', $process->getErrorOutput()));
 		}
 
 		$output = explode(PHP_EOL, $process->getOutput());
 		$files = array_filter($output);
 
-		if(in_array($mode, array('all', 'db')) && !in_array('database.sql.gz', $files)) {
+		if (in_array($mode, array('all', 'db')) && !in_array('database.sql.gz', $files)) {
 			$result->error('The snapshot is missing the database.');
 			return $result;
 		}
 
-		if(in_array($mode, array('all', 'assets')) && !in_array('assets.tar.gz', $files)) {
+		if (in_array($mode, array('all', 'assets')) && !in_array('assets.tar.gz', $files)) {
 			$result->error('The snapshot is missing assets.');
 			return $result;
 		}
@@ -517,11 +517,11 @@ 
 			sprintf('find %s -type f -exec chmod 644 {} +', escapeshellarg($workingDir))
 		);
 
-		foreach($fixCmds as $cmd) {
+		foreach ($fixCmds as $cmd) {
 			$process = new AbortableProcess($cmd);
 			$process->setTimeout(3600);
 			$process->run();
-			if(!$process->isSuccessful()) {
+			if (!$process->isSuccessful()) {
 				throw new RuntimeException($process->getErrorOutput());
 			}
 		}
@@ -540,18 +540,18 @@ 
 	 */
 	public function setArchiveFromFiles($workingDir) {
 		$commands = array();
-		if($this->Mode == 'db') {
-			if (file_exists($workingDir . '/database.sql')) {
+		if ($this->Mode == 'db') {
+			if (file_exists($workingDir.'/database.sql')) {
 				$commands[] = 'gzip database.sql';
 			}
 			$commands[] = sprintf('tar -cf %s database.sql.gz', $this->ArchiveFile()->FullPath);
 			$commands[] = 'rm -f database.sql.gz';
-		} elseif($this->Mode == 'assets') {
+		} elseif ($this->Mode == 'assets') {
 			$commands[] = 'GZIP=-1 tar --dereference -czf assets.tar.gz assets';
 			$commands[] = sprintf('tar -cf %s assets.tar.gz', $this->ArchiveFile()->FullPath);
 			$commands[] = 'rm -f assets.tar.gz';
 		} else {
-			if (file_exists($workingDir . '/database.sql')) {
+			if (file_exists($workingDir.'/database.sql')) {
 				$commands[] = 'gzip database.sql';
 			}
 			$commands[] = 'GZIP=-1 tar --dereference -czf assets.tar.gz assets';
@@ -562,7 +562,7 @@ 
 		$process = new AbortableProcess(implode(' && ', $commands), $workingDir);
 		$process->setTimeout(3600);
 		$process->run();
-		if(!$process->isSuccessful()) {
+		if (!$process->isSuccessful()) {
 			throw new RuntimeException($process->getErrorOutput());
 		}
 

code/tasks/CleanupOrphanedRecordsTask.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()) {

code/model/jobs/DNDeployment.php

Spacing +15 added lines, -15 removed lines

@@ -111,7 +111,7 @@ 
 	}
 
 	public function LogLink() {
-		return $this->Link() . '/log';
+		return $this->Link().'/log';
 	}
 
 	public function canView($member = null) {
@@ -157,7 +157,7 @@ 
 	 * @return \Gitonomy\Git\Repository|null
 	 */
 	public function getRepository() {
-		if(!$this->SHA) {
+		if (!$this->SHA) {
 			return null;
 		}
 		return $this->Environment()->Project()->getRepository();
@@ -170,10 +170,10 @@ 
 	 */
 	public function getCommit() {
 		$repo = $this->getRepository();
-		if($repo) {
+		if ($repo) {
 			try {
 				return $this->Environment()->getCommit($this->SHA);
-			} catch(Gitonomy\Git\Exception\ReferenceNotFoundException $ex) {
+			} catch (Gitonomy\Git\Exception\ReferenceNotFoundException $ex) {
 				return null;
 			}
 		}
@@ -198,7 +198,7 @@ 
 		if (!$interface) {
 			return null;
 		}
-		return $interface->CommitURL . '/' . $this->SHA;
+		return $interface->CommitURL.'/'.$this->SHA;
 	}
 
 	/**
@@ -208,10 +208,10 @@ 
 	 */
 	public function getCommitMessage() {
 		$commit = $this->getCommit();
-		if($commit) {
+		if ($commit) {
 			try {
 				return Convert::raw2xml($this->Environment()->getCommitMessage($commit));
-			} catch(Gitonomy\Git\Exception\ReferenceNotFoundException $e) {
+			} catch (Gitonomy\Git\Exception\ReferenceNotFoundException $e) {
 				return null;
 			}
 		}
@@ -225,13 +225,13 @@ 
 	 */
 	public function getTags() {
 		$commit = $this->Environment()->getCommit($this->SHA);
-		if(!$commit) {
+		if (!$commit) {
 			return new ArrayList([]);
 		}
 		$tags = $this->Environment()->getCommitTags($commit);
 		$returnTags = [];
 		if (!empty($tags)) {
-			foreach($tags as $tag) {
+			foreach ($tags as $tag) {
 				$field = Varchar::create('Tag', '255');
 				$field->setValue($tag->getName());
 				$returnTags[] = $field;
@@ -248,12 +248,12 @@ 
 	 */
 	public function getFullDeployMessages() {
 		$strategy = $this->getDeploymentStrategy();
-		if ($strategy->getActionCode()!=='full') return null;
+		if ($strategy->getActionCode() !== 'full') return null;
 
 		$changes = $strategy->getChangesModificationNeeded();
 		$messages = [];
 		foreach ($changes as $change => $details) {
-			if ($change==='Code version') continue;
+			if ($change === 'Code version') continue;
 
 			$messages[] = [
 				'Flag' => sprintf(
@@ -281,7 +281,7 @@ 
 	 */
 	public function getTag() {
 		$tags = $this->getTags();
-		if($tags->count() > 0) {
+		if ($tags->count() > 0) {
 			return $tags->last();
 		}
 		return null;
@@ -306,7 +306,7 @@ 
 	public function getChanges() {
 		$list = new ArrayList();
 		$strategy = $this->getDeploymentStrategy();
-		foreach($strategy->getChanges() as $name => $change) {
+		foreach ($strategy->getChanges() as $name => $change) {
 			$changed = (isset($change['from']) && isset($change['to'])) ? $change['from'] != $change['to'] : null;
 			$description = isset($change['description']) ? $change['description'] : '';
 			$compareUrl = null;
@@ -356,11 +356,11 @@ 
 		// Make sure we use the SHA as it was written into this DNDeployment.
 		$args['sha'] = $this->SHA;
 
-		if(!$this->DeployerID) {
+		if (!$this->DeployerID) {
 			$this->DeployerID = Member::currentUserID();
 		}
 
-		if($this->DeployerID) {
+		if ($this->DeployerID) {
 			$deployer = $this->Deployer();
 			$message = sprintf(
 				'Deploy to %s initiated by %s (%s), with IP address %s',

code/model/options/NoRollbackDeployOption.php

Spacing +2 added lines, -2 removed lines

@@ -12,8 +12,8 @@
 	}
 
 	public function __get($name) {
-		if (method_exists($this, 'get' . $name)) {
-			return $this->{'get' . $name}();
+		if (method_exists($this, 'get'.$name)) {
+			return $this->{'get'.$name}();
 		}
 		return $this->$name;
 	}