silverstripe / deploynaut

code/control/Dispatcher.php

Braces +12 added lines, -4 removed lines

@@ -36,13 +36,17 @@ 
 	}
 
 	protected function getSecurityToken($name = null) {
-		if(is_null($name)) $name = sprintf('%sSecurityID', get_class($this));
+		if(is_null($name)) {
+			$name = sprintf('%sSecurityID', get_class($this));
+		}
 		return new \SecurityToken($name);
 	}
 
 	protected function checkSecurityToken($name = null) {
 		$postVar = is_null($name) ? 'SecurityID' : $name;
-		if(is_null($name)) $name = sprintf('%sSecurityID', get_class($this));
+		if(is_null($name)) {
+			$name = sprintf('%sSecurityID', get_class($this));
+		}
 		$securityToken = $this->getSecurityToken($name);
 
 		// By default the security token is always represented by a "SecurityID" post var,
@@ -132,7 +136,9 @@ 
 	 */
 	protected function trimWhitespace($val) {
 		if(is_array($val)) {
-			foreach($val as $k => $v) $val[$k] = $this->trimWhitespace($v);
+			foreach($val as $k => $v) {
+				$val[$k] = $this->trimWhitespace($v);
+			}
 			return $val;
 		} else {
 			return trim($val);
@@ -147,7 +153,9 @@ 
 	 */
 	protected function stripNonPrintables($val) {
 		if(is_array($val)) {
-			foreach($val as $k => $v) $val[$k] = $this->stripNonPrintables($v);
+			foreach($val as $k => $v) {
+				$val[$k] = $this->stripNonPrintables($v);
+			}
 			return $val;
 		} else {
 			return preg_replace('/[[:cntrl:]]/', '', $val);

code/model/DNEnvironment.php

Braces +36 added lines, -12 removed lines

@@ -386,9 +386,13 @@ 
 		// 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->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)
@@ -412,9 +416,13 @@ 
 		// 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->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)
@@ -443,9 +451,13 @@ 
 		}
 
 		if ($this->Usage==='Production' || $this->Usage==='Unspecified') {
-			if ($this->Project()->allowed(DNRoot::ALLOW_PROD_SNAPSHOT, $member)) return true;
+			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)
@@ -478,9 +490,13 @@ 
 		// 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->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)
@@ -504,9 +520,13 @@ 
 		// 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->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)
@@ -573,9 +593,13 @@ 
 		// 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->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)

code/model/DNProject.php

Braces +15 added lines, -5 removed lines

@@ -929,7 +929,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);
@@ -991,7 +993,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);
@@ -1018,7 +1022,9 @@ 
 			});
 
 			// If anything returns false then we're not ready.
-			if($isDone) return min($isDone);
+			if($isDone) {
+				return min($isDone);
+			}
 		}
 
 		return true;
@@ -1099,8 +1105,12 @@ 
 	 * @return bool
 	 */
 	public function canCreate($member = null) {
-		if(!$member) $member = Member::currentUser();
-		if(!$member) return false;
+		if(!$member) {
+			$member = Member::currentUser();
+		}
+		if(!$member) {
+			return false;
+		}
 
 		if(Permission::checkMember($member, 'ADMIN')) {
 			return true;

code/backends/DeploymentStrategy.php

Braces +6 added lines, -2 removed lines

@@ -110,8 +110,12 @@
 		// Normalise "empty" values into dashes so comparisons are done properly.
 		// This means there is no diference between an empty string and a null
 		// but "0" is considered to be non-empty.
-		if(empty($from) && !strlen($from)) $from = '-';
-		if(empty($to) && !strlen($to)) $to = '-';
+		if(empty($from) && !strlen($from)) {
+			$from = '-';
+		}
+		if(empty($to) && !strlen($to)) {
+			$to = '-';
+		}
 
 		return $this->changes[$title] = array(
 			'from' => $from,

code/control/DNRoot.php

Braces +12 added lines, -4 removed lines

@@ -934,7 +934,9 @@ 
 		}
 
 		$fields = $backend->getCreateEnvironmentFields($project);
-		if(!$fields) return null;
+		if(!$fields) {
+			return null;
+		}
 
 		if(!$project->canCreateEnvironments()) {
 			return new SS_HTTPResponse('Not allowed to create environments for this project', 401);
@@ -1337,7 +1339,9 @@ 
 	}
 
 	protected function applyRedeploy(SS_HTTPRequest $request, &$data) {
-		if (!$request->getVar('redeploy')) return;
+		if (!$request->getVar('redeploy')) {
+			return;
+		}
 
 		$project = $this->getCurrentProject();
 		if(!$project) {
@@ -2397,8 +2401,12 @@ 
 	 * @return bool
 	 */
 	public function canCreateProjects($member = null) {
-		if(!$member) $member = Member::currentUser();
-		if(!$member) return false;
+		if(!$member) {
+			$member = Member::currentUser();
+		}
+		if(!$member) {
+			return false;
+		}
 
 		return singleton('DNProject')->canCreate($member);
 	}

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(

code/model/StateMachineFactory.php

Braces +3 added lines, -1 removed lines

@@ -58,7 +58,9 @@
 
 	protected function addHandlers($machine) {
 		$class = get_class($machine->getObject());
-		if (empty($this->config()->handlers[$class])) return;
+		if (empty($this->config()->handlers[$class])) {
+			return;
+		}
 
 		$transitions = $this->config()->handlers[$class];
 		foreach ($transitions as $transName => $handlers) {