silverstripe / deploynaut

code/model/jobs/DNDeployment.php

Spacing +11 added lines, -11 removed lines

@@ -101,7 +101,7 @@ 
 	}
 
 	public function LogLink() {
-		return $this->Link() . '/log';
+		return $this->Link().'/log';
 	}
 
 	public function canView($member = null) {
@@ -177,18 +177,18 @@ 
 	 */
 	public function getCommitURL() {
 		$environment = $this->Environment();
-		if (!$environment) {
+		if(!$environment) {
 			return null;
 		}
 		$project = $environment->Project();
-		if (!$project) {
+		if(!$project) {
 			return null;
 		}
 		$interface = $project->getRepositoryInterface();
-		if (!$interface) {
+		if(!$interface) {
 			return null;
 		}
-		return $interface->CommitURL . '/' . $this->SHA;
+		return $interface->CommitURL.'/'.$this->SHA;
 	}
 
 	/**
@@ -237,12 +237,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(
@@ -253,7 +253,7 @@ 
 			];
 		}
 
-		if (empty($messages)) {
+		if(empty($messages)) {
 			$messages[] = [
 				'Flag' => '',
 				'Text' => '<i>Environment changes have been made.</i>'
@@ -302,7 +302,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'] : '';
 			}
 
@@ -366,7 +366,7 @@ 
 
 	public function getSigFile() {
 		$dir = DNData::inst()->getSignalDir();
-		if (!is_dir($dir)) {
+		if(!is_dir($dir)) {
 			`mkdir $dir`;
 		}
 		return sprintf(

code/control/DeployDispatcher.php

Spacing +17 added lines, -17 removed lines

@@ -41,13 +41,13 @@ 
 
 		$this->project = $this->getCurrentProject();
 
-		if (!$this->project) {
+		if(!$this->project) {
 			return $this->project404Response();
 		}
 
 		// Performs canView permission check by limiting visible projects
 		$this->environment = $this->getCurrentEnvironment($this->project);
-		if (!$this->environment) {
+		if(!$this->environment) {
 			return $this->environment404Response();
 		}
 	}
@@ -68,19 +68,19 @@ 
 		$data = [];
 		$list = $this->DeployHistory();
 		$page = $request->getVar('page') ?: 1;
-		if ($page > $list->TotalPages()) {
+		if($page > $list->TotalPages()) {
 			$page = 1;
 		}
-		if ($page < 1) {
+		if($page < 1) {
 			$page = 1;
 		}
 		$start = ($page - 1) * $list->getPageLength();
-		$list->setPageStart((int) $start);
-		if (empty($list)) {
+		$list->setPageStart((int)$start);
+		if(empty($list)) {
 			return $this->getAPIResponse(['list' => []], 200);
 		}
 
-		foreach ($list as $deployment) {
+		foreach($list as $deployment) {
 			$data[] = $this->getDeploymentData($deployment);
 		}
 
@@ -98,7 +98,7 @@ 
 	 */
 	public function currentbuild(SS_HTTPRequest $request) {
 		$currentBuild = $this->environment->CurrentBuild();
-		if (!$currentBuild) {
+		if(!$currentBuild) {
 			return $this->getAPIResponse(['deployment' => []], 200);
 		}
 		return $this->getAPIResponse(['deployment' => $this->getDeploymentData($currentBuild)], 200);
@@ -111,7 +111,7 @@ 
 	public function show(SS_HTTPRequest $request) {
 		$deployment = DNDeployment::get()->byId($request->param('ID'));
 		$errorResponse = $this->validateDeployments($deployment);
-		if ($errorResponse instanceof \SS_HTTPResponse) {
+		if($errorResponse instanceof \SS_HTTPResponse) {
 			return $errorResponse;
 		}
 		return $this->getAPIResponse(['deployment' => $this->getDeploymentData($deployment)], 200);
@@ -124,7 +124,7 @@ 
 	public function log(SS_HTTPRequest $request) {
 		$deployment = DNDeployment::get()->byId($request->param('ID'));
 		$errorResponse = $this->validateDeployments($deployment);
-		if ($errorResponse instanceof \SS_HTTPResponse) {
+		if($errorResponse instanceof \SS_HTTPResponse) {
 			return $errorResponse;
 		}
 		$log = $deployment->log();
@@ -141,7 +141,7 @@ 
 	public function start(SS_HTTPRequest $request) {
 		$this->checkSecurityToken();
 
-		if (!$this->environment->canDeploy(Member::currentUser())) {
+		if(!$this->environment->canDeploy(Member::currentUser())) {
 			return $this->getAPIResponse(['message' => 'You are not authorised to deploy this environment'], 403);
 		}
 
@@ -197,12 +197,12 @@ 
 
 		$deployer = $deployment->Deployer();
 		$deployerData = null;
-		if ($deployer && $deployer->exists()) {
+		if($deployer && $deployer->exists()) {
 			$deployerData = $this->getStackMemberData($deployer);
 		}
 		$approver = $deployment->Approver();
 		$approverData = null;
-		if ($approver && $approver->exists()) {
+		if($approver && $approver->exists()) {
 			$approverData = $this->getStackMemberData($approver);
 		}
 
@@ -236,8 +236,8 @@ 
 		$stackMembers = $this->project->listMembers();
 		$role = null;
 
-		foreach ($stackMembers as $stackMember) {
-			if ($stackMember['MemberID'] !== $member->ID) {
+		foreach($stackMembers as $stackMember) {
+			if($stackMember['MemberID'] !== $member->ID) {
 				continue;
 			}
 
@@ -261,10 +261,10 @@ 
 	 * @return null|SS_HTTPResponse
 	 */
 	protected function validateDeployments(\DNDeployment $deployment) {
-		if (!$deployment || !$deployment->exists()) {
+		if(!$deployment || !$deployment->exists()) {
 			return $this->getAPIResponse(['message' => 'This deployment does not exist'], 404);
 		}
-		if (!$deployment->canView()) {
+		if(!$deployment->canView()) {
 			return $this->getAPIResponse(['message' => 'You are not authorised to view this deployment'], 403);
 		}
 		return null;

code/control/DNDeploymentDispatcher.php

Spacing +11 added lines, -11 removed lines

@@ -17,7 +17,7 @@ 
 
 	public function getModel($name) {
 		$deployment = $this->getDeployment();
-		if (!$deployment) {
+		if(!$deployment) {
 			return [];
 		}
 
@@ -29,7 +29,7 @@ 
 	public function getDeployment() {
 		$id = $this->request->param('Id');
 		$deployment = DNDeployment::get()->byId($id);
-		if (!$deployment || !$deployment->exists()) {
+		if(!$deployment || !$deployment->exists()) {
 			return false;
 		}
 		return $deployment;
@@ -38,7 +38,7 @@ 
 	public function apply(SS_HTTPRequest $request) {
 		$this->checkSecurityToken();
 		$response = $this->checkRequest();
-		if ($response instanceof SS_HTTPResponse) {
+		if($response instanceof SS_HTTPResponse) {
 			return $response;
 		}
 
@@ -52,7 +52,7 @@ 
 	public function canApply(SS_HTTPRequest $request) {
 		$this->checkSecurityToken();
 		$response = $this->checkRequest();
-		if ($response instanceof SS_HTTPResponse) {
+		if($response instanceof SS_HTTPResponse) {
 			return $response;
 		}
 
@@ -63,17 +63,17 @@ 
 
 	protected function checkRequest() {
 		$project = $this->getCurrentProject();
-		if (!$project) {
+		if(!$project) {
 			return $this->project404Response();
 		}
 
 		$env = $this->getCurrentEnvironment($project);
-		if (!$env) {
+		if(!$env) {
 			return $this->environment404Response();
 		}
 
 		$deployment = $this->getDeployment();
-		if (!$deployment) {
+		if(!$deployment) {
 			return new SS_HTTPResponse('Deployment not found', 404);
 		}
 
@@ -82,7 +82,7 @@ 
 
 	protected function getMachine() {
 		$deployment = $this->getDeployment();
-		if (!$deployment) {
+		if(!$deployment) {
 			return null;
 		}
 
@@ -94,10 +94,10 @@ 
 		// It gives a chance to perform a dry-run, and reject the transition, for example
 		// in case the user is unauthorised.
 			'finite.test_transition',
-			function (Finite\Event\TransitionEvent $e) use ($project) {
+			function(Finite\Event\TransitionEvent $e) use ($project) {
 				$code = null;
 
-				switch ($e->getTransition()->getName()) {
+				switch($e->getTransition()->getName()) {
 					case DNDeployment::TR_SUBMIT:
 						$code = self::ALLOW_DNDEPLOYMENT_SUBMIT;
 						break;
@@ -106,7 +106,7 @@ 
 						break;
 				}
 
-				if (!$code || !$project->allowed($code)) {
+				if(!$code || !$project->allowed($code)) {
 					$e->reject();
 				}
 			}

code/control/PlanDispatcher.php

Spacing +9 added lines, -9 removed lines

@@ -37,13 +37,13 @@ 
 
 		$this->project = $this->getCurrentProject();
 
-		if (!$this->project) {
+		if(!$this->project) {
 			return $this->project404Response();
 		}
 
 		// Performs canView permission check by limiting visible projects
 		$this->environment = $this->getCurrentEnvironment($this->project);
-		if (!$this->environment) {
+		if(!$this->environment) {
 			return $this->environment404Response();
 		}
 	}
@@ -66,7 +66,7 @@ 
 	 */
 	public function deploysummary(SS_HTTPRequest $request) {
 
-		if (strtolower($request->httpMethod()) !== 'post') {
+		if(strtolower($request->httpMethod()) !== 'post') {
 			return $this->getAPIResponse(['message' => 'Method not allowed, requires POST'], 405);
 		}
 		$this->checkSecurityToken();
@@ -81,7 +81,7 @@ 
 		$data = $strategy->toArray();
 
 		$interface = $this->project->getRepositoryInterface();
-		if ($this->canCompareCodeVersions($interface, $data['changes'])) {
+		if($this->canCompareCodeVersions($interface, $data['changes'])) {
 			$compareurl = sprintf(
 				'%s/compare/%s...%s',
 				$interface->URL,
@@ -118,20 +118,20 @@ 
 	 *
 	 */
 	protected function canCompareCodeVersions(\ArrayData $interface, $changes) {
-		if (empty($changes['Code version'])) {
+		if(empty($changes['Code version'])) {
 			return false;
 		}
 		$codeVersion = ['Code version'];
-		if (empty($interface)) {
+		if(empty($interface)) {
 			return false;
 		}
-		if (empty($interface->URL)) {
+		if(empty($interface->URL)) {
 			return false;
 		}
-		if (empty($codeVersion['from']) || empty($codeVersion['to'])) {
+		if(empty($codeVersion['from']) || empty($codeVersion['to'])) {
 			return false;
 		}
-		if (strlen($codeVersion['from']) !== 40 || strlen($codeVersion['to']) !== 40) {
+		if(strlen($codeVersion['from']) !== 40 || strlen($codeVersion['to']) !== 40) {
 			return false;
 		}
 		return true;

code/control/Dispatcher.php

Spacing +7 added lines, -7 removed lines

@@ -50,7 +50,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);
@@ -95,7 +95,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');
@@ -128,7 +128,7 @@ 
 	 */
 	protected function checkSecurityToken() {
 		$securityToken = $this->getSecurityToken();
-		if (!$securityToken->check($this->request->postVar(self::SECURITY_TOKEN_NAME))) {
+		if(!$securityToken->check($this->request->postVar(self::SECURITY_TOKEN_NAME))) {
 			$this->httpError(403, 'Invalid security token, try reloading the page.');
 		}
 	}
@@ -163,8 +163,8 @@ 
 	 * @return string|array
 	 */
 	protected function trimWhitespace($val) {
-		if (is_array($val)) {
-			foreach ($val as $k => $v) {
+		if(is_array($val)) {
+			foreach($val as $k => $v) {
 				$val[$k] = $this->trimWhitespace($v);
 			}
 			return $val;
@@ -180,8 +180,8 @@ 
 	 * @return string|array
 	 */
 	protected function stripNonPrintables($val) {
-		if (is_array($val)) {
-			foreach ($val as $k => $v) {
+		if(is_array($val)) {
+			foreach($val as $k => $v) {
 				$val[$k] = $this->stripNonPrintables($v);
 			}
 			return $val;

code/control/GitDispatcher.php

Spacing +13 added lines, -13 removed lines

@@ -38,7 +38,7 @@ 
 
 		$this->project = $this->getCurrentProject();
 
-		if (!$this->project) {
+		if(!$this->project) {
 			return $this->project404Response();
 		}
 	}
@@ -58,7 +58,7 @@ 
 	 * @return SS_HTTPResponse
 	 */
 	public function update(SS_HTTPRequest $request) {
-		switch ($request->httpMethod()) {
+		switch($request->httpMethod()) {
 			case 'POST':
 				$this->checkSecurityToken();
 				return $this->createUpdate();
@@ -95,8 +95,8 @@ 
 		// @todo: the original was a tree that was keyed by environment, the
 		// front-end dropdown needs to be changed to support that. brrrr.
 		$prevDeploys = [];
-		foreach ($this->getGitPrevDeploys($this->project) as $env) {
-			foreach ($env as $deploy) {
+		foreach($this->getGitPrevDeploys($this->project) as $env) {
+			foreach($env as $deploy) {
 				$prevDeploys[] = $deploy;
 			}
 		}
@@ -132,8 +132,8 @@ 
 	 */
 	protected function getUpdateStatus($ID) {
 		$ping = DNGitFetch::get()->byID($ID);
-		if (!$ping) {
-			return $this->getAPIResponse(['message' => 'GIT update (' . $ID . ') not found'], 404);
+		if(!$ping) {
+			return $this->getAPIResponse(['message' => 'GIT update ('.$ID.') not found'], 404);
 		}
 		$output = [
 			'id' => $ID,
@@ -154,7 +154,7 @@ 
 		$fetch->write();
 		$fetch->start();
 
-		$location = Director::absoluteBaseURL() . $this->Link() . '/update/' . $fetch->ID;
+		$location = Director::absoluteBaseURL().$this->Link().'/update/'.$fetch->ID;
 		$output = [
 			'message' => 'git fetch has been queued',
 			'id' => $fetch->ID,
@@ -173,7 +173,7 @@ 
 	 */
 	protected function getGitBranches($project) {
 		$branches = [];
-		foreach ($project->DNBranchList() as $branch) {
+		foreach($project->DNBranchList() as $branch) {
 			$branches[] = [
 				'key' => $branch->SHA(),
 				'value' => $branch->Name(),
@@ -189,7 +189,7 @@ 
 	 */
 	protected function getGitTags($project) {
 		$tags = [];
-		foreach ($project->DNTagList()->setLimit(null) as $tag) {
+		foreach($project->DNTagList()->setLimit(null) as $tag) {
 			$tags[] = [
 				'key' => $tag->SHA(),
 				'value' => $tag->Name(),
@@ -205,14 +205,14 @@ 
 	 */
 	protected function getGitPrevDeploys($project) {
 		$redeploy = [];
-		foreach ($project->DNEnvironmentList() as $dnEnvironment) {
+		foreach($project->DNEnvironmentList() as $dnEnvironment) {
 			$envName = $dnEnvironment->Name;
 			$perEnvDeploys = [];
-			foreach ($dnEnvironment->DeployHistory() as $deploy) {
+			foreach($dnEnvironment->DeployHistory() as $deploy) {
 				$sha = $deploy->SHA;
 
 				// Check if exists to make sure the newest deployment date is used.
-				if (!isset($perEnvDeploys[$sha])) {
+				if(!isset($perEnvDeploys[$sha])) {
 					$pastValue = sprintf(
 						"%s (deployed %s)",
 						substr($sha, 0, 8),
@@ -224,7 +224,7 @@ 
 					];
 				}
 			}
-			if (!empty($perEnvDeploys)) {
+			if(!empty($perEnvDeploys)) {
 				$redeploy[$envName] = array_values($perEnvDeploys);
 			}
 		}

code/control/EnvironmentOverview.php

Spacing +5 added lines, -5 removed lines

@@ -19,7 +19,7 @@ 
 	public function init() {
 		parent::init();
 		$this->project = $this->getCurrentProject();
-		if (!$this->project) {
+		if(!$this->project) {
 			return $this->project404Response();
 		}
 		// Performs canView permission check by limiting visible projects
@@ -33,7 +33,7 @@ 
 	 * @return \HTMLText|\SS_HTTPResponse
 	 */
 	public function index(\SS_HTTPRequest $request) {
-		if (!$this->environment) {
+		if(!$this->environment) {
 			return $this->environment404Response();
 		}
 
@@ -63,9 +63,9 @@ 
 		$base = Director::absoluteBaseURL();
 		return [
 			'dispatchers' => [
-				'git' => $base . $this->getCurrentProject()->Link('git'),
-				'plan' => $base . $this->getCurrentEnvironment()->Link('plan'),
-				'deploys' => $base . $this->getCurrentEnvironment()->Link('deploys')
+				'git' => $base.$this->getCurrentProject()->Link('git'),
+				'plan' => $base.$this->getCurrentEnvironment()->Link('plan'),
+				'deploys' => $base.$this->getCurrentEnvironment()->Link('deploys')
 			],
 			'api_auth' => [
 				'name' => $this->getSecurityToken()->getName(),

code/control/DNAdmin.php

Spacing +1 added lines, -1 removed lines

@@ -29,7 +29,7 @@
 	public function getEditForm($id = null, $fields = null) {
 		$form = parent::getEditForm($id, $fields);
 		$gridField = $form->Fields()->dataFieldByName('DNProject');
-		if ($gridField) {
+		if($gridField) {
 			$gridField->getConfig()
 				->removeComponentsByType('GridFieldExportButton')
 				->removeComponentsByType('GridFieldPrintButton')

code/control/DeploynautLogFile.php

Spacing +8 added lines, -8 removed lines

@@ -15,9 +15,9 @@ 
 	 */
 	public function __construct($logFile, $basePath = null) {
 		$this->logFile = $logFile;
-		if ($basePath !== null) {
+		if($basePath !== null) {
 			$this->basePath = $basePath;
-		} else if (defined('DEPLOYNAUT_LOG_PATH')) {
+		} else if(defined('DEPLOYNAUT_LOG_PATH')) {
 			$this->basePath = DEPLOYNAUT_LOG_PATH;
 		} else {
 			$this->basePath = sys_get_temp_dir();
@@ -45,7 +45,7 @@ 
 	 * @return string
 	 */
 	public function getRawFilePath() {
-		return $this->basePath . '/' . $this->logFile;
+		return $this->basePath.'/'.$this->logFile;
 	}
 
 	/**
@@ -53,7 +53,7 @@ 
 	 * @return string
 	 */
 	public function getSanitisedLogFilePath() {
-		return $this->basePath . '/' . strtolower(FileNameFilter::create()->filter($this->logFile));
+		return $this->basePath.'/'.strtolower(FileNameFilter::create()->filter($this->logFile));
 	}
 
 	/**
@@ -64,10 +64,10 @@ 
 		$path = $this->getSanitisedLogFilePath();
 
 		// for backwards compatibility on old logs
-		if (!file_exists($path)) {
+		if(!file_exists($path)) {
 			$path = $this->getRawFilePath();
 
-			if (!file_exists($path)) {
+			if(!file_exists($path)) {
 				return null;
 			}
 		}
@@ -83,7 +83,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);
 	}
 
@@ -92,7 +92,7 @@ 
 	 * @return bool
 	 */
 	public function exists() {
-		return (bool) $this->getLogFilePath();
+		return (bool)$this->getLogFilePath();
 	}
 
 	/**