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']
 			) {

code/control/DNRoot.php

Doc Comments +2 added lines, -2 removed lines

@@ -963,7 +963,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);
@@ -2351,7 +2351,7 @@ 
 	/**
 	 * Create project action.
 	 *
-	 * @return SS_HTTPResponse
+	 * @return HTMLText
 	 */
 	public function createproject(SS_HTTPRequest $request) {
 		if($this->canCreateProjects()) {

Spacing +22 added lines, -22 removed lines

@@ -189,8 +189,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');
@@ -253,7 +253,7 @@ 
 		}
 
 		// Block framework jquery
-		Requirements::block(FRAMEWORK_DIR . '/thirdparty/jquery/jquery.js');
+		Requirements::block(FRAMEWORK_DIR.'/thirdparty/jquery/jquery.js');
 
 		self::include_requirements();
 	}
@@ -272,7 +272,7 @@ 
 	 * @return \SS_HTTPResponse
 	 */
 	public function index(SS_HTTPRequest $request) {
-		return $this->redirect($this->Link() . 'projects/');
+		return $this->redirect($this->Link().'projects/');
 	}
 
 	/**
@@ -432,7 +432,7 @@ 
 		$form->disableSecurityToken();
 		$form->addExtraClass('fields-wide');
 		// Tweak the action so it plays well with our fake URL structure.
-		$form->setFormAction($project->Link() . '/UploadSnapshotForm');
+		$form->setFormAction($project->Link().'/UploadSnapshotForm');
 
 		return $form;
 	}
@@ -482,7 +482,7 @@ 
 		$dataArchive->DataTransfers()->add($dataTransfer);
 		$form->saveInto($dataArchive);
 		$dataArchive->write();
-		$workingDir = TEMP_FOLDER . DIRECTORY_SEPARATOR . 'deploynaut-transfer-' . $dataTransfer->ID;
+		$workingDir = TEMP_FOLDER.DIRECTORY_SEPARATOR.'deploynaut-transfer-'.$dataTransfer->ID;
 
 		$cleanupFn = function() use($workingDir, $dataTransfer, $dataArchive) {
 			$process = new Process(sprintf('rm -rf %s', escapeshellarg($workingDir)));
@@ -582,7 +582,7 @@ 
 		$form->disableSecurityToken();
 		$form->addExtraClass('fields-wide');
 		// Tweak the action so it plays well with our fake URL structure.
-		$form->setFormAction($project->Link() . '/PostSnapshotForm');
+		$form->setFormAction($project->Link().'/PostSnapshotForm');
 
 		return $form;
 	}
@@ -720,7 +720,7 @@ 
 		$branchName = $request->getVar('name');
 		$branch = $project->DNBranchList()->byName($branchName);
 		if(!$branch) {
-			return new SS_HTTPResponse("Branch '" . Convert::raw2xml($branchName) . "' not found.", 404);
+			return new SS_HTTPResponse("Branch '".Convert::raw2xml($branchName)."' not found.", 404);
 		}
 
 		return $this->render(array(
@@ -954,7 +954,7 @@ 
 		);
 
 		// Tweak the action so it plays well with our fake URL structure.
-		$form->setFormAction($project->Link() . '/CreateEnvironmentForm');
+		$form->setFormAction($project->Link().'/CreateEnvironmentForm');
 
 		return $form;
 	}
@@ -987,7 +987,7 @@ 
 		$job->write();
 		$job->start();
 
-		return $this->redirect($project->Link('createenv') . '/' . $job->ID);
+		return $this->redirect($project->Link('createenv').'/'.$job->ID);
 	}
 
 	/**
@@ -1045,7 +1045,7 @@ 
 	 */
 	public function getPlatformSpecificStrings() {
 		$strings = $this->config()->platform_specific_strings;
-		if ($strings) {
+		if($strings) {
 			return new ArrayList($strings);
 		}
 	}
@@ -1169,7 +1169,7 @@ 
 			return $body;
 		}
 
-		$form->setFormAction($this->getRequest()->getURL() . '/DeployForm');
+		$form->setFormAction($this->getRequest()->getURL().'/DeployForm');
 		return $form;
 	}
 
@@ -1444,7 +1444,7 @@ 
 		$deployment->start();
 
 		return json_encode(array(
-			'url' => Director::absoluteBaseURL() . $deployment->Link()
+			'url' => Director::absoluteBaseURL().$deployment->Link()
 		), JSON_PRETTY_PRINT);
 	}
 
@@ -1551,7 +1551,7 @@ 
 					->addExtraClass('btn')
 			)
 		);
-		$form->setFormAction($this->getRequest()->getURL() . '/DataTransferForm');
+		$form->setFormAction($this->getRequest()->getURL().'/DataTransferForm');
 
 		return $form;
 	}
@@ -1753,7 +1753,7 @@ 
 					->addExtraClass('btn')
 			)
 		);
-		$form->setFormAction($project->Link() . '/DataTransferRestoreForm');
+		$form->setFormAction($project->Link().'/DataTransferRestoreForm');
 
 		return $form;
 	}
@@ -1851,7 +1851,7 @@ 
 					->addExtraClass('btn')
 			)
 		);
-		$form->setFormAction($project->Link() . '/DeleteForm');
+		$form->setFormAction($project->Link().'/DeleteForm');
 
 		return $form;
 	}
@@ -1957,7 +1957,7 @@ 
 					->addExtraClass('btn')
 			)
 		);
-		$form->setFormAction($this->getCurrentProject()->Link() . '/MoveForm');
+		$form->setFormAction($this->getCurrentProject()->Link().'/MoveForm');
 
 		return $form;
 	}
@@ -2256,7 +2256,7 @@ 
 	 */
 	protected function project404Response() {
 		return new SS_HTTPResponse(
-			"Project '" . Convert::raw2xml($this->getRequest()->param('Project')) . "' not found.",
+			"Project '".Convert::raw2xml($this->getRequest()->param('Project'))."' not found.",
 			404
 		);
 	}
@@ -2266,7 +2266,7 @@ 
 	 */
 	protected function environment404Response() {
 		$envName = Convert::raw2xml($this->getRequest()->param('Environment'));
-		return new SS_HTTPResponse("Environment '" . $envName . "' not found.", 404);
+		return new SS_HTTPResponse("Environment '".$envName."' not found.", 404);
 	}
 
 	/**
@@ -2333,7 +2333,7 @@ 
 	public function AmbientMenu() {
 		$list = new ArrayList();
 
-		if (Member::currentUserID()) {
+		if(Member::currentUserID()) {
 			$list->push(new ArrayData(array(
 				'Classes' => 'logout',
 				'FaIcon' => 'sign-out',
@@ -2438,7 +2438,7 @@ 
 			} else {
 				$form->sessionMessage('Unable to write the stack to the database.', 'bad');
 			}
-		} catch (ValidationException $e) {
+		} catch(ValidationException $e) {
 			$form->sessionMessage($e->getMessage(), 'bad');
 		}
 		return $this->redirectBack();
@@ -2513,7 +2513,7 @@ 
 			try {
 				$fetch->perform();
 				$canAccessRepo = true;
-			} catch (RuntimeException $e) {
+			} catch(RuntimeException $e) {
 				$canAccessRepo = false;
 			}
 			$data = ['canAccessRepo' => $canAccessRepo];

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');

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/steps/SmokeTestPipelineStep.php

Spacing +1 added lines, -1 removed lines

@@ -127,7 +127,7 @@
 		curl_setopt($ch, CURLOPT_URL, $test['URL']);
 
 		// Allow individual tests to override number of attempts
-		$attempts = (int) $this->getConfigSetting('Attempts');
+		$attempts = (int)$this->getConfigSetting('Attempts');
 		if(!empty($test['Attempts'])) {
 			$attempts = $test['Attempts'];
 		}

code/model/DNDataArchive.php

Spacing +4 added lines, -4 removed lines

@@ -229,7 +229,7 @@ 
 			return false;
 		}
 
-		$key = $memberID . '-' . $this->EnvironmentID;
+		$key = $memberID.'-'.$this->EnvironmentID;
 		if(!isset(self::$_cache_can_restore[$key])) {
 			self::$_cache_can_restore[$key] = $this->Environment()->canUploadArchive($member);
 		}
@@ -250,7 +250,7 @@ 
 			return false;
 		}
 
-		$key = $memberID . '-' . $this->EnvironmentID;
+		$key = $memberID.'-'.$this->EnvironmentID;
 		if(!isset(self::$_cache_can_download[$key])) {
 			self::$_cache_can_download[$key] = $this->Environment()->canDownloadArchive($member);
 		}
@@ -437,7 +437,7 @@ 
 		}
 
 		// Extract database.sql.gz to <workingdir>/database.sql
-		if(file_exists($workingDir . DIRECTORY_SEPARATOR . 'database.sql.gz')) {
+		if(file_exists($workingDir.DIRECTORY_SEPARATOR.'database.sql.gz')) {
 			$process = new Process('gunzip database.sql.gz', $workingDir);
 			$process->setTimeout(3600);
 			$process->run();
@@ -448,7 +448,7 @@ 
 		}
 
 		// Extract assets.tar.gz to <workingdir>/assets/
-		if(file_exists($workingDir . DIRECTORY_SEPARATOR . 'assets.tar.gz')) {
+		if(file_exists($workingDir.DIRECTORY_SEPARATOR.'assets.tar.gz')) {
 			$process = new Process('tar xzf assets.tar.gz', $workingDir);
 			$process->setTimeout(3600);
 			$process->run();

code/model/DNProject.php

Spacing +13 added lines, -13 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
@@ -391,7 +391,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();
@@ -746,7 +746,7 @@ 
 	 */
 	public function getPublicKeyPath() {
 		if($privateKey = $this->getPrivateKeyPath()) {
-			return $privateKey . '.pub';
+			return $privateKey.'.pub';
 		}
 		return null;
 	}
@@ -761,7 +761,7 @@ 
 		if(!empty($keyDir)) {
 			$filter = FileNameFilter::create();
 			$name = $filter->filter($this->Name);
-			return $keyDir . '/' . $name;
+			return $keyDir.'/'.$name;
 		}
 		return null;
 	}
@@ -780,7 +780,7 @@ 
 		$filter = FileNameFilter::create();
 		$name = $filter->filter($this->Name);
 
-		return $this->DNData()->getKeyDir() . '/' . $name;
+		return $this->DNData()->getKeyDir().'/'.$name;
 	}
 
 	/**
@@ -869,7 +869,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];
 
@@ -880,10 +880,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;
@@ -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);
 	}
 
 	/**

code/model/steps/RollbackStep.php

Spacing +1 added lines, -1 removed lines

@@ -44,7 +44,7 @@
 	 */
 	public function getTitle() {
 		// Make sure the title includes the subtask
-		return parent::getTitle() . ":{$this->Doing}";
+		return parent::getTitle().":{$this->Doing}";
 	}
 
 	/**

code/model/steps/DeploymentPipelineStep.php

Spacing +2 added lines, -2 removed lines

@@ -29,7 +29,7 @@ 
 
 	public function getTitle() {
 		// Make sure the title includes the subtask
-		return parent::getTitle() . ":{$this->Doing}";
+		return parent::getTitle().":{$this->Doing}";
 	}
 
 	public function start() {
@@ -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;
 		}