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/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/DeployJob.php

Spacing +3 added lines, -3 removed lines

@@ -16,7 +16,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']);
@@ -50,11 +50,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;
 	}
 
 	/**

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/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/DNProject.php

Doc Comments +2 added lines, -2 removed lines

@@ -445,7 +445,7 @@ 
 	}
 
 	/**
-	 * @return false|Gitonomy\Git\Repository
+	 * @return Gitonomy\Git\Repository
 	 */
 	public function getRepository() {
 		if(!$this->repoExists()) {
@@ -953,7 +953,7 @@ 
 	/**
 	 * Check if member has a permission code in this project.
 	 *
-	 * @param string $code
+	 * @param string $codes
 	 * @param Member|null $member
 	 *
 	 * @return bool

Spacing +15 added lines, -15 removed lines

@@ -256,7 +256,7 @@ 
 	 * @return bool
 	 */
 	public function canRestore($member = null) {
-		if ($this->allowedAny(
+		if($this->allowedAny(
 			array(
 				DNRoot::ALLOW_PROD_SNAPSHOT,
 				DNRoot::ALLOW_NON_PROD_SNAPSHOT
@@ -276,7 +276,7 @@ 
 	 * @return bool
 	 */
 	public function canBackup($member = null) {
-		if ($this->allowedAny(
+		if($this->allowedAny(
 			array(
 				DNRoot::ALLOW_PROD_SNAPSHOT,
 				DNRoot::ALLOW_NON_PROD_SNAPSHOT
@@ -296,7 +296,7 @@ 
 	 * @return bool
 	 */
 	public function canUploadArchive($member = null) {
-		if ($this->allowedAny(
+		if($this->allowedAny(
 			array(
 				DNRoot::ALLOW_PROD_SNAPSHOT,
 				DNRoot::ALLOW_NON_PROD_SNAPSHOT
@@ -316,7 +316,7 @@ 
 	 * @return bool
 	 */
 	public function canDownloadArchive($member = null) {
-		if ($this->allowedAny(
+		if($this->allowedAny(
 			array(
 				DNRoot::ALLOW_PROD_SNAPSHOT,
 				DNRoot::ALLOW_NON_PROD_SNAPSHOT
@@ -385,7 +385,7 @@ 
 			// Key-pair is available, use it.
 			$processEnv = array(
 				'IDENT_KEY' => $this->getPrivateKeyPath(),
-				'GIT_SSH' => BASE_PATH . "/deploynaut/git-deploy.sh"
+				'GIT_SSH' => BASE_PATH."/deploynaut/git-deploy.sh"
 			);
 		} else {
 			$processEnv = array();
@@ -646,7 +646,7 @@ 
 	 * @return bool
 	 */
 	public function repoExists() {
-		return file_exists(DEPLOYNAUT_LOCAL_VCS_PATH . '/' . $this->Name.'/HEAD');
+		return file_exists(DEPLOYNAUT_LOCAL_VCS_PATH.'/'.$this->Name.'/HEAD');
 	}
 
 	/**
@@ -664,7 +664,7 @@ 
 	 * @return string
 	 */
 	public function getLocalCVSPath() {
-		return DEPLOYNAUT_LOCAL_VCS_PATH . '/' . $this->Name;
+		return DEPLOYNAUT_LOCAL_VCS_PATH.'/'.$this->Name;
 	}
 
 	/**
@@ -740,7 +740,7 @@ 
 	 */
 	public function getPublicKeyPath() {
 		if($privateKey = $this->getPrivateKeyPath()) {
-			return $privateKey . '.pub';
+			return $privateKey.'.pub';
 		}
 		return null;
 	}
@@ -755,7 +755,7 @@ 
 		if(!empty($keyDir)) {
 			$filter = FileNameFilter::create();
 			$name = $filter->filter($this->Name);
-			return $keyDir . '/' . $name;
+			return $keyDir.'/'.$name;
 		}
 		return null;
 	}
@@ -774,7 +774,7 @@ 
 		$filter = FileNameFilter::create();
 		$name = $filter->filter($this->Name);
 
-		return $this->DNData()->getKeyDir() . '/' . $name;
+		return $this->DNData()->getKeyDir().'/'.$name;
 	}
 
 	/**
@@ -861,7 +861,7 @@ 
 		/* Look for each whitelisted hostname */
 		foreach($interfaces as $host => $interface) {
 			/* See if the CVS Path is for this hostname, followed by some junk (maybe a port), then the path */
-			if(preg_match('{^[^.]*' . $host . '(.*?)([/a-zA-Z].+)}', $this->CVSPath, $match)) {
+			if(preg_match('{^[^.]*'.$host.'(.*?)([/a-zA-Z].+)}', $this->CVSPath, $match)) {
 
 				$path = $match[2];
 
@@ -872,10 +872,10 @@ 
 				$components = explode('.', $host);
 
 				foreach($regex as $pattern => $replacement) {
-					$path = preg_replace('/' . $pattern . '/', $replacement, $path);
+					$path = preg_replace('/'.$pattern.'/', $replacement, $path);
 				}
 
-				$uxurl = Controller::join_links($scheme . '://', $host, $path);
+				$uxurl = Controller::join_links($scheme.'://', $host, $path);
 
 				if(array_key_exists('commit', $interface) && $interface['commit'] == false) {
 					$commiturl = false;
@@ -959,14 +959,14 @@ 
 	 * @return bool
 	 */
 	public function allowedAny($codes, $member = null) {
-		if (!$member) {
+		if(!$member) {
 			$member = Member::currentUser();
 		}
 
 		if(Permission::checkMember($member, 'ADMIN')) return true;
 
 		$hits = $this->whoIsAllowedAny($codes)->filter('Member.ID', $member->ID)->count();
-		return ($hits>0 ? true : false);
+		return ($hits > 0 ? true : false);
 	}
 
 }

Braces +6 added lines, -2 removed lines

@@ -921,7 +921,9 @@ 
 	 * @return SS_List
 	 */
 	public function whoIsAllowedAny($codes) {
-		if(!is_array($codes)) $codes = array($codes);
+		if(!is_array($codes)) {
+			$codes = array($codes);
+		}
 
 		$SQLa_codes = Convert::raw2sql($codes);
 		$SQL_codes = join("','", $SQLa_codes);
@@ -963,7 +965,9 @@ 
 			$member = Member::currentUser();
 		}
 
-		if(Permission::checkMember($member, 'ADMIN')) return true;
+		if(Permission::checkMember($member, 'ADMIN')) {
+			return true;
+		}
 
 		$hits = $this->whoIsAllowedAny($codes)->filter('Member.ID', $member->ID)->count();
 		return ($hits>0 ? true : false);

code/jobs/CloneGitRepo.php

Spacing +9 added lines, -9 removed lines

@@ -18,7 +18,7 @@ 
 		$path = $this->args['path'];
 		$repo = $this->args['repo'];
 		$env = $this->args['env'];
-		$logfile = DEPLOYNAUT_LOG_PATH . '/clonegitrepo.log';
+		$logfile = DEPLOYNAUT_LOG_PATH.'/clonegitrepo.log';
 		$fh = fopen($logfile, 'a');
 		if(!$fh) {
 			throw new RuntimeException(sprintf('Can\'t open file "%s" for logging.', $logfile));
@@ -34,8 +34,8 @@ 
 			}
 			$command[] = sprintf('rm -rf %s', $path);
 
-			fwrite($fh, sprintf('[%s] Cleaning up existing repository %s', date('Y-m-d H:i:s'), $path) . PHP_EOL);
-			fwrite($fh, sprintf('[%s] Running command: %s', date('Y-m-d H:i:s'), implode(' ', $command)) . PHP_EOL);
+			fwrite($fh, sprintf('[%s] Cleaning up existing repository %s', date('Y-m-d H:i:s'), $path).PHP_EOL);
+			fwrite($fh, sprintf('[%s] Running command: %s', date('Y-m-d H:i:s'), implode(' ', $command)).PHP_EOL);
 
 			$process = new \Symfony\Component\Process\Process(implode(' ', $command));
 			$process->setEnv($env);
@@ -46,13 +46,13 @@ 
 					'[%s] Error cleaning up existing repository: %s',
 					date('Y-m-d H:i:s'),
 					$process->getErrorOutput()
-				) . PHP_EOL);
+				).PHP_EOL);
 				throw new RuntimeException($process->getErrorOutput());
 			}
 		}
 
-		fwrite($fh, sprintf('[%s] Cloning repository %s to %s', date('Y-m-d H:i:s'), $repo, $path) . PHP_EOL);
-		echo "[-] CloneGitRepo starting" . PHP_EOL;
+		fwrite($fh, sprintf('[%s] Cloning repository %s to %s', date('Y-m-d H:i:s'), $repo, $path).PHP_EOL);
+		echo "[-] CloneGitRepo starting".PHP_EOL;
 
 		$command = array();
 		if(!empty($user)) {
@@ -60,7 +60,7 @@ 
 		}
 		$command[] = sprintf('git clone --bare -q %s %s', $repo, $path);
 
-		fwrite($fh, sprintf('[%s] Running command: %s', date('Y-m-d H:i:s'), implode(' ', $command)) . PHP_EOL);
+		fwrite($fh, sprintf('[%s] Running command: %s', date('Y-m-d H:i:s'), implode(' ', $command)).PHP_EOL);
 
 		$process = new \Symfony\Component\Process\Process(implode(' ', $command));
 		$process->setEnv($env);
@@ -73,7 +73,7 @@ 
 				$repo,
 				$path,
 				$process->getErrorOutput()
-			) . PHP_EOL);
+			).PHP_EOL);
 			throw new RuntimeException($process->getErrorOutput());
 		}
 
@@ -82,7 +82,7 @@ 
 			date('Y-m-d H:i:s'),
 			$repo,
 			$path
-		) . PHP_EOL);
+		).PHP_EOL);
 	}
 
 }

code/jobs/FetchJob.php

Spacing +1 added lines, -1 removed lines

@@ -23,7 +23,7 @@
 		$path = $project->getLocalCVSPath();
 		$env = $this->args['env'];
 
-		$log->write('Starting git fetch for project "' . $project->Name . '"');
+		$log->write('Starting git fetch for project "'.$project->Name.'"');
 
 		// if an alternate user has been configured for clone, run the command as that user
 		// @todo Gitonomy doesn't seem to have any way to prefix the command properly, if you