silverstripe / deploynaut

code/control/DNRoot.php

Spacing +27 added lines, -27 removed lines

@@ -178,7 +178,7 @@ 
 		Requirements::javascript('deploynaut/javascript/material.js');
 
 		// Load the buildable dependencies only if not loaded centrally.
-		if (!is_dir(BASE_PATH . DIRECTORY_SEPARATOR . 'static')) {
+		if (!is_dir(BASE_PATH.DIRECTORY_SEPARATOR.'static')) {
 			if (\Director::isDev()) {
 				\Requirements::javascript('deploynaut/static/bundle-debug.js');
 			} else {
@@ -242,7 +242,7 @@ 
 		}
 
 		// Block framework jquery
-		Requirements::block(FRAMEWORK_DIR . '/thirdparty/jquery/jquery.js');
+		Requirements::block(FRAMEWORK_DIR.'/thirdparty/jquery/jquery.js');
 
 		self::include_requirements();
 	}
@@ -261,7 +261,7 @@ 
 	 * @return \SS_HTTPResponse
 	 */
 	public function index(SS_HTTPRequest $request) {
-		return $this->redirect($this->Link() . 'projects/');
+		return $this->redirect($this->Link().'projects/');
 	}
 
 	/**
@@ -389,7 +389,7 @@ 
 		// Framing an environment as a "group of people with download access"
 		// makes more sense to the user here, while still allowing us to enforce
 		// environment specific restrictions on downloading the file later on.
-		$envs = $project->DNEnvironmentList()->filterByCallback(function ($item) {
+		$envs = $project->DNEnvironmentList()->filterByCallback(function($item) {
 			return $item->canUploadArchive();
 		});
 		$envsMap = [];
@@ -421,7 +421,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;
 	}
@@ -442,7 +442,7 @@ 
 		}
 
 		$validEnvs = $project->DNEnvironmentList()
-			->filterByCallback(function ($item) {
+			->filterByCallback(function($item) {
 				return $item->canUploadArchive();
 			});
 
@@ -471,9 +471,9 @@ 
 		$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) {
+		$cleanupFn = function() use ($workingDir, $dataTransfer, $dataArchive) {
 			$process = new AbortableProcess(sprintf('rm -rf %s', escapeshellarg($workingDir)));
 			$process->setTimeout(120);
 			$process->run();
@@ -547,7 +547,7 @@ 
 		// Framing an environment as a "group of people with download access"
 		// makes more sense to the user here, while still allowing us to enforce
 		// environment specific restrictions on downloading the file later on.
-		$envs = $project->DNEnvironmentList()->filterByCallback(function ($item) {
+		$envs = $project->DNEnvironmentList()->filterByCallback(function($item) {
 			return $item->canUploadArchive();
 		});
 		$envsMap = [];
@@ -573,7 +573,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;
 	}
@@ -592,7 +592,7 @@ 
 			return $this->project404Response();
 		}
 
-		$validEnvs = $project->DNEnvironmentList()->filterByCallback(function ($item) {
+		$validEnvs = $project->DNEnvironmentList()->filterByCallback(function($item) {
 			return $item->canUploadArchive();
 		});
 
@@ -712,7 +712,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([
@@ -849,7 +849,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;
 	}
@@ -882,7 +882,7 @@ 
 		$job->write();
 		$job->start();
 
-		return $this->redirect($project->Link('createenv') . '/' . $job->ID);
+		return $this->redirect($project->Link('createenv').'/'.$job->ID);
 	}
 
 	/**
@@ -1080,7 +1080,7 @@ 
 			return $body;
 		}
 
-		$form->setFormAction($this->getRequest()->getURL() . '/DeployForm');
+		$form->setFormAction($this->getRequest()->getURL().'/DeployForm');
 		return $form;
 	}
 
@@ -1346,7 +1346,7 @@ 
 		$deployment->getMachine()->apply(DNDeployment::TR_QUEUE);
 
 		return json_encode([
-			'url' => Director::absoluteBaseURL() . $deployment->Link()
+			'url' => Director::absoluteBaseURL().$deployment->Link()
 		], JSON_PRETTY_PRINT);
 	}
 
@@ -1469,7 +1469,7 @@ 
 	 */
 	public function getDataTransferForm(SS_HTTPRequest $request = null) {
 		// Performs canView permission check by limiting visible projects
-		$envs = $this->getCurrentProject()->DNEnvironmentList()->filterByCallback(function ($item) {
+		$envs = $this->getCurrentProject()->DNEnvironmentList()->filterByCallback(function($item) {
 			return $item->canBackup();
 		});
 
@@ -1491,7 +1491,7 @@ 
 					->addExtraClass('btn')
 			)
 		);
-		$form->setFormAction($this->getRequest()->getURL() . '/DataTransferForm');
+		$form->setFormAction($this->getRequest()->getURL().'/DataTransferForm');
 
 		return $form;
 	}
@@ -1517,12 +1517,12 @@ 
 		// Validate direction.
 		if ($data['Direction'] == 'get') {
 			$validEnvs = $this->getCurrentProject()->DNEnvironmentList()
-				->filterByCallback(function ($item) {
+				->filterByCallback(function($item) {
 					return $item->canBackup();
 				});
 		} else if ($data['Direction'] == 'push') {
 			$validEnvs = $this->getCurrentProject()->DNEnvironmentList()
-				->filterByCallback(function ($item) {
+				->filterByCallback(function($item) {
 					return $item->canRestore();
 				});
 		} else {
@@ -1653,7 +1653,7 @@ 
 
 		// Performs canView permission check by limiting visible projects
 		$project = $this->getCurrentProject();
-		$envs = $project->DNEnvironmentList()->filterByCallback(function ($item) {
+		$envs = $project->DNEnvironmentList()->filterByCallback(function($item) {
 			return $item->canRestore();
 		});
 
@@ -1692,7 +1692,7 @@ 
 					->addExtraClass('btn')
 			)
 		);
-		$form->setFormAction($project->Link() . '/DataTransferRestoreForm');
+		$form->setFormAction($project->Link().'/DataTransferRestoreForm');
 
 		return $form;
 	}
@@ -1790,7 +1790,7 @@ 
 					->addExtraClass('btn')
 			)
 		);
-		$form->setFormAction($project->Link() . '/DeleteForm');
+		$form->setFormAction($project->Link().'/DeleteForm');
 
 		return $form;
 	}
@@ -1896,7 +1896,7 @@ 
 					->addExtraClass('btn')
 			)
 		);
-		$form->setFormAction($this->getCurrentProject()->Link() . '/MoveForm');
+		$form->setFormAction($this->getCurrentProject()->Link().'/MoveForm');
 
 		return $form;
 	}
@@ -2157,7 +2157,7 @@ 
 		$transfers = DNDataTransfer::get()
 			->filter('EnvironmentID', $environments)
 			->filterByCallback(
-				function ($record) {
+				function($record) {
 					return
 						$record->Environment()->canRestore() || // Ensure member can perform an action on the transfers env
 						$record->Environment()->canBackup() ||
@@ -2282,7 +2282,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
 		);
 	}
@@ -2292,7 +2292,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);
 	}
 
 	/**

code/tasks/SyncProjectsAndEnvironments.php

Spacing +33 added lines, -33 removed lines

@@ -9,19 +9,19 @@ 
 		$remove = true;
 		$dryRun = true;
 
-		if($request && $request->requestVar('remove') !== null) {
-			$remove = (bool)$request->requestVar('remove');
+		if ($request && $request->requestVar('remove') !== null) {
+			$remove = (bool) $request->requestVar('remove');
 		}
 
-		if($request && $request->requestVar('dryrun') !== null) {
-			$dryRun = (bool)$request->requestVar('dryrun');
+		if ($request && $request->requestVar('dryrun') !== null) {
+			$dryRun = (bool) $request->requestVar('dryrun');
 		}
 
-		if($dryRun) {
+		if ($dryRun) {
 			echo "Running in dry run mode, no changes commited, ";
-			echo "the output shows a prediction on what will happen." . PHP_EOL;
-			echo "To skip dryrun, run the task like this:" . PHP_EOL;
-			echo "./framework/sake dev/tasks/SyncProjectsAndEnvironments dryrun=0" . PHP_EOL . PHP_EOL;
+			echo "the output shows a prediction on what will happen.".PHP_EOL;
+			echo "To skip dryrun, run the task like this:".PHP_EOL;
+			echo "./framework/sake dev/tasks/SyncProjectsAndEnvironments dryrun=0".PHP_EOL.PHP_EOL;
 			sleep(3);
 		}
 
@@ -30,7 +30,7 @@ 
 
 		// Sync projects
 		$projects = DNProject::get();
-		if($remove) {
+		if ($remove) {
 			$this->echoHeader('Removing obsolete projects');
 			$this->removeObsoleteProjects($projectPaths, $dryRun);
 		}
@@ -38,7 +38,7 @@ 
 		$this->syncProjectPaths($projectPaths, $dryRun);
 
 		$this->echoHeader('Syncing environment files');
-		foreach($projects as $project) {
+		foreach ($projects as $project) {
 			$this->echoHeader($project->Name);
 			// Sync environments for each project
 			$environmentPaths = $data->getEnvironmentPaths($project->Name);
@@ -62,13 +62,13 @@ 
 		}, $paths);
 
 		$removeList = $list->filter('Filename:not', $basePaths);
-		if($removeList->count() === 0) {
+		if ($removeList->count() === 0) {
 			return;
 		}
 
-		foreach($removeList as $remove) {
-			$this->message('Removing "' . basename($remove->Name) . '" from db');
-			if(!$dryRun) {
+		foreach ($removeList as $remove) {
+			$this->message('Removing "'.basename($remove->Name).'" from db');
+			if (!$dryRun) {
 				$removeList->remove($remove);
 			}
 		}
@@ -83,13 +83,13 @@ 
 	 */
 	protected function removeObsoleteProjects($paths, $dryrun = false) {
 		$removeList = DNProject::get()->filter('Name:not', $paths);
-		if($removeList->count() == 0) {
+		if ($removeList->count() == 0) {
 			return;
 		}
 
-		foreach($removeList as $remove) {
-			$this->message($remove->Name . ' ' . $remove->Path);
-			if(!$dryrun) {
+		foreach ($removeList as $remove) {
+			$this->message($remove->Name.' '.$remove->Path);
+			if (!$dryrun) {
 				$removeList->remove($remove);
 			}
 		}
@@ -106,22 +106,22 @@ 
 		$list = $project->Environments();
 
 		// Normalise paths in DB
-		foreach($list as $item) {
+		foreach ($list as $item) {
 			$real = realpath($item->Filename);
-			if($real && $real != $item->Filename) {
+			if ($real && $real != $item->Filename) {
 				$item->Filename = $real;
 				$item->write();
 			}
 		}
 
-		foreach($paths as $path) {
+		foreach ($paths as $path) {
 			$path = basename($path);
-			if($list->filter('Filename', $path)->count()) {
+			if ($list->filter('Filename', $path)->count()) {
 				continue;
 			}
 
-			$this->message('Adding "' . basename($path) . '" to db');
-			if(!$dryRun) {
+			$this->message('Adding "'.basename($path).'" to db');
+			if (!$dryRun) {
 				$environment = DNEnvironment::create_from_path($path);
 				$environment->ProjectID = $project->ID;
 				$environment->write();
@@ -136,10 +136,10 @@ 
 	 * @param boolean $dryRun
 	 */
 	public function syncProjectPaths($paths, $dryRun = false) {
-		foreach($paths as $path) {
-			if(!DNProject::get()->filter('Name', $path)->count()) {
+		foreach ($paths as $path) {
+			if (!DNProject::get()->filter('Name', $path)->count()) {
 				$this->message($path);
-				if(!$dryRun) {
+				if (!$dryRun) {
 					DNProject::create_from_path($path)->write();
 				}
 			}
@@ -150,20 +150,20 @@ 
 	 * @param string $text
 	 */
 	protected function message($text) {
-		if(PHP_SAPI !== 'cli') {
-			$text = '<p>' . $text . '</p>' . PHP_EOL;
+		if (PHP_SAPI !== 'cli') {
+			$text = '<p>'.$text.'</p>'.PHP_EOL;
 		}
-		echo ' - ' . $text . PHP_EOL;
+		echo ' - '.$text.PHP_EOL;
 	}
 
 	/**
 	 * @param string $text
 	 */
 	protected function echoHeader($text) {
-		if(PHP_SAPI !== 'cli') {
-			echo '<h2>' . $text . '</h2>' . PHP_EOL;
+		if (PHP_SAPI !== 'cli') {
+			echo '<h2>'.$text.'</h2>'.PHP_EOL;
 		} else {
-			echo '# ' . $text . PHP_EOL;
+			echo '# '.$text.PHP_EOL;
 		}
 	}
 }

code/model/DNEnvironment.php

Spacing +6 added lines, -6 removed lines

@@ -774,7 +774,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).'
 				),
 
@@ -821,7 +821,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');
 
@@ -834,8 +834,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();
@@ -885,7 +885,7 @@ 
 		if (!$this->Filename) {
 			return '';
 		}
-		return $this->DNData()->getEnvironmentDir() . '/' . $this->Project()->Name . '/' . $this->Filename;
+		return $this->DNData()->getEnvironmentDir().'/'.$this->Project()->Name.'/'.$this->Filename;
 	}
 
 	/**
@@ -1039,7 +1039,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);

code/model/DNBranch.php

Spacing +6 added lines, -6 removed lines

@@ -50,19 +50,19 @@ 
 	 * @return string
 	 */
 	public function Name() {
-		return (string)htmlentities($this->branch->getName());
+		return (string) htmlentities($this->branch->getName());
 	}
 
 	public function Link() {
 		// Use a get-var for branch so that it can handle unsafe chars better
-		return Controller::join_links($this->project->Link(), 'branch?name=' . urlencode($this->Name()));
+		return Controller::join_links($this->project->Link(), 'branch?name='.urlencode($this->Name()));
 	}
 
 	/**
 	 * @return string
 	 */
 	public function SHA() {
-		return (string)htmlentities($this->branch->getCommit()->getHash());
+		return (string) htmlentities($this->branch->getCommit()->getHash());
 	}
 
 	/**
@@ -78,12 +78,12 @@ 
 	 */
 	public function LastUpdated() {
 
-		if($this->_lastUpdatedCache) {
+		if ($this->_lastUpdatedCache) {
 			return $this->_lastUpdatedCache;
 		}
 		try {
 			$created = $this->branch->getCommit()->getCommitterDate();
-		} catch(Exception $e) {
+		} catch (Exception $e) {
 			//occasionally parsing will fail this is a fallback to make it still work
 			return new SS_Datetime();
 		}
@@ -103,7 +103,7 @@ 
 	 * @return string
 	 */
 	public function IsOpenByDefault() {
-		if($this->Name() == 'master') {
+		if ($this->Name() == 'master') {
 			return " open";
 		} else {
 			return "";

code/control/Dispatcher.php

Spacing +1 added lines, -1 removed lines

@@ -144,7 +144,7 @@
 		$output['status_code'] = $statusCode;
 		$response = $this->getResponse();
 		$response->addHeader('Content-Type', 'application/json');
-		$response->setBody(json_encode($output, JSON_PRETTY_PRINT|JSON_NUMERIC_CHECK));
+		$response->setBody(json_encode($output, JSON_PRETTY_PRINT | JSON_NUMERIC_CHECK));
 		$response->setStatusCode($statusCode);
 		return $response;
 	}

code/control/DeployDispatcher.php

Spacing +2 added lines, -2 removed lines

@@ -263,12 +263,12 @@
 
 		// failover for older deployments
 		$started = $deployment->Created;
-		if($deployment->DeployStarted) {
+		if ($deployment->DeployStarted) {
 			$started = $deployment->DeployStarted;
 		}
 
 		$requested = $deployment->Created;
-		if($deployment->DeployRequested) {
+		if ($deployment->DeployRequested) {
 			$requested = $deployment->DeployRequested;
 		}
 

code/control/EnvironmentOverview.php

Spacing +4 added lines, -4 removed lines

@@ -66,11 +66,11 @@
 	public function getModel($name = '') {
 		$base = Director::absoluteBaseURL();
 		return [
-			'basename' => Director::baseURL() . $this->getCurrentEnvironment()->Link('overview'),
+			'basename' => Director::baseURL().$this->getCurrentEnvironment()->Link('overview'),
 			'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/model/jobs/DNDeployment.php

Spacing +14 added lines, -14 removed lines

@@ -108,7 +108,7 @@ 
 	}
 
 	public function LogLink() {
-		return $this->Link() . '/log';
+		return $this->Link().'/log';
 	}
 
 	public function canView($member = null) {
@@ -154,7 +154,7 @@ 
 	 * @return \Gitonomy\Git\Repository|null
 	 */
 	public function getRepository() {
-		if(!$this->SHA) {
+		if (!$this->SHA) {
 			return null;
 		}
 		return $this->Environment()->Project()->getRepository();
@@ -167,10 +167,10 @@ 
 	 */
 	public function getCommit() {
 		$repo = $this->getRepository();
-		if($repo) {
+		if ($repo) {
 			try {
 				return $this->Environment()->getCommit($this->SHA);
-			} catch(Gitonomy\Git\Exception\ReferenceNotFoundException $ex) {
+			} catch (Gitonomy\Git\Exception\ReferenceNotFoundException $ex) {
 				return null;
 			}
 		}
@@ -195,7 +195,7 @@ 
 		if (!$interface) {
 			return null;
 		}
-		return $interface->CommitURL . '/' . $this->SHA;
+		return $interface->CommitURL.'/'.$this->SHA;
 	}
 
 	/**
@@ -205,10 +205,10 @@ 
 	 */
 	public function getCommitMessage() {
 		$commit = $this->getCommit();
-		if($commit) {
+		if ($commit) {
 			try {
 				return Convert::raw2xml($this->Environment()->getCommitMessage($commit));
-			} catch(Gitonomy\Git\Exception\ReferenceNotFoundException $e) {
+			} catch (Gitonomy\Git\Exception\ReferenceNotFoundException $e) {
 				return null;
 			}
 		}
@@ -225,7 +225,7 @@ 
 		$this->Environment()->getCommitTags($commit);
 		$returnTags = [];
 		if (!empty($tags)) {
-			foreach($tags as $tag) {
+			foreach ($tags as $tag) {
 				$field = Varchar::create('Tag', '255');
 				$field->setValue($tag->getName());
 				$returnTags[] = $field;
@@ -242,12 +242,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;
+			if ($change === 'Code version') continue;
 
 			$messages[] = [
 				'Flag' => sprintf(
@@ -275,7 +275,7 @@ 
 	 */
 	public function getTag() {
 		$tags = $this->getTags();
-		if($tags->count() > 0) {
+		if ($tags->count() > 0) {
 			return $tags->last();
 		}
 		return null;
@@ -300,7 +300,7 @@ 
 	public function getChanges() {
 		$list = new ArrayList();
 		$strategy = $this->getDeploymentStrategy();
-		foreach($strategy->getChanges() as $name => $change) {
+		foreach ($strategy->getChanges() as $name => $change) {
 			$changed = (isset($change['from']) && isset($change['to'])) ? $change['from'] != $change['to'] : null;
 			$description = isset($change['description']) ? $change['description'] : '';
 			$compareUrl = null;
@@ -350,11 +350,11 @@ 
 		// Make sure we use the SHA as it was written into this DNDeployment.
 		$args['sha'] = $this->SHA;
 
-		if(!$this->DeployerID) {
+		if (!$this->DeployerID) {
 			$this->DeployerID = Member::currentUserID();
 		}
 
-		if($this->DeployerID) {
+		if ($this->DeployerID) {
 			$deployer = $this->Deployer();
 			$message = sprintf(
 				'Deploy to %s initiated by %s (%s), with IP address %s',

code/model/DNProject.php

Spacing +23 added lines, -23 removed lines

@@ -160,7 +160,7 @@ 
 		$cache = self::get_git_cache();
 		// we only need to clear the tag cache since everything else is cached by SHA, that is for commit and
 		// commit message.
-		$cache->clean(Zend_Cache::CLEANING_MODE_MATCHING_TAG, ['gitonomy', 'tags', 'project_' . $this->ID]);
+		$cache->clean(Zend_Cache::CLEANING_MODE_MATCHING_TAG, ['gitonomy', 'tags', 'project_'.$this->ID]);
 	}
 
 	/**
@@ -331,7 +331,7 @@ 
 			return true;
 		}
 
-		return (bool) $this->Environments()->filterByCallback(function ($env) use ($member) {
+		return (bool) $this->Environments()->filterByCallback(function($env) use ($member) {
 			return $env->canRestore($member);
 		})->Count();
 	}
@@ -352,7 +352,7 @@ 
 			return true;
 		}
 
-		return (bool) $this->Environments()->filterByCallback(function ($env) use ($member) {
+		return (bool) $this->Environments()->filterByCallback(function($env) use ($member) {
 			return $env->canBackup($member);
 		})->Count();
 	}
@@ -373,7 +373,7 @@ 
 			return true;
 		}
 
-		return (bool) $this->Environments()->filterByCallback(function ($env) use ($member) {
+		return (bool) $this->Environments()->filterByCallback(function($env) use ($member) {
 			return $env->canUploadArchive($member);
 		})->Count();
 	}
@@ -394,7 +394,7 @@ 
 			return true;
 		}
 
-		return (bool) $this->Environments()->filterByCallback(function ($env) use ($member) {
+		return (bool) $this->Environments()->filterByCallback(function($env) use ($member) {
 			return $env->canDownloadArchive($member);
 		})->Count();
 	}
@@ -453,7 +453,7 @@ 
 			// Key-pair is available, use it.
 			$processEnv = [
 				'IDENT_KEY' => $this->getPrivateKeyPath(),
-				'GIT_SSH' => BASE_PATH . "/deploynaut/git-deploy.sh"
+				'GIT_SSH' => BASE_PATH."/deploynaut/git-deploy.sh"
 			];
 		} else {
 			$processEnv = [];
@@ -541,7 +541,7 @@ 
 
 		$currentMember = self::$_current_member_cache;
 		return $this->Environments()
-			->filterByCallBack(function ($item) use ($currentMember) {
+			->filterByCallBack(function($item) use ($currentMember) {
 				return $item->canView($currentMember);
 			});
 	}
@@ -560,14 +560,14 @@ 
 	 * @return false|DNDeployment
 	 */
 	public function currentBuilds() {
-		if (!isset(self::$relation_cache['currentBuilds.' . $this->ID])) {
+		if (!isset(self::$relation_cache['currentBuilds.'.$this->ID])) {
 			$currentBuilds = [];
 			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];
 	}
 
 	/**
@@ -808,7 +808,7 @@ 
 	 */
 	public function getPublicKeyPath() {
 		if ($privateKey = $this->getPrivateKeyPath()) {
-			return $privateKey . '.pub';
+			return $privateKey.'.pub';
 		}
 		return null;
 	}
@@ -823,7 +823,7 @@ 
 		if (!empty($keyDir)) {
 			$filter = FileNameFilter::create();
 			$name = $filter->filter($this->Name);
-			return $keyDir . '/' . $name;
+			return $keyDir.'/'.$name;
 		}
 		return null;
 	}
@@ -842,7 +842,7 @@ 
 		$filter = FileNameFilter::create();
 		$name = $filter->filter($this->Name);
 
-		return $this->DNData()->getKeyDir() . '/' . $name;
+		return $this->DNData()->getKeyDir().'/'.$name;
 	}
 
 	/**
@@ -868,7 +868,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];
 
@@ -879,10 +879,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;
@@ -1009,7 +1009,7 @@ 
 		// {@see DataObject::extendedCan()}
 		$isDone = $this->extend('isProjectReady');
 		if ($isDone && is_array($isDone)) {
-			$isDone = array_filter($isDone, function ($val) {
+			$isDone = array_filter($isDone, function($val) {
 				return !is_null($val);
 			});
 
@@ -1094,11 +1094,11 @@ 
 			return false;
 		}
 
-		$cachekey = $this->ID . '_commit_' . $sha;
+		$cachekey = $this->ID.'_commit_'.$sha;
 		$cache = self::get_git_cache();
 		if (!($result = $cache->load($cachekey))) {
 			$result = $repo->getCommit($sha);
-			$cache->save($result, $cachekey, ['gitonomy', 'commit', 'project_' . $this->ID]);
+			$cache->save($result, $cachekey, ['gitonomy', 'commit', 'project_'.$this->ID]);
 		}
 		return $result;
 	}
@@ -1108,11 +1108,11 @@ 
 	 * @return string
 	 */
 	public function getCommitMessage(\Gitonomy\Git\Commit $commit) {
-		$cachekey = $this->ID . '_message_' . $commit->getRevision();
+		$cachekey = $this->ID.'_message_'.$commit->getRevision();
 		$cache = self::get_git_cache();
 		if (!($result = $cache->load($cachekey))) {
 			$result = $commit->getMessage();
-			$cache->save($result, $cachekey, ['gitonomy', 'message', 'project_' . $this->ID]);
+			$cache->save($result, $cachekey, ['gitonomy', 'message', 'project_'.$this->ID]);
 		}
 		return $result;
 	}
@@ -1122,14 +1122,14 @@ 
 	 * @return mixed
 	 */
 	public function getCommitTags(\Gitonomy\Git\Commit $commit) {
-		$cachekey = $this->ID . '_tags_' . $commit->getRevision();
+		$cachekey = $this->ID.'_tags_'.$commit->getRevision();
 		$cache = self::get_git_cache();
 		$result = $cache->load($cachekey);
 		// we check against false, because in many cases the tag list is an empty array
 		if ($result === false) {
 			$repo = $this->getRepository();
 			$result = $tags = $repo->getReferences()->resolveTags($commit->getRevision());
-			$cache->save($result, $cachekey, ['gitonomy', 'tags', 'project_' . $this->ID]);
+			$cache->save($result, $cachekey, ['gitonomy', 'tags', 'project_'.$this->ID]);
 		}
 		return $result;
 	}