silverstripe / deploynaut

code/control/CheckPipelineStatus.php

Spacing +2 added lines, -2 removed lines

@@ -24,7 +24,7 @@ 
 
 		printf(
 			"%s Checking status of %d pipelines... ",
-			"[" . date("Y-m-d H:i:s") . "]",
+			"[".date("Y-m-d H:i:s")."]",
 			$runningPipelines->count()
 		);
 
@@ -32,6 +32,6 @@ 
 			$pipeline->checkPipelineStatus();
 		}
 
-		echo "done!" . PHP_EOL;
+		echo "done!".PHP_EOL;
 	}
 }

code/control/DeployForm.php

Spacing +8 added lines, -8 removed lines

@@ -41,7 +41,7 @@ 
 		if(!preg_match('/^[a-f0-9]{40}$/', $sha)) {
 			$this->validationError(
 				$field,
-				"Invalid release SHA: " . Convert::raw2xml($sha),
+				"Invalid release SHA: ".Convert::raw2xml($sha),
 				"error"
 			);
 			return false;
@@ -165,7 +165,7 @@ 
 
 		// Generate actions allowed for this user
 		$actions = new FieldList(
-			FormAction::create('startPipeline', "Begin the release process on " . $environment->Name)
+			FormAction::create('startPipeline', "Begin the release process on ".$environment->Name)
 				->addExtraClass('btn btn-primary')
 				->setAttribute('onclick', "return confirm('This will begin a release pipeline. Continue?');")
 		);
@@ -175,9 +175,9 @@ 
 					->addExtraClass('btn btn-info')
 					->setAttribute(
 						'onclick',
-						"return confirm('This will begin a release pipeline, but with the following exclusions:\\n" .
-						" - No messages will be sent\\n" .
-						" - No capistrano actions will be invoked\\n" .
+						"return confirm('This will begin a release pipeline, but with the following exclusions:\\n".
+						" - No messages will be sent\\n".
+						" - No capistrano actions will be invoked\\n".
 						" - No deployments or snapshots will be created.');"
 					)
 			);
@@ -188,7 +188,7 @@ 
 					->addExtraClass('btn btn-warning')
 					->setAttribute(
 						'onclick',
-						"return confirm('This will start a direct deployment, bypassing the pipeline " .
+						"return confirm('This will start a direct deployment, bypassing the pipeline ".
 						"process in place.\\n\\nAre you sure this is necessary?');"
 					)
 			);
@@ -215,7 +215,7 @@ 
 				substr($sha, 0, 8),
 				$branch->LastUpdated()->TimeDiff()
 			);
-			$branches[$sha . '-' . $name] = $branchValue;
+			$branches[$sha.'-'.$name] = $branchValue;
 		}
 
 		// Tags
@@ -228,7 +228,7 @@ 
 				substr($sha, 0, 8),
 				$branch->LastUpdated()->TimeDiff()
 			);
-			$tags[$sha . '-' . $tag] = $tagValue;
+			$tags[$sha.'-'.$tag] = $tagValue;
 		}
 		$tags = array_reverse($tags);
 

code/form/DataArchiveFileField.php

Spacing +2 added lines, -2 removed lines

@@ -36,7 +36,7 @@ 
 		// Hack: loadIntoFile assumes paths relative to assets,
 		//  otherwise it creates the whole structure *within* that folder
 		$absolutePath = $dataArchive->generateFilepath($dataTransfer);
-		$relativePath = preg_replace('#^' . preg_quote(ASSETS_PATH) . '/#', '', $absolutePath);
+		$relativePath = preg_replace('#^'.preg_quote(ASSETS_PATH).'/#', '', $absolutePath);
 		$this->upload->loadIntoFile($_FILES[$this->name], $file, $relativePath);
 		if($this->upload->isError()) {
 			return false;
@@ -45,7 +45,7 @@ 
 		$file = $this->upload->getFile();
 		if($this->relationAutoSetting) {
 			// save to record
-			$record->{$this->name . 'ID'} = $file->ID;
+			$record->{$this->name.'ID'} = $file->ID;
 		}
 
 		return $this;

code/queuereport/ResqueQueue.php

Spacing +3 added lines, -3 removed lines

@@ -49,7 +49,7 @@ 
 	protected function getJobs() {
 		$jobs = new ArrayList();
 
-		$resqueJobs = Resque::redis()->lrange('queue:' . $this->Name, 0, -1);
+		$resqueJobs = Resque::redis()->lrange('queue:'.$this->Name, 0, -1);
 		if(!$resqueJobs) {
 			$jobs->push(new ResqueJob(array(
 				'Name' => 'null',
@@ -61,8 +61,8 @@ 
 			$stdClass = json_decode($job);
 			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,

code/backends/SimplePackageGenerator.php

Spacing +4 added lines, -4 removed lines

@@ -32,7 +32,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);
 		}
@@ -44,17 +44,17 @@ 
 		// Execute these in sequence until there's a failure
 		$processes = array(
 			// Export the relevant SHA into a temp folder
-			new Process("git archive $sha | tar -x -C " . $escapedTempPath, $baseDir),
+			new Process("git archive $sha | tar -x -C ".$escapedTempPath, $baseDir),
 			// Run build script
 			new Process($this->buildScript, $tempPath, null, null, 3600),
 			// Compress the result
-			new Process("tar -czf " . $escapedOutputFile . " " . $escapedTempDir, dirname($tempPath)),
+			new Process("tar -czf ".$escapedOutputFile." ".$escapedTempDir, dirname($tempPath)),
 		);
 
 		// Call at the end, regardless of success or failure
 		$cleanup = array(
 			// Delete the temporary staging folder
-			new Process("rm -rf " . $escapedTempPath),
+			new Process("rm -rf ".$escapedTempPath),
 		);
 
 		try {

code/backends/PackageGenerator.php

Spacing +2 added lines, -2 removed lines

@@ -51,12 +51,12 @@
 	public function getPackageFilename($identifier, $sha, $repositoryDir, DeploynautLogFile $log) {
 		// Fetch through the cache
 		if($this->cache) {
-			$identifier .= '-' . get_class($this) . '-' . $this->getIdentifier();
+			$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';
+ 			$filename = TEMP_FOLDER.'/'.$sha.'.tar.gz';
  			if($this->generatePackage($sha, $repositoryDir, $filename, $log)) {
  				return $filename;
  			}

code/backends/DemoDeploymentBackend.php

Spacing +1 added lines, -1 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);

code/backends/CapistranoDeploymentBackend.php

Spacing +11 added lines, -11 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
@@ -221,7 +221,7 @@ 
 		if(!$args) {
 			$args = array();
 		}
-		$args['history_path'] = realpath(DEPLOYNAUT_LOG_PATH . '/');
+		$args['history_path'] = realpath(DEPLOYNAUT_LOG_PATH.'/');
 
 		// Inject env string directly into the command.
 		// Capistrano doesn't like the $process->setEnv($env) we'd normally do below.
@@ -235,7 +235,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),
@@ -245,13 +245,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));
@@ -285,7 +285,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'))) {
@@ -316,7 +316,7 @@ 
 		}
 
 		$sspakFilename = sprintf('%s.sspak', $dataArchive->generateFilename($dataTransfer));
-		$sspakFilepath = $filepathBase . DIRECTORY_SEPARATOR . $sspakFilename;
+		$sspakFilepath = $filepathBase.DIRECTORY_SEPARATOR.$sspakFilename;
 
 		try {
 			$dataArchive->attachFile($sspakFilepath, $dataTransfer);
@@ -381,7 +381,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);
@@ -398,7 +398,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);

code/backends/SizeRestrictedPackageCache.php

Spacing +3 added lines, -3 removed lines

@@ -52,7 +52,7 @@ 
 			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)) {
@@ -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');
+		$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");
+				$log->write("Removing ".$files[$i]." from package cache");
 				unlink($files[$i]);
 			}
 		}