silverstripe / deploynaut

code/control/DNDeploymentHandlers.php

Spacing +1 added lines, -1 removed lines

@@ -12,7 +12,7 @@
 	protected function sendEmailToApprover(DNDeployment $deployment) {
 		$deployer = $deployment->Deployer();
 		$approver = $deployment->Approver();
-		if (!$approver || !$approver->exists()) {
+		if(!$approver || !$approver->exists()) {
 			return false;
 		}
 

code/tasks/MigrateDeploymentStatusTask.php

Spacing +7 added lines, -7 removed lines

@@ -4,28 +4,28 @@
 
 	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()) {
+		if(!Director::is_cli()) {
 			$log('This command can only run via CLI');
 			return;
 		}
 
 		$columns = DB::query('SHOW COLUMNS FROM "DNDeployment"')->column();
-		if (!in_array('Status', $columns)) {
+		if(!in_array('Status', $columns)) {
 			$log('Migration has already been run');
 			return;
 		}
 
-		foreach (DB::query('SELECT "ID", "Status" FROM "DNDeployment"') as $record) {
+		foreach(DB::query('SELECT "ID", "Status" FROM "DNDeployment"') as $record) {
 			// This record looks to be already migrated
-			if (empty($record['Status'])) {
+			if(empty($record['Status'])) {
 				continue;
 			}
 
-			switch ($record['Status']) {
+			switch($record['Status']) {
 				case 'Queued':
 					DB::query(sprintf('UPDATE "DNDeployment" SET "State" = \'Queued\' WHERE "ID" = %s', $record['ID']));
 					break;

code/jobs/DeployJob.php

Spacing +10 added lines, -10 removed lines

@@ -17,9 +17,9 @@ 
 	 */
 	public function alarmHandler() {
 		$sigFile = $this->args['sigFile'];
-		if (file_exists($sigFile) && is_readable($sigFile) && is_writable($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, [
+			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 {
@@ -61,8 +61,8 @@ 
 		posix_setsid();
 
 		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']);
+			if(!empty($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']);
@@ -109,11 +109,11 @@ 
 			);
 		} 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) {

code/backends/CapistranoDeploymentBackend.php

Spacing +15 added lines, -15 removed lines

@@ -72,7 +72,7 @@ 
 
 			try {
 				$args['build_filename'] = $this->packageGenerator->getPackageFilename($project->Name, $sha, $repository, $log);
-			} catch (Exception $e) {
+			} catch(Exception $e) {
 				$log->write($e->getMessage());
 				throw $e;
 			}
@@ -176,7 +176,7 @@ 
 		} 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
@@ -222,7 +222,7 @@ 
 		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.
@@ -237,7 +237,7 @@ 
 
 		$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),
@@ -247,13 +247,13 @@ 
 		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";
+		$command = "{$envString}cap -f ".escapeshellarg($capFile)." -vv $name $action ROLES=$roles";
 		foreach($args as $argName => $argVal) {
-			$command .= ' -s ' . escapeshellarg($argName) . '=' . escapeshellarg($argVal);
+			$command .= ' -s '.escapeshellarg($argName).'='.escapeshellarg($argVal);
 		}
 
 		$log->write(sprintf('Running command: %s', $command));
@@ -287,7 +287,7 @@ 
 		$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'))) {
@@ -325,7 +325,7 @@ 
 		$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);
@@ -392,7 +392,7 @@ 
 		// Restore database into target environment
 		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);
@@ -409,7 +409,7 @@ 
 		// Restore assets into target environment
 		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);
@@ -490,17 +490,17 @@ 
 			}
 
 			// Produce an informational ticker roughly every $tick
-			if (time() > $infoTick) {
+			if(time() > $infoTick) {
 				$message = [];
 
 				// Collect status information from different sources.
-				if ($status) {
+				if($status) {
 					$message[] = sprintf('HTTP status code is %s', $status);
 				}
-				if (!$response) {
+				if(!$response) {
 					$message[] = 'response is empty';
 				}
-				if ($error = curl_error($ch)) {
+				if($error = curl_error($ch)) {
 					$message[] = sprintf('request error: %s', $error);
 				}
 

code/backends/SimplePackageGenerator.php

Spacing +4 added lines, -4 removed lines

@@ -30,7 +30,7 @@ 
 	 * Generate the package
 	 */
 	public function generatePackage($sha, $baseDir, $outputFilename, DeploynautLogFile $log) {
-		$tempPath = TEMP_FOLDER . "/" . str_replace(".tar.gz", "", basename($outputFilename));
+		$tempPath = TEMP_FOLDER."/".str_replace(".tar.gz", "", basename($outputFilename));
 		if(!file_exists($tempPath)) {
 			mkdir($tempPath);
 		}
@@ -42,17 +42,17 @@ 
 		// 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 {

code/AbortableProcess.php

Doc Comments +4 added lines

@@ -13,6 +13,10 @@
  * will still get called if we loop over ->isRunning.
  */
 class SymfonyProcessFixer extends \Symfony\Component\Process\Process {
+
+	/**
+	 * @param Closure $callback
+	 */
 	public function run($callback = null) {
 		parent::start($callback);
 		while(parent::isRunning()) {

Spacing +1 added lines, -1 removed lines

@@ -20,7 +20,7 @@
 			sleep(1);
 		}
 
-		if ($this->hasBeenSignaled()) {
+		if($this->hasBeenSignaled()) {
 			throw new RuntimeException(sprintf('The process has been signaled with signal "%s".', $this->getTermSignal));
 		}