silverstripe / deploynaut

code/model/DNData.php

Indentation +2 added lines, -2 removed lines

@@ -158,10 +158,10 @@
 	/**
 	 * Grabs a list of projects from the env directory. The projects
 	 * in the builds directory alone will not be picked up.
- 	 * Returns an array of paths
+	 * Returns an array of paths
 	 *
 	 * @return array
- 	 */
+	 */
 	public function getProjectPaths() {
 		$paths = array();
 		if(!file_exists($this->getEnvironmentDir())) {

Spacing +4 added lines, -4 removed lines

@@ -165,13 +165,13 @@ 
 	public function getProjectPaths() {
 		$paths = array();
 		if(!file_exists($this->getEnvironmentDir())) {
-			throw new Exception('The environment directory '.$this->getEnvironmentDir().' doesn\'t exist. Create it first and add some projects to it.');
+			throw new Exception('The environment directory ' . $this->getEnvironmentDir() . ' doesn\'t exist. Create it first and add some projects to it.');
 		}
 		foreach(scandir($this->getEnvironmentDir()) as $project) {
 			// Exlcude dot-prefixed directories (.git was getting in the way)
 			if(preg_match('/^[^\.]/', $project)) {
-				$path = $this->getEnvironmentDir().'/'.$project;
-				if(is_dir($path) && $project!='.' && $project!='..') {
+				$path = $this->getEnvironmentDir() . '/' . $project;
+				if(is_dir($path) && $project != '.' && $project != '..') {
 					$paths[] = $project;
 				}
 			}
@@ -189,7 +189,7 @@ 
 
 		$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) {

Braces +12 added lines, -4 removed lines

@@ -52,7 +52,9 @@ 
 		parent::__construct();
 
 		// Better to use injector to set these
-		if(func_num_args() == 0) return;
+		if(func_num_args() == 0) {
+			return;
+		}
 		Deprecation::notice(
 			'1.2.0',
 			"Don't construct DNData with parameters. Assign settings via properties instead"
@@ -78,7 +80,9 @@ 
 	 * @param string $environmentDir
 	 */
 	public function setEnvironmentDir($environmentDir) {
-		if($environmentDir[0] != "/") $environmentDir = BASE_PATH . '/' . $environmentDir;
+		if($environmentDir[0] != "/") {
+			$environmentDir = BASE_PATH . '/' . $environmentDir;
+		}
 		$this->environmentDir = realpath($environmentDir) ?: $environmentDir;
 	}
 
@@ -97,7 +101,9 @@ 
 	 * @param string $keyDir
 	 */
 	public function setKeyDir($keyDir) {
-		if($keyDir[0] != "/") $keyDir = BASE_PATH . '/' . $keyDir;
+		if($keyDir[0] != "/") {
+			$keyDir = BASE_PATH . '/' . $keyDir;
+		}
 		$this->keyDir = realpath($keyDir) ?: $keyDir;
 	}
 
@@ -137,7 +143,9 @@ 
 	 * @param string $transferDir
 	 */
 	public function setDataTransferDir($transferDir) {
-		if($transferDir[0] != "/") $transferDir = BASE_PATH . '/' . $transferDir;
+		if($transferDir[0] != "/") {
+			$transferDir = BASE_PATH . '/' . $transferDir;
+		}
 		if(strpos($transferDir, ASSETS_PATH) === false) {
 			throw new LogicException(sprintf(
 				'DNData::dataTransferDir needs to be located within <webroot>assets/ (location: %s)',

code/model/DNDataArchive.php

Spacing +3 added lines, -3 removed lines

@@ -254,7 +254,7 @@ 
 	 * @return boolean true if $member can upload archives linked to this environment, false if they can't.
 	 */
 	public function canMoveTo($targetEnv, $member = null) {
-		if ($this->Environment()->Project()->ID!=$targetEnv->Project()->ID) {
+		if($this->Environment()->Project()->ID != $targetEnv->Project()->ID) {
 			// We don't permit moving snapshots between projects at this stage.
 			return false;
 		}
@@ -266,7 +266,7 @@ 
 		if(Permission::checkMember($member, 'ADMIN')) return true;
 
 		// Checks if the user can actually access the archive.
-		if (!$this->canDownload($member)) return false;
+		if(!$this->canDownload($member)) return false;
 
 		// Hooks into ArchiveUploaders permission to prevent proliferation of permission checkboxes.
 		// Bypasses the quota check - we don't need to check for it as long as we move the snapshot within the project.
@@ -284,7 +284,7 @@ 
 		$archive = $this;
 		$envs = $this->Environment()->Project()->DNEnvironmentList()
 			->filterByCallback(function($item) use ($archive) {
-				return $archive->EnvironmentID!=$item->ID && $archive->canMoveTo($item);
+				return $archive->EnvironmentID != $item->ID && $archive->canMoveTo($item);
 			});
 
 		return $envs;

Braces +19 added lines, -6 removed lines

@@ -207,7 +207,9 @@ 
 	 */
 	public function canRestore($member = null) {
 		$memberID = $member ? $member->ID : Member::currentUserID();
-		if(!$memberID) return false;
+		if(!$memberID) {
+			return false;
+		}
 
 		$key = $memberID . '-' . $this->EnvironmentID;
 		if(!isset(self::$_cache_can_restore[$key])) {
@@ -226,7 +228,9 @@ 
 	 */
 	public function canDownload($member = null) {
 		$memberID = $member ? $member->ID : Member::currentUserID();
-		if(!$memberID) return false;
+		if(!$memberID) {
+			return false;
+		}
 
 		$key = $memberID . '-' . $this->EnvironmentID;
 		if(!isset(self::$_cache_can_download[$key])) {
@@ -259,14 +263,23 @@ 
 			return false;
 		}
 
-		if(!$member) $member = Member::currentUser();
-		if(!$member) return false; // Must be logged in to check permissions
+		if(!$member) {
+			$member = Member::currentUser();
+		}
+		if(!$member) {
+			return false;
+		}
+		// Must be logged in to check permissions
 
 		// Admin can always move.
-		if(Permission::checkMember($member, 'ADMIN')) return true;
+		if(Permission::checkMember($member, 'ADMIN')) {
+			return true;
+		}
 
 		// Checks if the user can actually access the archive.
-		if (!$this->canDownload($member)) return false;
+		if (!$this->canDownload($member)) {
+			return false;
+		}
 
 		// Hooks into ArchiveUploaders permission to prevent proliferation of permission checkboxes.
 		// Bypasses the quota check - we don't need to check for it as long as we move the snapshot within the project.

code/model/DNFilteredCommits.php

Spacing +2 added lines, -2 removed lines

@@ -43,7 +43,7 @@ 
 	}
 
 	public function getCommits() {
-		if (!isset($this->env)) {
+		if(!isset($this->env)) {
 			$this->environmentNotSetException();
 		}
 		$successfulCommits =
@@ -54,7 +54,7 @@ 
 	}
 
 	public function getLatestCommit() {
-		if (!isset($this->env)) {
+		if(!isset($this->env)) {
 			$this->environmentNotSetException();
 		}
 		$commits = $this->getCommits();

code/model/GitonomyCache.php

Spacing +1 added lines, -1 removed lines

@@ -7,7 +7,7 @@
 	public static $cache = array();
 
 	public static function getIncludingBranches($commit) {
-		$cacheKey = 'getIncludingBranches-' .$commit->getRepository()->getPath() . '-' . $commit->gethash();
+		$cacheKey = 'getIncludingBranches-' . $commit->getRepository()->getPath() . '-' . $commit->gethash();
 		if(!isset(self::$cache[$cacheKey])) {
 			self::$cache[$cacheKey] = $commit->getIncludingBranches();
 		}

code/model/steps/DeploymentPipelineStep.php

Spacing +2 added lines, -2 removed lines

@@ -45,7 +45,7 @@ 
 						return false;
 				}
 			case 'Queued':
-				if ($this->Pipeline()->SkipSnapshot) {
+				if($this->Pipeline()->SkipSnapshot) {
 					return $this->startDeploy();
 				} else {
 					return $this->createSnapshot();
@@ -84,7 +84,7 @@ 
 
 		// Skip deployment for dry run
 		if($this->Pipeline()->DryRun) {
-			$this->log("[Skipped] Create DNDeployment for SHA ".$pipeline->SHA);
+			$this->log("[Skipped] Create DNDeployment for SHA " . $pipeline->SHA);
 			$this->write();
 			return true;
 		}

code/model/steps/EmergencyRollbackStep.php

Spacing +4 added lines, -4 removed lines

@@ -38,7 +38,7 @@ 
 		}
 
 		// check if we have timed out
-		if ($this->isTimedOut()) {
+		if($this->isTimedOut()) {
 			$this->log(sprintf(_t('EmergencyRollbackStep.ROLLBACKTIMEOUT',
 				"{$this->Title} is older than %s seconds and has timed out"),
 				$this->MaxDuration));
@@ -85,7 +85,7 @@ 
 			);
 		}
 
-		if ($this->Status == 'Queued') {
+		if($this->Status == 'Queued') {
 			$this->start();
 		}
 
@@ -96,7 +96,7 @@ 
 		$this->write();
 
 		// Rollback itself is handled by the Pipeline object. This step will be marked as failed.
-		if ($this->Pipeline()->isRunning()) {
+		if($this->Pipeline()->isRunning()) {
 			$this->Pipeline()->markFailed();
 			return true;
 		} else {
@@ -127,7 +127,7 @@ 
 	 */
 	public function beginRollbackWindow() {
 		$this->Status = 'Started';
-		if (!$this->Started) $this->Started = SS_Datetime::now()->Rfc2822();
+		if(!$this->Started) $this->Started = SS_Datetime::now()->Rfc2822();
 		$this->log(_t('EmergencyRollbackStep.BEGINROLLBACKWINDOW',
 			"{$this->Title} is beginning a rollback window..."));
 		$this->write();

Braces +6 added lines, -2 removed lines

@@ -127,7 +127,9 @@ 
 	 */
 	public function beginRollbackWindow() {
 		$this->Status = 'Started';
-		if (!$this->Started) $this->Started = SS_Datetime::now()->Rfc2822();
+		if (!$this->Started) {
+			$this->Started = SS_Datetime::now()->Rfc2822();
+		}
 		$this->log(_t('EmergencyRollbackStep.BEGINROLLBACKWINDOW',
 			"{$this->Title} is beginning a rollback window..."));
 		$this->write();
@@ -138,7 +140,9 @@ 
 
 	public function getRunningDescription() {
 		// Don't show options if this step has already been confirmed
-		if($this->RolledBack) return;
+		if($this->RolledBack) {
+			return;
+		}
 
 		return _t('EmergencyRollbackStep.RUNNINGDESCRIPTION',
 			'You may now roll back to the previous version, if needed.');

code/model/steps/LongRunningPipelineStep.php

Braces +3 added lines, -1 removed lines

@@ -41,7 +41,9 @@
 		if($this->Started) {
 			$started = intval($this->dbObject('Started')->Format('U'));
 			$now = intval(SS_Datetime::now()->Format('U'));
-			if($started && $now) return $now - $started;
+			if($started && $now) {
+				return $now - $started;
+			}
 		}
 		return 0;
 	}

code/model/steps/RollbackStep.php

Spacing +1 added lines, -1 removed lines

@@ -219,7 +219,7 @@
 	 * @return boolean
 	 */
 	protected function doRestoreDB() {
-		if ($this->Pipeline()->SkipSnapshot) return false;
+		if($this->Pipeline()->SkipSnapshot) return false;
 
 		return $this->getConfigSetting('RestoreDB') && $this->Pipeline()->PreviousSnapshot();
 	}

Braces +3 added lines, -1 removed lines

@@ -219,7 +219,9 @@
 	 * @return boolean
 	 */
 	protected function doRestoreDB() {
-		if ($this->Pipeline()->SkipSnapshot) return false;
+		if ($this->Pipeline()->SkipSnapshot) {
+			return false;
+		}
 
 		return $this->getConfigSetting('RestoreDB') && $this->Pipeline()->PreviousSnapshot();
 	}

code/tasks/SyncProjectsAndEnvironments.php

Spacing +12 added lines, -12 removed lines

@@ -8,18 +8,18 @@ 
 		$dryRun = true;
 
 		if($request && $request->requestVar('remove') !== NULL) {
-			$remove = (bool) $request->requestVar('remove');
+			$remove = (bool)$request->requestVar('remove');
 		}
 
 		if($request && $request->requestVar('dryrun') !== NULL) {
-			$dryRun = (bool) $request->requestVar('dryrun');
+			$dryRun = (bool)$request->requestVar('dryrun');
 		}
 
 		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);
 		}
 
@@ -64,7 +64,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);
 			}
@@ -84,7 +84,7 @@ 
 		}
 
 		foreach($removeList as $remove) {
-			$this->message($remove->Name.' '.$remove->Path);
+			$this->message($remove->Name . ' ' . $remove->Path);
 			if(!$dryrun) {
 				$removeList->remove($remove);
 			}
@@ -115,7 +115,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;
@@ -146,9 +146,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;
 	}
 
 	/**
@@ -157,9 +157,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;
 		}
 	}
 }

Upper-Lower-Casing +2 added lines, -2 removed lines

@@ -7,11 +7,11 @@
 		$remove = true;
 		$dryRun = true;
 
-		if($request && $request->requestVar('remove') !== NULL) {
+		if($request && $request->requestVar('remove') !== null) {
 			$remove = (bool) $request->requestVar('remove');
 		}
 
-		if($request && $request->requestVar('dryrun') !== NULL) {
+		if($request && $request->requestVar('dryrun') !== null) {
 			$dryRun = (bool) $request->requestVar('dryrun');
 		}