silverstripe / deploynaut

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

Spacing +6 added lines, -6 removed lines

@@ -73,7 +73,7 @@ 
 	}
 
 	public function LogLink() {
-		return $this->Link() . '/log';
+		return $this->Link().'/log';
 	}
 
 	public function canView($member = null) {
@@ -205,12 +205,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(
@@ -221,7 +221,7 @@ 
 			];
 		}
 
-		if (empty($messages)) {
+		if(empty($messages)) {
 			$messages[] = [
 				'Flag' => '',
 				'Text' => '<i>Environment changes have been made.</i>'
@@ -270,7 +270,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'] : '';
 			}
 

code/model/DNData.php

Spacing +8 added lines, -8 removed lines

@@ -89,7 +89,7 @@ 
 	 */
 	public function setEnvironmentDir($environmentDir) {
 		if($environmentDir[0] != "/") {
-			$environmentDir = BASE_PATH . '/' . $environmentDir;
+			$environmentDir = BASE_PATH.'/'.$environmentDir;
 		}
 		$this->environmentDir = realpath($environmentDir) ?: $environmentDir;
 	}
@@ -110,7 +110,7 @@ 
 	 */
 	public function setKeyDir($keyDir) {
 		if($keyDir[0] != "/") {
-			$keyDir = BASE_PATH . '/' . $keyDir;
+			$keyDir = BASE_PATH.'/'.$keyDir;
 		}
 		$this->keyDir = realpath($keyDir) ?: $keyDir;
 	}
@@ -127,7 +127,7 @@ 
 	 */
 	public function setSignalDir($signalDir) {
 		if($signalDir[0] != "/") {
-			$signalDir = BASE_PATH . '/' . $signalDir;
+			$signalDir = BASE_PATH.'/'.$signalDir;
 		}
 		$this->signalDir = realpath($signalDir) ?: $signalDir;
 	}
@@ -169,7 +169,7 @@ 
 	 */
 	public function setDataTransferDir($transferDir) {
 		if($transferDir[0] != "/") {
-			$transferDir = BASE_PATH . '/' . $transferDir;
+			$transferDir = BASE_PATH.'/'.$transferDir;
 		}
 		if(strpos($transferDir, ASSETS_PATH) === false) {
 			throw new LogicException(sprintf(
@@ -199,14 +199,14 @@ 
 	public function getProjectPaths() {
 		$paths = array();
 		if(!file_exists($this->getEnvironmentDir())) {
-			$eMessage = 'The environment directory ' . $this->getEnvironmentDir() . ' doesn\'t exist. Create it '
+			$eMessage = 'The environment directory '.$this->getEnvironmentDir().' doesn\'t exist. Create it '
 			. 'first and add some projects to it.';
 			throw new Exception($eMessage);
 		}
 		foreach(scandir($this->getEnvironmentDir()) as $project) {
 			// Exlcude dot-prefixed directories (.git was getting in the way)
 			if(preg_match('/^[^\.]/', $project)) {
-				$path = $this->getEnvironmentDir() . '/' . $project;
+				$path = $this->getEnvironmentDir().'/'.$project;
 				if(is_dir($path) && $project != '.' && $project != '..') {
 					$paths[] = $project;
 				}
@@ -221,11 +221,11 @@ 
 	 * Returns an array of paths
 	 */
 	public function getEnvironmentPaths($project) {
-		$baseDir = $this->getEnvironmentDir() . '/' . $project;
+		$baseDir = $this->getEnvironmentDir().'/'.$project;
 
 		$paths = array();
 		if(!file_exists($baseDir)) {
-			throw new Exception('Environment directory ' . $baseDir . ' doesn\'t exist. Create it first.');
+			throw new Exception('Environment directory '.$baseDir.' doesn\'t exist. Create it first.');
 		}
 		// Search the directory for config files.
 		foreach(scandir($baseDir) as $environmentFile) {

code/control/DeployForm.php

Spacing +2 added lines, -2 removed lines

@@ -73,7 +73,7 @@ 
 				substr($sha, 0, 8),
 				$branch->LastUpdated()->TimeDiff()
 			);
-			$branches[$sha . '-' . $name] = $branchValue;
+			$branches[$sha.'-'.$name] = $branchValue;
 		}
 
 		// Tags
@@ -86,7 +86,7 @@ 
 				substr($sha, 0, 8),
 				$branch->LastUpdated()->TimeDiff()
 			);
-			$tags[$sha . '-' . $tag] = $tagValue;
+			$tags[$sha.'-'.$tag] = $tagValue;
 		}
 		$tags = array_reverse($tags);
 

code/model/DNEnvironment.php

Spacing +25 added lines, -25 removed lines

@@ -307,10 +307,10 @@ 
 		}
 		// Must be logged in to check permissions
 
-		if ($this->Usage==='Production' || $this->Usage==='Unspecified') {
-			if ($this->Project()->allowed(DNRoot::ALLOW_PROD_DEPLOYMENT, $member)) return true;
+		if($this->Usage === 'Production' || $this->Usage === 'Unspecified') {
+			if($this->Project()->allowed(DNRoot::ALLOW_PROD_DEPLOYMENT, $member)) return true;
 		} else {
-			if ($this->Project()->allowed(DNRoot::ALLOW_NON_PROD_DEPLOYMENT, $member)) return true;
+			if($this->Project()->allowed(DNRoot::ALLOW_NON_PROD_DEPLOYMENT, $member)) return true;
 		}
 
 		return $this->Deployers()->byID($member->ID)
@@ -342,10 +342,10 @@ 
 		}
 		// Must be logged in to check permissions
 
-		if ($this->Usage==='Production' || $this->Usage==='Unspecified') {
-			if ($this->Project()->allowed(DNRoot::ALLOW_PROD_SNAPSHOT, $member)) return true;
+		if($this->Usage === 'Production' || $this->Usage === 'Unspecified') {
+			if($this->Project()->allowed(DNRoot::ALLOW_PROD_SNAPSHOT, $member)) return true;
 		} else {
-			if ($this->Project()->allowed(DNRoot::ALLOW_NON_PROD_SNAPSHOT, $member)) return true;
+			if($this->Project()->allowed(DNRoot::ALLOW_NON_PROD_SNAPSHOT, $member)) return true;
 		}
 
 		return $this->CanRestoreMembers()->byID($member->ID)
@@ -373,10 +373,10 @@ 
 			return false;
 		}
 
-		if ($this->Usage==='Production' || $this->Usage==='Unspecified') {
-			if ($this->Project()->allowed(DNRoot::ALLOW_PROD_SNAPSHOT, $member)) return true;
+		if($this->Usage === 'Production' || $this->Usage === 'Unspecified') {
+			if($this->Project()->allowed(DNRoot::ALLOW_PROD_SNAPSHOT, $member)) return true;
 		} else {
-			if ($this->Project()->allowed(DNRoot::ALLOW_NON_PROD_SNAPSHOT, $member)) return true;
+			if($this->Project()->allowed(DNRoot::ALLOW_NON_PROD_SNAPSHOT, $member)) return true;
 		}
 
 		return $this->CanBackupMembers()->byID($member->ID)
@@ -408,10 +408,10 @@ 
 		}
 		// Must be logged in to check permissions
 
-		if ($this->Usage==='Production' || $this->Usage==='Unspecified') {
-			if ($this->Project()->allowed(DNRoot::ALLOW_PROD_SNAPSHOT, $member)) return true;
+		if($this->Usage === 'Production' || $this->Usage === 'Unspecified') {
+			if($this->Project()->allowed(DNRoot::ALLOW_PROD_SNAPSHOT, $member)) return true;
 		} else {
-			if ($this->Project()->allowed(DNRoot::ALLOW_NON_PROD_SNAPSHOT, $member)) return true;
+			if($this->Project()->allowed(DNRoot::ALLOW_NON_PROD_SNAPSHOT, $member)) return true;
 		}
 
 		return $this->ArchiveUploaders()->byID($member->ID)
@@ -434,10 +434,10 @@ 
 		}
 		// Must be logged in to check permissions
 
-		if ($this->Usage==='Production' || $this->Usage==='Unspecified') {
-			if ($this->Project()->allowed(DNRoot::ALLOW_PROD_SNAPSHOT, $member)) return true;
+		if($this->Usage === 'Production' || $this->Usage === 'Unspecified') {
+			if($this->Project()->allowed(DNRoot::ALLOW_PROD_SNAPSHOT, $member)) return true;
 		} else {
-			if ($this->Project()->allowed(DNRoot::ALLOW_NON_PROD_SNAPSHOT, $member)) return true;
+			if($this->Project()->allowed(DNRoot::ALLOW_NON_PROD_SNAPSHOT, $member)) return true;
 		}
 
 		return $this->ArchiveDownloaders()->byID($member->ID)
@@ -460,10 +460,10 @@ 
 		}
 		// Must be logged in to check permissions
 
-		if ($this->Usage==='Production' || $this->Usage==='Unspecified') {
-			if ($this->Project()->allowed(DNRoot::ALLOW_PROD_SNAPSHOT, $member)) return true;
+		if($this->Usage === 'Production' || $this->Usage === 'Unspecified') {
+			if($this->Project()->allowed(DNRoot::ALLOW_PROD_SNAPSHOT, $member)) return true;
 		} else {
-			if ($this->Project()->allowed(DNRoot::ALLOW_NON_PROD_SNAPSHOT, $member)) return true;
+			if($this->Project()->allowed(DNRoot::ALLOW_NON_PROD_SNAPSHOT, $member)) return true;
 		}
 
 		return $this->ArchiveDeleters()->byID($member->ID)
@@ -653,7 +653,7 @@ 
 	 * @return string
 	 */
 	public function Link() {
-		return $this->Project()->Link() . "/environment/" . $this->Name;
+		return $this->Project()->Link()."/environment/".$this->Name;
 	}
 
 	/**
@@ -798,7 +798,7 @@ 
 				->buildPermissionField('ArchiveUploaderGroups', 'ArchiveUploaders', $groups, $members)
 				->setTitle('Who can upload?')
 				->setDescription(
-					'Users who can upload archives linked to this environment into Deploynaut.<br />' .
+					'Users who can upload archives linked to this environment into Deploynaut.<br />'.
 					'Linking them to an environment allows limiting download permissions (see below).'
 				),
 
@@ -845,7 +845,7 @@ 
 		// Add actions
 		$action = new FormAction('check', 'Check Connection');
 		$action->setUseButtonTag(true);
-		$dataURL = Director::absoluteBaseURL() . 'naut/api/' . $this->Project()->Name . '/' . $this->Name . '/ping';
+		$dataURL = Director::absoluteBaseURL().'naut/api/'.$this->Project()->Name.'/'.$this->Name.'/ping';
 		$action->setAttribute('data-url', $dataURL);
 		$fields->insertBefore($action, 'Name');
 
@@ -882,8 +882,8 @@ 
 	 */
 	public function onBeforeWrite() {
 		parent::onBeforeWrite();
-		if($this->Name && $this->Name . '.rb' != $this->Filename) {
-			$this->Filename = $this->Name . '.rb';
+		if($this->Name && $this->Name.'.rb' != $this->Filename) {
+			$this->Filename = $this->Name.'.rb';
 		}
 		$this->checkEnvironmentPath();
 		$this->writeConfigFile();
@@ -930,7 +930,7 @@ 
 			&& $this->Filename
 			&& $this->CreateEnvConfig
 		) {
-			$templateFile = $this->config()->template_file ?: BASE_PATH . '/deploynaut/environment.template';
+			$templateFile = $this->config()->template_file ?: BASE_PATH.'/deploynaut/environment.template';
 			file_put_contents($this->getConfigFilename(), file_get_contents($templateFile));
 		} else if($this->envFileExists() && $this->DeployConfig) {
 			file_put_contents($this->getConfigFilename(), $this->DeployConfig);
@@ -985,7 +985,7 @@ 
 		if(!$this->Filename) {
 			return '';
 		}
-		return $this->DNData()->getEnvironmentDir() . '/' . $this->Project()->Name . '/' . $this->Filename;
+		return $this->DNData()->getEnvironmentDir().'/'.$this->Project()->Name.'/'.$this->Filename;
 	}
 
 	/**