silverstripe / deploynaut

code/model/jobs/DNDataTransfer.php

Spacing +5 added lines, -5 removed lines

@@ -112,7 +112,7 @@ 
 	}
 
 	public function getTitle() {
-		return $this->dbObject('Created')->Nice() . " (Status: {$this->Status})";
+		return $this->dbObject('Created')->Nice()." (Status: {$this->Status})";
 	}
 
 	public function Link() {
@@ -233,14 +233,14 @@ 
 		$envName = $this->Environment()->getFullName();
 		if($this->Direction == 'get') {
 			if($this->Origin == 'ManualUpload') {
-				$description = 'Manual upload of ' . $this->getModeNice() . ' to ' . $envName;
+				$description = 'Manual upload of '.$this->getModeNice().' to '.$envName;
 			} elseif($this->IsBackupDataTransfer()) {
-				$description = 'Automated backup of ' . $this->getModeNice() . ' from ' . $envName;
+				$description = 'Automated backup of '.$this->getModeNice().' from '.$envName;
 			} else {
-				$description = 'Backup of ' . $this->getModeNice() . ' to ' . $envName;
+				$description = 'Backup of '.$this->getModeNice().' to '.$envName;
 			}
 		} else {
-			$description = 'Restore ' . $this->getModeNice() . ' to ' . $envName;
+			$description = 'Restore '.$this->getModeNice().' to '.$envName;
 		}
 
 		return $description;

code/model/jobs/DNCreateEnvironment.php

Spacing +2 added lines, -2 removed lines

@@ -68,7 +68,7 @@ 
 	 * @return string
 	 */
 	public function LogLink() {
-		return $this->Link() . '/log';
+		return $this->Link().'/log';
 	}
 
 	/**
@@ -190,7 +190,7 @@ 
 			if($env instanceof EnvironmentCreateBackend) {
 				return $env;
 			} else {
-				throw new Exception("Invalid backend: " . $data['EnvironmentType']);
+				throw new Exception("Invalid backend: ".$data['EnvironmentType']);
 			}
 		}
 		return null;

code/control/DeploynautLogFile.php

Spacing +3 added lines, -3 removed lines

@@ -39,7 +39,7 @@ 
 	 * @return string
 	 */
 	public function getRawFilePath() {
-		return $this->basePath . '/' . $this->logFile;
+		return $this->basePath.'/'.$this->logFile;
 	}
 
 	/**
@@ -47,7 +47,7 @@ 
 	 * @return string
 	 */
 	public function getSanitisedLogFilePath() {
-		return $this->basePath . '/' . strtolower(FileNameFilter::create()->filter($this->logFile));
+		return $this->basePath.'/'.strtolower(FileNameFilter::create()->filter($this->logFile));
 	}
 
 	/**
@@ -77,7 +77,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/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/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/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]);
 			}
 		}

code/tasks/SyncProjectsAndEnvironments.php

Spacing +10 added lines, -10 removed lines

@@ -19,9 +19,9 @@ 
 
 		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);
 		}
 
@@ -67,7 +67,7 @@ 
 		}
 
 		foreach($removeList as $remove) {
-			$this->message('Removing "' . basename($remove->Name) . '" from db');
+			$this->message('Removing "'.basename($remove->Name).'" from db');
 			if(!$dryRun) {
 				$removeList->remove($remove);
 			}
@@ -88,7 +88,7 @@ 
 		}
 
 		foreach($removeList as $remove) {
-			$this->message($remove->Name . ' ' . $remove->Path);
+			$this->message($remove->Name.' '.$remove->Path);
 			if(!$dryrun) {
 				$removeList->remove($remove);
 			}
@@ -120,7 +120,7 @@ 
 				continue;
 			}
 
-			$this->message('Adding "' . basename($path) . '" to db');
+			$this->message('Adding "'.basename($path).'" to db');
 			if(!$dryRun) {
 				$environment = DNEnvironment::create_from_path($path);
 				$environment->ProjectID = $project->ID;
@@ -151,9 +151,9 @@ 
 	 */
 	protected function message($text) {
 		if(PHP_SAPI !== 'cli') {
-			$text = '<p>' . $text . '</p>' . PHP_EOL;
+			$text = '<p>'.$text.'</p>'.PHP_EOL;
 		}
-		echo ' - ' . $text . PHP_EOL;
+		echo ' - '.$text.PHP_EOL;
 	}
 
 	/**
@@ -161,9 +161,9 @@ 
 	 */
 	protected function echoHeader($text) {
 		if(PHP_SAPI !== 'cli') {
-			echo '<h2>' . $text . '</h2>' . PHP_EOL;
+			echo '<h2>'.$text.'</h2>'.PHP_EOL;
 		} else {
-			echo '# ' . $text . PHP_EOL;
+			echo '# '.$text.PHP_EOL;
 		}
 	}
 }