silverstripe / deploynaut

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;
 		}
 	}
 }

code/api/nouns/APIProject.php

Spacing +2 added lines, -2 removed lines

@@ -87,9 +87,9 @@
 		$fetch->write();
 		$fetch->start();
 
-		$location = Director::absoluteBaseURL() . $this->Link() . '/fetch/' . $fetch->ID;
+		$location = Director::absoluteBaseURL().$this->Link().'/fetch/'.$fetch->ID;
 		$output = array(
-			'message' => 'Fetch queued as job ' . $fetch->ResqueToken,
+			'message' => 'Fetch queued as job '.$fetch->ResqueToken,
 			'href' => $location,
 		);
 

code/api/nouns/APIEnvironment.php

Spacing +4 added lines, -4 removed lines

@@ -112,9 +112,9 @@ 
 		$ping->write();
 		$ping->start();
 
-		$location = Director::absoluteBaseURL() . $this->Link() . '/ping/' . $ping->ID;
+		$location = Director::absoluteBaseURL().$this->Link().'/ping/'.$ping->ID;
 		$output = array(
-			'message' => 'Ping queued as job ' . $ping->ResqueToken,
+			'message' => 'Ping queued as job '.$ping->ResqueToken,
 			'href' => $location,
 		);
 
@@ -164,9 +164,9 @@ 
 		));
 		$deploy = $strategy->createDeployment();
 		$deploy->start();
-		$location = Director::absoluteBaseURL() . $this->Link() . '/deploy/' . $deploy->ID;
+		$location = Director::absoluteBaseURL().$this->Link().'/deploy/'.$deploy->ID;
 		$output = array(
-			'message' => 'Deploy queued as job ' . $deploy->ResqueToken,
+			'message' => 'Deploy queued as job '.$deploy->ResqueToken,
 			'href' => $location,
 		);
 		$response = $this->getAPIResponse($output);

code/api/DeploynautAPI.php

Spacing +2 added lines, -2 removed lines

@@ -105,7 +105,7 @@ 
 	 */
 	protected function project404Response() {
 		$projectName = Convert::raw2xml($this->getRequest()->latestParam('Project'));
-		return new SS_HTTPResponse('Project "' . $projectName . '" not found.', 404);
+		return new SS_HTTPResponse('Project "'.$projectName.'" not found.', 404);
 	}
 
 	/**
@@ -113,7 +113,7 @@ 
 	 */
 	protected function environment404Response() {
 		$envName = Convert::raw2xml($this->getRequest()->latestParam('Environment'));
-		return new SS_HTTPResponse('Environment "' . $envName . '" not found.', 404);
+		return new SS_HTTPResponse('Environment "'.$envName.'" not found.', 404);
 	}
 
 	/**

code/jobs/PingJob.php

Spacing +1 added lines, -1 removed lines

@@ -31,7 +31,7 @@
 	 * Do the actual job by calling the appropiate backend
 	 */
 	public function perform() {
-		echo "[-] PingJob starting" . PHP_EOL;
+		echo "[-] PingJob starting".PHP_EOL;
 		$log = new DeploynautLogFile($this->args['logfile']);
 
 		$ping = DNPing::get()->byID($this->args['pingID']);

code/jobs/CreateEnvJob.php

Spacing +3 added lines, -3 removed lines

@@ -19,7 +19,7 @@ 
 	 *
 	 */
 	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']);
@@ -31,11 +31,11 @@ 
 			$envCreate->createEnvironment();
 
 		} catch(Exception $e) {
-			echo "[-] CreateEnvJob failed" . PHP_EOL;
+			echo "[-] CreateEnvJob failed".PHP_EOL;
 			throw $e;
 		}
 		$this->updateStatus('Finished');
-		echo "[-] CreateEnvJob finished" . PHP_EOL;
+		echo "[-] CreateEnvJob finished".PHP_EOL;
 	}
 
 	/**

code/jobs/DataTransferJob.php

Spacing +3 added lines, -3 removed lines

@@ -20,7 +20,7 @@ 
 	}
 
 	public function perform() {
-		echo "[-] DataTransferJob starting" . PHP_EOL;
+		echo "[-] DataTransferJob starting".PHP_EOL;
 		$log = new DeploynautLogFile($this->args['logfile']);
 		$dataTransfer = DNDataTransfer::get()->byID($this->args['dataTransferID']);
 		$environment = $dataTransfer->Environment();
@@ -83,12 +83,12 @@ 
 		} catch(RuntimeException $exc) {
 			$log->write($exc->getMessage());
 
-			echo "[-] DataTransferJob failed" . PHP_EOL;
+			echo "[-] DataTransferJob failed".PHP_EOL;
 			throw $exc;
 		}
 
 		$this->updateStatus('Finished');
-		echo "[-] DataTransferJob finished" . PHP_EOL;
+		echo "[-] DataTransferJob finished".PHP_EOL;
 	}
 
 	/**

code/model/jobs/DNDeployment.php

Braces +6 added lines, -2 removed lines

@@ -205,12 +205,16 @@
 	 */
 	public function getFullDeployMessages() {
 		$strategy = $this->getDeploymentStrategy();
-		if ($strategy->getActionCode()!=='full') return null;
+		if ($strategy->getActionCode()!=='full') {
+			return null;
+		}
 
 		$changes = $strategy->getChangesModificationNeeded();
 		$messages = [];
 		foreach ($changes as $change => $details) {
-			if ($change==='Code version') continue;
+			if ($change==='Code version') {
+				continue;
+			}
 
 			$messages[] = [
 				'Flag' => sprintf(

Spacing +7 added lines, -7 removed lines

@@ -73,7 +73,7 @@ 
 	}
 
 	public function LogLink() {
-		return $this->Link() . '/log';
+		return $this->Link().'/log';
 	}
 
 	public function canView($member = null) {
@@ -207,12 +207,12 @@ 
 	 */
 	public function getFullDeployMessages() {
 		$strategy = $this->getDeploymentStrategy();
-		if ($strategy->getActionCode()!=='full') return null;
+		if($strategy->getActionCode() !== 'full') return null;
 
 		$changes = $strategy->getChangesModificationNeeded();
 		$messages = [];
-		foreach ($changes as $change => $details) {
-			if ($change==='Code version') continue;
+		foreach($changes as $change => $details) {
+			if($change === 'Code version') continue;
 
 			$messages[] = [
 				'Flag' => sprintf(
@@ -223,7 +223,7 @@ 
 			];
 		}
 
-		if (empty($messages)) {
+		if(empty($messages)) {
 			$messages[] = [
 				'Flag' => '',
 				'Text' => '<i>Environment changes have been made.</i>'
@@ -272,7 +272,7 @@ 
 
 			// if there is a compare URL, and a description or a change (something actually changed)
 			// then show the URL. Otherwise don't show anything, as there is no comparison to be made.
-			if ($changed || $description) {
+			if($changed || $description) {
 				$compareUrl = isset($change['compareUrl']) ? $change['compareUrl'] : '';
 			}
 
@@ -353,6 +353,6 @@ 
 	}
 
 	public function isAborting() {
-		return $this->Status=='Aborting';
+		return $this->Status == 'Aborting';
 	}
 }

code/jobs/DeployJob.php

Spacing +9 added lines, -9 removed lines

@@ -12,7 +12,7 @@ 
 
 	public static function sig_file_for_data_object($dataObject) {
 		$dir = DNData::inst()->getSignalDir();
-		if (!is_dir($dir)) {
+		if(!is_dir($dir)) {
 			`mkdir $dir`;
 		}
 		return sprintf(
@@ -41,9 +41,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,
@@ -54,7 +54,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()
 				);
@@ -76,8 +76,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);
@@ -89,7 +89,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']);
@@ -123,11 +123,11 @@ 
 				$this->args
 			);
 		} catch(Exception $e) {
-			echo "[-] DeployJob failed" . PHP_EOL;
+			echo "[-] DeployJob failed".PHP_EOL;
 			throw $e;
 		}
 		$this->updateStatus('Finished');
-		echo "[-] DeployJob finished" . PHP_EOL;
+		echo "[-] DeployJob finished".PHP_EOL;
 	}
 
 	/**