silverstripe / deploynaut

code/jobs/CreateEnvJob.php

Spacing +5 added lines, -5 removed lines

@@ -19,23 +19,23 @@
 	 *
 	 */
 	public function perform() {
-		echo "[-] CreateEnvJob starting" . PHP_EOL;
+		echo "[-] CreateEnvJob starting".PHP_EOL;
 		// This is a bit icky, but there is no easy way of capturing a failed deploy by using the PHP Resque
 		try {
 			$envCreate = DNCreateEnvironment::get()->byId($this->args['createID']);
-			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) {
-			echo "[-] CreateEnvJob failed" . PHP_EOL;
+		} catch (Exception $e) {
+			echo "[-] CreateEnvJob failed".PHP_EOL;
 			throw $e;
 		}
 		$this->updateStatus('Finished');
-		echo "[-] CreateEnvJob finished" . PHP_EOL;
+		echo "[-] CreateEnvJob finished".PHP_EOL;
 	}
 
 	/**

code/jobs/FetchJob.php

Spacing +14 added lines, -14 removed lines

@@ -33,12 +33,12 @@ 
 	public function perform() {
 		set_time_limit(0);
 
-		if(!empty($this->args['logfile'])) {
+		if (!empty($this->args['logfile'])) {
 			$this->log = new DeploynautLogFile($this->args['logfile']);
 		}
 
 		$this->project = DNProject::get()->byId($this->args['projectID']);
-		if(!($this->project && $this->project->exists())) {
+		if (!($this->project && $this->project->exists())) {
 			throw new RuntimeException(sprintf('Project ID %s not found', $this->args['projectID']));
 		}
 
@@ -47,7 +47,7 @@ 
 		// Disallow concurrent git fetches on the same project.
 		// Only consider fetches started in the last 30 minutes (older jobs probably got stuck)
 		try {
-			if(!empty($this->args['fetchID'])) {
+			if (!empty($this->args['fetchID'])) {
 				$runningFetches = DNGitFetch::get()
 					->filter(array(
 						'ProjectID' => $this->project->ID,
@@ -56,14 +56,14 @@ 
 					))
 					->exclude('ID', $this->args['fetchID']);
 
-				if($runningFetches->count()) {
+				if ($runningFetches->count()) {
 					$runningFetch = $runningFetches->first();
 					$message = sprintf(
 						'Another fetch is in progress (started at %s by %s)',
 						$runningFetch->dbObject('Created')->Nice(),
 						$runningFetch->Deployer()->Title
 					);
-					if($this->log) {
+					if ($this->log) {
 						$this->log->write($message);
 					}
 					throw new RuntimeException($message);
@@ -72,13 +72,13 @@ 
 
 			// Decide whether we need to just update what we already have
 			// or initiate a clone if no local repo exists.
-			if($this->project->repoExists() && empty($this->args['forceClone'])) {
+			if ($this->project->repoExists() && empty($this->args['forceClone'])) {
 				$this->fetchRepo();
 			} else {
 				$this->cloneRepo();
 			}
-		} catch(Exception $e) {
-			if($this->log) {
+		} catch (Exception $e) {
+			if ($this->log) {
 				$this->log->write($e->getMessage());
 			}
 			throw $e;
@@ -95,7 +95,7 @@ 
 	}
 
 	protected function cloneRepo() {
-		if(file_exists($this->project->getLocalCVSPath())) {
+		if (file_exists($this->project->getLocalCVSPath())) {
 			$this->runCommand(sprintf(
 				'rm -rf %s',
 				escapeshellarg($this->project->getLocalCVSPath())
@@ -117,17 +117,17 @@ 
 	 * @throws RuntimeException
 	 */
 	protected function runCommand($command, $workingDir = null) {
-		if(!empty($this->user)) {
+		if (!empty($this->user)) {
 			$command = sprintf('sudo -u %s %s', $this->user, $command);
 		}
-		if($this->log) {
+		if ($this->log) {
 			$this->log->write(sprintf('Running command: %s', $command));
 		}
 		$process = new AbortableProcess($command, $workingDir);
 		$process->setEnv($this->project->getProcessEnv());
 		$process->setTimeout(1800);
 		$process->run();
-		if(!$process->isSuccessful()) {
+		if (!$process->isSuccessful()) {
 			throw new RuntimeException($process->getErrorOutput());
 		}
 	}
@@ -140,9 +140,9 @@ 
 		global $databaseConfig;
 		DB::connect($databaseConfig);
 
-		if(!empty($this->args['fetchID'])) {
+		if (!empty($this->args['fetchID'])) {
 			$fetch = DNGitFetch::get()->byID($this->args['fetchID']);
-			if($fetch && $fetch->exists()) {
+			if ($fetch && $fetch->exists()) {
 				$fetch->Status = $status;
 				$fetch->write();
 			}

code/form/TabbedSelectionGroup.php

Spacing +1 added lines, -1 removed lines

@@ -9,7 +9,7 @@
 		$items = CompositeField::FieldList()->toArray();
 		$fields = new ArrayList();
 
-		foreach($items as $item) {
+		foreach ($items as $item) {
 			$extra = array(
 				'Selected' => $this->value == $item->getValue(),
 			);

code/form/DataArchiveFileField.php

Spacing +7 added lines, -7 removed lines

@@ -15,11 +15,11 @@ 
 	 * @return bool|DataArchiveFileField
 	 */
 	public function saveInto(DataObjectInterface $record) {
-		if(!isset($_FILES[$this->name])) {
+		if (!isset($_FILES[$this->name])) {
 			return false;
 		}
 
-		if(!($record instanceof DNDataArchive)) {
+		if (!($record instanceof DNDataArchive)) {
 			throw new LogicException('Saving into wrong type, expected DNDataArchive');
 		}
 
@@ -27,7 +27,7 @@ 
 
 		/** @var DNDataTransfer $dataTransfer */
 		$dataTransfer = $dataArchive->DataTransfers()->First();
-		if(!$dataTransfer) {
+		if (!$dataTransfer) {
 			throw new LogicException('No transfer found');
 		}
 
@@ -36,16 +36,16 @@ 
 		// 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()) {
+		if ($this->upload->isError()) {
 			return false;
 		}
 
 		$file = $this->upload->getFile();
-		if($this->relationAutoSetting) {
+		if ($this->relationAutoSetting) {
 			// save to record
-			$record->{$this->name . 'ID'} = $file->ID;
+			$record->{$this->name.'ID'} = $file->ID;
 		}
 
 		return $this;

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;