silverstripe / deploynaut

code/extensions/DeploynautSecurityExtension.php

Spacing +1 added lines, -1 removed lines

@@ -6,7 +6,7 @@
 		// the 'ping' action is called via AJAX from the /admin and will cause
 		// the admin section to 'grow' over time. We only need the css and js
 		// for login, reset, logout and so on.
-		if(!$this->owner->getRequest()->isAjax()) {
+		if (!$this->owner->getRequest()->isAjax()) {
 			DNRoot::include_requirements();
 		}
 	}

code/extensions/DeploynautFileExtension.php

Spacing +1 added lines, -1 removed lines

@@ -11,7 +11,7 @@
 		$file = $this->owner;
 		$archive = DNDataArchive::get()->filter('ArchiveFileID', $file->ID)->First();
 
-		if($archive) {
+		if ($archive) {
 			return $archive->canDownload($member);
 		}
 

code/queuereport/ResqueReport.php

Spacing +1 added lines, -1 removed lines

@@ -53,7 +53,7 @@
 	protected function getQueues() {
 		$queues = Resque::queues();
 		$queueList = new ArrayList();
-		foreach($queues as $idx => $queue) {
+		foreach ($queues as $idx => $queue) {
 			$queueList->push(new ResqueQueue(array(
 				'ID' => ($idx + 1),
 				'Name' => $queue,

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/control/DNRoot.php

Spacing +27 added lines, -27 removed lines

@@ -178,7 +178,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 {
@@ -242,7 +242,7 @@ 
 		}
 
 		// Block framework jquery
-		Requirements::block(FRAMEWORK_DIR . '/thirdparty/jquery/jquery.js');
+		Requirements::block(FRAMEWORK_DIR.'/thirdparty/jquery/jquery.js');
 
 		self::include_requirements();
 	}
@@ -261,7 +261,7 @@ 
 	 * @return \SS_HTTPResponse
 	 */
 	public function index(SS_HTTPRequest $request) {
-		return $this->redirect($this->Link() . 'projects/');
+		return $this->redirect($this->Link().'projects/');
 	}
 
 	/**
@@ -389,7 +389,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 = [];
@@ -421,7 +421,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;
 	}
@@ -442,7 +442,7 @@ 
 		}
 
 		$validEnvs = $project->DNEnvironmentList()
-			->filterByCallback(function ($item) {
+			->filterByCallback(function($item) {
 				return $item->canUploadArchive();
 			});
 
@@ -471,9 +471,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();
@@ -547,7 +547,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 = [];
@@ -573,7 +573,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;
 	}
@@ -592,7 +592,7 @@ 
 			return $this->project404Response();
 		}
 
-		$validEnvs = $project->DNEnvironmentList()->filterByCallback(function ($item) {
+		$validEnvs = $project->DNEnvironmentList()->filterByCallback(function($item) {
 			return $item->canUploadArchive();
 		});
 
@@ -712,7 +712,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([
@@ -849,7 +849,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;
 	}
@@ -882,7 +882,7 @@ 
 		$job->write();
 		$job->start();
 
-		return $this->redirect($project->Link('createenv') . '/' . $job->ID);
+		return $this->redirect($project->Link('createenv').'/'.$job->ID);
 	}
 
 	/**
@@ -1080,7 +1080,7 @@ 
 			return $body;
 		}
 
-		$form->setFormAction($this->getRequest()->getURL() . '/DeployForm');
+		$form->setFormAction($this->getRequest()->getURL().'/DeployForm');
 		return $form;
 	}
 
@@ -1346,7 +1346,7 @@ 
 		$deployment->getMachine()->apply(DNDeployment::TR_QUEUE);
 
 		return json_encode([
-			'url' => Director::absoluteBaseURL() . $deployment->Link()
+			'url' => Director::absoluteBaseURL().$deployment->Link()
 		], JSON_PRETTY_PRINT);
 	}
 
@@ -1469,7 +1469,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();
 		});
 
@@ -1491,7 +1491,7 @@ 
 					->addExtraClass('btn')
 			)
 		);
-		$form->setFormAction($this->getRequest()->getURL() . '/DataTransferForm');
+		$form->setFormAction($this->getRequest()->getURL().'/DataTransferForm');
 
 		return $form;
 	}
@@ -1517,12 +1517,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 {
@@ -1653,7 +1653,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();
 		});
 
@@ -1692,7 +1692,7 @@ 
 					->addExtraClass('btn')
 			)
 		);
-		$form->setFormAction($project->Link() . '/DataTransferRestoreForm');
+		$form->setFormAction($project->Link().'/DataTransferRestoreForm');
 
 		return $form;
 	}
@@ -1790,7 +1790,7 @@ 
 					->addExtraClass('btn')
 			)
 		);
-		$form->setFormAction($project->Link() . '/DeleteForm');
+		$form->setFormAction($project->Link().'/DeleteForm');
 
 		return $form;
 	}
@@ -1896,7 +1896,7 @@ 
 					->addExtraClass('btn')
 			)
 		);
-		$form->setFormAction($this->getCurrentProject()->Link() . '/MoveForm');
+		$form->setFormAction($this->getCurrentProject()->Link().'/MoveForm');
 
 		return $form;
 	}
@@ -2157,7 +2157,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() ||
@@ -2282,7 +2282,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
 		);
 	}
@@ -2292,7 +2292,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);
 	}
 
 	/**