silverstripe / deploynaut

code/backends/DeploymentStrategy.php

Doc Comments +2 added lines

@@ -75,6 +75,7 @@ 
 	}
 
 	/**
+	 * @param string $code
 	 */
 	public function setActionCode($code) {
 		$this->actionCode = $code;
@@ -89,6 +90,7 @@ 
 
 	/**
 	 * @param int
+	 * @param string $seconds
 	 */
 	public function setEstimatedTime($seconds) {
 		$this->estimatedTime = $seconds;

Spacing +3 added lines, -3 removed lines

@@ -130,10 +130,10 @@
 	 */
 	public function getChangesModificationNeeded() {
 		$filtered = [];
-		foreach ($this->changes as $change => $details) {
-			if (array_key_exists('description', $details)) {
+		foreach($this->changes as $change => $details) {
+			if(array_key_exists('description', $details)) {
 				$filtered[$change] = $details;
-			} else if (
+			} else if(
 				(array_key_exists('from', $details) || array_key_exists('to', $details))
 				&& $details['from'] !== $details['to']
 			) {

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/api/nouns/APINoun.php

Indentation +2 added lines, -2 removed lines

@@ -1,7 +1,7 @@
 <?php
 /**
- * Base class for the APINouns
- */
+	 * Base class for the APINouns
+	 */
 class APINoun extends Controller {
 
 	/**

code/backends/CapistranoDeploymentBackend.php

Spacing +1 added lines, -1 removed lines

@@ -72,7 +72,7 @@
 
 			try {
 				$args['build_filename'] = $this->packageGenerator->getPackageFilename($project->Name, $sha, $repository, $log);
-			} catch (Exception $e) {
+			} catch(Exception $e) {
 				$log->write($e->getMessage());
 				throw $e;
 			}

code/control/DNRoot.php

Braces +9 added lines, -3 removed lines

@@ -936,7 +936,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);
@@ -2366,8 +2368,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);
 	}

Doc Comments +1 added lines, -1 removed lines

@@ -961,7 +961,7 @@
 	 * @param array $data
 	 * @param Form $form
 	 *
-	 * @return bool|HTMLText|SS_HTTPResponse
+	 * @return SS_HTTPResponse|null
 	 */
 	public function doCreateEnvironment($data, Form $form) {
 		$this->setCurrentActionType(self::ACTION_ENVIRONMENTS);

Spacing +5 added lines, -5 removed lines

@@ -186,8 +186,8 @@ 
 		Requirements::javascript('deploynaut/javascript/material.js');
 
 		// Load the buildable dependencies only if not loaded centrally.
-		if (!is_dir(BASE_PATH . DIRECTORY_SEPARATOR . 'static')) {
-			if (\Director::isDev()) {
+		if(!is_dir(BASE_PATH . DIRECTORY_SEPARATOR . 'static')) {
+			if(\Director::isDev()) {
 				\Requirements::javascript('deploynaut/static/bundle-debug.js');
 			} else {
 				\Requirements::javascript('deploynaut/static/bundle.js');
@@ -1046,7 +1046,7 @@ 
 	 */
 	public function getPlatformSpecificStrings() {
 		$strings = $this->config()->platform_specific_strings;
-		if ($strings) {
+		if($strings) {
 			return new ArrayList($strings);
 		}
 	}
@@ -1111,7 +1111,7 @@ 
 
 				$isCurrentEnvironment = false;
 				if($project && $currentEnvironment) {
-					$isCurrentEnvironment = (bool) $project->DNEnvironmentList()->find('ID', $currentEnvironment->ID);
+					$isCurrentEnvironment = (bool)$project->DNEnvironmentList()->find('ID', $currentEnvironment->ID);
 				}
 
 				$navigation->push(array(
@@ -2345,7 +2345,7 @@ 
 	public function AmbientMenu() {
 		$list = new ArrayList();
 
-		if (Member::currentUserID()) {
+		if(Member::currentUserID()) {
 			$list->push(new ArrayData(array(
 				'Classes' => 'logout',
 				'FaIcon' => 'sign-out',

code/control/DeploynautLogFile.php

Spacing +1 added lines, -1 removed lines

@@ -77,7 +77,7 @@
 		// Make sure we write into the old path for existing logs. New logs use the sanitised file path instead.
 		$path = file_exists($this->getRawFilePath()) ? $this->getRawFilePath() : $this->getSanitisedLogFilePath();
 
-		error_log('['.date('Y-m-d H:i:s').'] ' . $message .PHP_EOL, 3, $path);
+		error_log('[' . date('Y-m-d H:i:s') . '] ' . $message . PHP_EOL, 3, $path);
 		@chmod($path, 0666);
 	}
 

code/control/Dispatcher.php

Spacing +2 added lines, -2 removed lines

@@ -63,7 +63,7 @@ 
 	 */
 	public function asJSONValidatorErrors($code, $validatorErrors) {
 		$fieldErrors = [];
-		foreach ($validatorErrors as $error) {
+		foreach($validatorErrors as $error) {
 			$fieldErrors[$error['fieldName']] = $error['message'];
 		}
 		return $this->asJSONFormFieldErrors($code, $fieldErrors);
@@ -105,7 +105,7 @@ 
 		// To get around that, upon spotting an active redirect, we change the response code to 200,
 		// and move the redirect into the "RedirectTo" field in the JSON response. Frontend can
 		// then interpret this and trigger a redirect.
-		if ($this->redirectedTo()) {
+		if($this->redirectedTo()) {
 			$data['RedirectTo'] = $this->response->getHeader('Location');
 			// Pop off the header - we are no longer redirecting via the usual mechanism.
 			$this->response->removeHeader('Location');

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/extensions/FrontendLink.php

Spacing +1 added lines, -1 removed lines

@@ -3,7 +3,7 @@
 class FrontendLink extends DataExtension {
 
 	public function updateItemEditForm($form) {
-		if ($this->owner->record->hasMethod('Link')) {
+		if($this->owner->record->hasMethod('Link')) {
 			$link = sprintf(
 				'<a style="margin: 0.5em" target="deploynaut-frontend" href="%s">Preview &raquo;</a>',
 				$this->owner->record->Link()

code/model/DNEnvironment.php

Spacing +18 added lines, -18 removed lines

@@ -385,10 +385,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)
@@ -411,10 +411,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)
@@ -442,10 +442,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)
@@ -477,10 +477,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)
@@ -503,10 +503,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)
@@ -572,10 +572,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)

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)

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

@@ -954,7 +954,7 @@
 to other environments, alongside the "Who can restore" permission.<br>
 Should include all users with upload permissions, otherwise they can't download
 their own uploads.
-PHP
+php
 				),
 
 			// The Main.PipelineApprovers

code/model/DNProject.php

Spacing +9 added lines, -9 removed lines

@@ -262,7 +262,7 @@ 
 	 * @return bool
 	 */
 	public function canRestore($member = null) {
-		if ($this->allowedAny(
+		if($this->allowedAny(
 			array(
 				DNRoot::ALLOW_PROD_SNAPSHOT,
 				DNRoot::ALLOW_NON_PROD_SNAPSHOT
@@ -282,7 +282,7 @@ 
 	 * @return bool
 	 */
 	public function canBackup($member = null) {
-		if ($this->allowedAny(
+		if($this->allowedAny(
 			array(
 				DNRoot::ALLOW_PROD_SNAPSHOT,
 				DNRoot::ALLOW_NON_PROD_SNAPSHOT
@@ -302,7 +302,7 @@ 
 	 * @return bool
 	 */
 	public function canUploadArchive($member = null) {
-		if ($this->allowedAny(
+		if($this->allowedAny(
 			array(
 				DNRoot::ALLOW_PROD_SNAPSHOT,
 				DNRoot::ALLOW_NON_PROD_SNAPSHOT
@@ -322,7 +322,7 @@ 
 	 * @return bool
 	 */
 	public function canDownloadArchive($member = null) {
-		if ($this->allowedAny(
+		if($this->allowedAny(
 			array(
 				DNRoot::ALLOW_PROD_SNAPSHOT,
 				DNRoot::ALLOW_NON_PROD_SNAPSHOT
@@ -498,14 +498,14 @@ 
 	 * @return false|DNDeployment
 	 */
 	public function currentBuilds() {
-		if(!isset(self::$relation_cache['currentBuilds.'.$this->ID])) {
+		if(!isset(self::$relation_cache['currentBuilds.' . $this->ID])) {
 			$currentBuilds = array();
 			foreach($this->Environments() as $env) {
 				$currentBuilds[$env->Name] = $env->CurrentBuild();
 			}
-			self::$relation_cache['currentBuilds.'.$this->ID] = $currentBuilds;
+			self::$relation_cache['currentBuilds.' . $this->ID] = $currentBuilds;
 		}
-		return self::$relation_cache['currentBuilds.'.$this->ID];
+		return self::$relation_cache['currentBuilds.' . $this->ID];
 	}
 
 	/**
@@ -987,14 +987,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 +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;