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()) {

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

Spacing +21 added lines, -21 removed lines

@@ -189,7 +189,7 @@ 
 			)
 		);
 
-		if (\Director::isDev()) {
+		if(\Director::isDev()) {
 			\Requirements::javascript('deploynaut/static/bundle-debug.js');
 		} else {
 			\Requirements::javascript('deploynaut/static/bundle.js');
@@ -251,7 +251,7 @@ 
 		}
 
 		// Block framework jquery
-		Requirements::block(FRAMEWORK_DIR . '/thirdparty/jquery/jquery.js');
+		Requirements::block(FRAMEWORK_DIR.'/thirdparty/jquery/jquery.js');
 
 		self::include_requirements();
 	}
@@ -270,7 +270,7 @@ 
 	 * @return \SS_HTTPResponse
 	 */
 	public function index(SS_HTTPRequest $request) {
-		return $this->redirect($this->Link() . 'projects/');
+		return $this->redirect($this->Link().'projects/');
 	}
 
 	/**
@@ -428,7 +428,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;
 	}
@@ -478,7 +478,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)));
@@ -578,7 +578,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;
 	}
@@ -716,7 +716,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(
@@ -950,7 +950,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;
 	}
@@ -983,7 +983,7 @@ 
 		$job->write();
 		$job->start();
 
-		return $this->redirect($project->Link('createenv') . '/' . $job->ID);
+		return $this->redirect($project->Link('createenv').'/'.$job->ID);
 	}
 
 	/**
@@ -1041,7 +1041,7 @@ 
 	 */
 	public function getPlatformSpecificStrings() {
 		$strings = $this->config()->platform_specific_strings;
-		if ($strings) {
+		if($strings) {
 			return new ArrayList($strings);
 		}
 	}
@@ -1165,7 +1165,7 @@ 
 			return $body;
 		}
 
-		$form->setFormAction($this->getRequest()->getURL() . '/DeployForm');
+		$form->setFormAction($this->getRequest()->getURL().'/DeployForm');
 		return $form;
 	}
 
@@ -1439,7 +1439,7 @@ 
 		$deployment->start();
 
 		return json_encode(array(
-			'url' => Director::absoluteBaseURL() . $deployment->Link()
+			'url' => Director::absoluteBaseURL().$deployment->Link()
 		), JSON_PRETTY_PRINT);
 	}
 
@@ -1546,7 +1546,7 @@ 
 					->addExtraClass('btn')
 			)
 		);
-		$form->setFormAction($this->getRequest()->getURL() . '/DataTransferForm');
+		$form->setFormAction($this->getRequest()->getURL().'/DataTransferForm');
 
 		return $form;
 	}
@@ -1748,7 +1748,7 @@ 
 					->addExtraClass('btn')
 			)
 		);
-		$form->setFormAction($project->Link() . '/DataTransferRestoreForm');
+		$form->setFormAction($project->Link().'/DataTransferRestoreForm');
 
 		return $form;
 	}
@@ -1846,7 +1846,7 @@ 
 					->addExtraClass('btn')
 			)
 		);
-		$form->setFormAction($project->Link() . '/DeleteForm');
+		$form->setFormAction($project->Link().'/DeleteForm');
 
 		return $form;
 	}
@@ -1952,7 +1952,7 @@ 
 					->addExtraClass('btn')
 			)
 		);
-		$form->setFormAction($this->getCurrentProject()->Link() . '/MoveForm');
+		$form->setFormAction($this->getCurrentProject()->Link().'/MoveForm');
 
 		return $form;
 	}
@@ -2251,7 +2251,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
 		);
 	}
@@ -2261,7 +2261,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);
 	}
 
 	/**
@@ -2328,7 +2328,7 @@ 
 	public function AmbientMenu() {
 		$list = new ArrayList();
 
-		if (Member::currentUserID()) {
+		if(Member::currentUserID()) {
 			$list->push(new ArrayData(array(
 				'Classes' => 'logout',
 				'FaIcon' => 'sign-out',
@@ -2434,7 +2434,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();
@@ -2514,7 +2514,7 @@ 
 			try {
 				$clone->perform();
 				$canAccessRepo = true;
-			} catch (RuntimeException $e) {
+			} catch(RuntimeException $e) {
 				$canAccessRepo = false;
 			}
 			$data = ['canAccessRepo' => $canAccessRepo];

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

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

Spacing +26 added lines, -26 removed lines

@@ -408,10 +408,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)
@@ -443,10 +443,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)
@@ -474,10 +474,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)
@@ -509,10 +509,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)
@@ -535,10 +535,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)
@@ -604,10 +604,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)
@@ -827,7 +827,7 @@ 
 	 * @return string
 	 */
 	public function Link() {
-		return $this->Project()->Link() . "/environment/" . $this->Name;
+		return $this->Project()->Link()."/environment/".$this->Name;
 	}
 
 	/**
@@ -972,7 +972,7 @@ 
 				->buildPermissionField('ArchiveUploaderGroups', 'ArchiveUploaders', $groups, $members)
 				->setTitle('Who can upload?')
 				->setDescription(
-					'Users who can upload archives linked to this environment into Deploynaut.<br />' .
+					'Users who can upload archives linked to this environment into Deploynaut.<br />'.
 					'Linking them to an environment allows limiting download permissions (see below).'
 				),
 
@@ -1044,7 +1044,7 @@ 
 		// Add actions
 		$action = new FormAction('check', 'Check Connection');
 		$action->setUseButtonTag(true);
-		$dataURL = Director::absoluteBaseURL() . 'naut/api/' . $this->Project()->Name . '/' . $this->Name . '/ping';
+		$dataURL = Director::absoluteBaseURL().'naut/api/'.$this->Project()->Name.'/'.$this->Name.'/ping';
 		$action->setAttribute('data-url', $dataURL);
 		$fields->insertBefore($action, 'Name');
 
@@ -1110,8 +1110,8 @@ 
 	 */
 	public function onBeforeWrite() {
 		parent::onBeforeWrite();
-		if($this->Name && $this->Name . '.rb' != $this->Filename) {
-			$this->Filename = $this->Name . '.rb';
+		if($this->Name && $this->Name.'.rb' != $this->Filename) {
+			$this->Filename = $this->Name.'.rb';
 		}
 		$this->checkEnvironmentPath();
 		$this->writeConfigFile();
@@ -1159,7 +1159,7 @@ 
 			&& $this->Filename
 			&& $this->CreateEnvConfig
 		) {
-			$templateFile = $this->config()->template_file ?: BASE_PATH . '/deploynaut/environment.template';
+			$templateFile = $this->config()->template_file ?: BASE_PATH.'/deploynaut/environment.template';
 			file_put_contents($this->getConfigFilename(), file_get_contents($templateFile));
 		} else if($this->envFileExists() && $this->DeployConfig) {
 			file_put_contents($this->getConfigFilename(), $this->DeployConfig);
@@ -1231,7 +1231,7 @@ 
 		if(!$this->Filename) {
 			return '';
 		}
-		return $this->DNData()->getEnvironmentDir() . '/' . $this->Project()->Name . '/' . $this->Filename;
+		return $this->DNData()->getEnvironmentDir().'/'.$this->Project()->Name.'/'.$this->Filename;
 	}
 
 	/**
@@ -1247,7 +1247,7 @@ 
 		}
 		$path = pathinfo($name);
 		if($path) {
-			return $path['dirname'] . '/' . $path['filename'] . '.yml';
+			return $path['dirname'].'/'.$path['filename'].'.yml';
 		}
 	}
 

code/model/Pipeline.php

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

@@ -257,7 +257,7 @@
 	 * @return string
 	 */
 	public function getTitle() {
-		return "Pipeline {$this->ID} (Status: {$this->Status})";
+		return "pipeline {$this->ID} (Status: {$this->Status})";
 	}
 
 	/**

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'];
 		}

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

@@ -282,7 +282,7 @@
 	 */
 	public function startApproval() {
 		$this->Status = 'Started';
-		$this->log("Starting {$this->Title}...");
+		$this->log("starting {$this->Title}...");
 		// Determine if we should use delayed notification
 		$recipientGroup = 'all';
 		if($this->getConfigSetting('RecipientsDelay')) {

code/model/steps/UserConfirmationStep.php

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

@@ -282,7 +282,7 @@
 	 */
 	public function startApproval() {
 		$this->Status = 'Started';
-		$this->log("Starting {$this->Title}...");
+		$this->log("starting {$this->Title}...");
 		// Determine if we should use delayed notification
 		$recipientGroup = 'all';
 		if($this->getConfigSetting('RecipientsDelay')) {

code/model/steps/TriggerDeployStep.php

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

@@ -282,7 +282,7 @@
 	 */
 	public function startApproval() {
 		$this->Status = 'Started';
-		$this->log("Starting {$this->Title}...");
+		$this->log("starting {$this->Title}...");
 		// Determine if we should use delayed notification
 		$recipientGroup = 'all';
 		if($this->getConfigSetting('RecipientsDelay')) {

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