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 +8 added lines, -8 removed lines

@@ -110,8 +110,8 @@ 
 		// 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,
@@ -170,7 +170,7 @@ 
 	 */
 	public function getChange($key) {
 		$changes = $this->getChanges();
-		if(array_key_exists($key, $changes)) {
+		if (array_key_exists($key, $changes)) {
 			return new ArrayData($changes[$key]);
 		}
 		return null;
@@ -189,7 +189,7 @@ 
 	 * @return string|null
 	 */
 	public function getOption($option) {
-		if(!empty($this->options[$option])) {
+		if (!empty($this->options[$option])) {
 			return $this->options[$option];
 		}
 	}
@@ -230,7 +230,7 @@ 
 			DeploymentStrategy::WARNING_CODE => 1,
 			DeploymentStrategy::ERROR_CODE => 2
 		];
-		if($map[$current] < $map[$code]) {
+		if ($map[$current] < $map[$code]) {
 			$this->setValidationCode($code);
 		}
 	}
@@ -259,7 +259,7 @@ 
 		);
 
 		$output = array();
-		foreach($fields as $field) {
+		foreach ($fields as $field) {
 			$output[$field] = $this->$field;
 		}
 		return $output;
@@ -300,8 +300,8 @@ 
 			'messages'
 		);
 
-		foreach($fields as $field) {
-			if(!empty($data[$field])) {
+		foreach ($fields as $field) {
+			if (!empty($data[$field])) {
 				$this->$field = $data[$field];
 			}
 		}

code/control/DNRoot.php

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 +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/jobs/PingJob.php

Spacing +1 added lines, -1 removed lines

@@ -31,7 +31,7 @@
 	 * Do the actual job by calling the appropiate backend
 	 */
 	public function perform() {
-		echo "[-] PingJob starting" . PHP_EOL;
+		echo "[-] PingJob starting".PHP_EOL;
 		$log = new DeploynautLogFile($this->args['logfile']);
 
 		$ping = DNPing::get()->byID($this->args['pingID']);

code/control/DeployForm.php

Spacing +2 added lines, -2 removed lines

@@ -73,7 +73,7 @@ 
 				substr($sha, 0, 8),
 				$branch->LastUpdated()->TimeDiff()
 			);
-			$branches[$sha . '-' . $name] = $branchValue;
+			$branches[$sha.'-'.$name] = $branchValue;
 		}
 
 		// Tags
@@ -86,7 +86,7 @@ 
 				substr($sha, 0, 8),
 				$branch->LastUpdated()->TimeDiff()
 			);
-			$tags[$sha . '-' . $tag] = $tagValue;
+			$tags[$sha.'-'.$tag] = $tagValue;
 		}
 		$tags = array_reverse($tags);
 

code/control/DeployDispatcher.php

Doc Comments +1 added lines, -1 removed lines

@@ -46,7 +46,7 @@
 	 *
 	 * @param \SS_HTTPRequest $request
 	 *
-	 * @return \HTMLText|\SS_HTTPResponse
+	 * @return SS_HTTPResponse|null
 	 */
 	public function index(\SS_HTTPRequest $request) {
 		return $this->redirect(\Controller::join_links($this->Link(), 'history'), 302);

code/control/GitDispatcher.php

Doc Comments +5 added lines, -5 removed lines

@@ -47,7 +47,7 @@ 
 	 *
 	 * @param \SS_HTTPRequest $request
 	 *
-	 * @return \HTMLText|\SS_HTTPResponse
+	 * @return SS_HTTPResponse|null
 	 */
 	public function index(\SS_HTTPRequest $request) {
 		return $this->redirect(\Controller::join_links($this->Link(), 'show'), 302);
@@ -72,7 +72,7 @@ 
 	/**
 	 * @param SS_HTTPRequest $request
 	 *
-	 * @return string
+	 * @return SS_HTTPResponse
 	 */
 	public function show(\SS_HTTPRequest $request) {
 
@@ -166,7 +166,7 @@ 
 	}
 
 	/**
-	 * @param $project
+	 * @param DNProject $project
 	 *
 	 * @return array
 	 */
@@ -182,7 +182,7 @@ 
 	}
 
 	/**
-	 * @param $project
+	 * @param DNProject $project
 	 *
 	 * @return array
 	 */
@@ -198,7 +198,7 @@ 
 	}
 
 	/**
-	 * @param $project
+	 * @param DNProject $project
 	 *
 	 * @return array
 	 */

Spacing +2 added lines, -2 removed lines

@@ -133,7 +133,7 @@ 
 	protected function getUpdateStatus($ID) {
 		$ping = DNGitFetch::get()->byID($ID);
 		if (!$ping) {
-			return $this->getAPIResponse(['message' => 'GIT update (' . $ID . ') not found'], 404);
+			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,

code/model/DNEnvironment.php

Doc Comments +1 added lines, -1 removed lines

@@ -578,7 +578,7 @@
 	 * Dear people of the future: If you are looking to optimize this, simply create a CurrentBuildSHA(), which can be
 	 * a lot faster. I presume you came here because of the Project display template, which only needs a SHA.
 	 *
-	 * @return false|DNDeployment
+	 * @return DNDeployment
 	 */
 	public function CurrentBuild() {
 		// The DeployHistory function is far too slow to use for this

Spacing +63 added lines, -63 removed lines

@@ -180,7 +180,7 @@ 
 	 */
 	public function Backend() {
 		$backends = array_keys($this->config()->get('allowed_backends', Config::FIRST_SET));
-		switch(sizeof($backends)) {
+		switch (sizeof($backends)) {
 		// Nothing allowed, use the default value "DeploymentBackend"
 			case 0:
 				$backend = "DeploymentBackend";
@@ -194,7 +194,7 @@ 
 			// Multiple choices, use our choice if it's legal, otherwise default to the first item on the list
 			default:
 				$backend = $this->BackendIdentifier;
-				if(!in_array($backend, $backends)) {
+				if (!in_array($backend, $backends)) {
 					$backend = $backends[0];
 				}
 		}
@@ -256,14 +256,14 @@ 
 
 	public function getBareURL() {
 		$url = parse_url($this->URL);
-		if(isset($url['host'])) {
+		if (isset($url['host'])) {
 			return strtolower($url['host']);
 		}
 	}
 
 	public function getBareDefaultURL() {
 		$url = parse_url($this->getDefaultURL());
-		if(isset($url['host'])) {
+		if (isset($url['host'])) {
 			return strtolower($url['host']);
 		}
 	}
@@ -275,20 +275,20 @@ 
 	 * @return boolean
 	 */
 	public function canView($member = null) {
-		if(!$member) {
+		if (!$member) {
 			$member = Member::currentUser();
 		}
-		if(!$member) {
+		if (!$member) {
 			return false;
 		}
 		// Must be logged in to check permissions
 
-		if(Permission::checkMember($member, 'ADMIN')) {
+		if (Permission::checkMember($member, 'ADMIN')) {
 			return true;
 		}
 
 		// if no Viewers or ViewerGroups defined, fallback to DNProject::canView permissions
-		if($this->Viewers()->exists() || $this->ViewerGroups()->exists()) {
+		if ($this->Viewers()->exists() || $this->ViewerGroups()->exists()) {
 			return $this->Viewers()->byID($member->ID)
 				|| $member->inGroups($this->ViewerGroups());
 		}
@@ -303,10 +303,10 @@ 
 	 * @return boolean
 	 */
 	public function canDeploy($member = null) {
-		if(!$member) {
+		if (!$member) {
 			$member = Member::currentUser();
 		}
-		if(!$member) {
+		if (!$member) {
 			return false;
 		}
 		// Must be logged in to check permissions
@@ -338,10 +338,10 @@ 
 	 * @return boolean true if $member can restore, and false if they can't.
 	 */
 	public function canRestore($member = null) {
-		if(!$member) {
+		if (!$member) {
 			$member = Member::currentUser();
 		}
-		if(!$member) {
+		if (!$member) {
 			return false;
 		}
 		// Must be logged in to check permissions
@@ -365,15 +365,15 @@ 
 	 */
 	public function canBackup($member = null) {
 		$project = $this->Project();
-		if($project->HasDiskQuota() && $project->HasExceededDiskQuota()) {
+		if ($project->HasDiskQuota() && $project->HasExceededDiskQuota()) {
 			return false;
 		}
 
-		if(!$member) {
+		if (!$member) {
 			$member = Member::currentUser();
 		}
 		// Must be logged in to check permissions
-		if(!$member) {
+		if (!$member) {
 			return false;
 		}
 
@@ -400,14 +400,14 @@ 
 	 */
 	public function canUploadArchive($member = null) {
 		$project = $this->Project();
-		if($project->HasDiskQuota() && $project->HasExceededDiskQuota()) {
+		if ($project->HasDiskQuota() && $project->HasExceededDiskQuota()) {
 			return false;
 		}
 
-		if(!$member) {
+		if (!$member) {
 			$member = Member::currentUser();
 		}
-		if(!$member) {
+		if (!$member) {
 			return false;
 		}
 		// Must be logged in to check permissions
@@ -430,10 +430,10 @@ 
 	 * @return boolean true if $member can download archives from this environment, false if they can't.
 	 */
 	public function canDownloadArchive($member = null) {
-		if(!$member) {
+		if (!$member) {
 			$member = Member::currentUser();
 		}
-		if(!$member) {
+		if (!$member) {
 			return false;
 		}
 		// Must be logged in to check permissions
@@ -456,10 +456,10 @@ 
 	 * @return boolean true if $member can delete archives from this environment, false if they can't.
 	 */
 	public function canDeleteArchive($member = null) {
-		if(!$member) {
+		if (!$member) {
 			$member = Member::currentUser();
 		}
-		if(!$member) {
+		if (!$member) {
 			return false;
 		}
 		// Must be logged in to check permissions
@@ -589,18 +589,18 @@ 
 			'State' => 'Completed'
 		))->sort('LastEdited DESC')->first();
 
-		if(!$deploy || (!$deploy->SHA)) {
+		if (!$deploy || (!$deploy->SHA)) {
 			return false;
 		}
 
 		$repo = $this->Project()->getRepository();
-		if(!$repo) {
+		if (!$repo) {
 			return $deploy;
 		}
 
 		try {
 			$commit = $repo->getCommit($deploy->SHA);
-			if($commit) {
+			if ($commit) {
 				$deploy->Message = Convert::raw2xml($commit->getMessage());
 				$deploy->Committer = Convert::raw2xml($commit->getCommitterName());
 				$deploy->CommitDate = $commit->getCommitterDate()->Format('d/m/Y g:ia');
@@ -608,7 +608,7 @@ 
 				$deploy->AuthorDate = $commit->getAuthorDate()->Format('d/m/Y g:ia');
 			}
 			// We can't find this SHA, so we ignore adding a commit message to the deployment
-		} catch(Exception $ex) { }
+		} catch (Exception $ex) { }
 
 		return $deploy;
 	}
@@ -631,17 +631,17 @@ 
 	protected function getCommitData($sha) {
 		try {
 			$repo = $this->Project()->getRepository();
-			if($repo !== false) {
+			if ($repo !== false) {
 				$commit = new \Gitonomy\Git\Commit($repo, $sha);
 				return [
-					'AuthorName' => (string)Convert::raw2xml($commit->getAuthorName()),
-					'AuthorEmail' => (string)Convert::raw2xml($commit->getAuthorEmail()),
-					'Message' => (string)Convert::raw2xml($commit->getMessage()),
+					'AuthorName' => (string) Convert::raw2xml($commit->getAuthorName()),
+					'AuthorEmail' => (string) Convert::raw2xml($commit->getAuthorEmail()),
+					'Message' => (string) Convert::raw2xml($commit->getMessage()),
 					'ShortHash' => Convert::raw2xml($commit->getFixedShortHash(8)),
 					'Hash' => Convert::raw2xml($commit->getHash())
 				];
 			}
-		} catch(\Gitonomy\Git\Exception\ReferenceNotFoundException $exc) {
+		} catch (\Gitonomy\Git\Exception\ReferenceNotFoundException $exc) {
 			SS_Log::log($exc, SS_Log::WARN);
 		}
 		return array(
@@ -713,12 +713,12 @@ 
 		$fields = new FieldList(new TabSet('Root'));
 
 		$project = $this->Project();
-		if($project && $project->exists()) {
+		if ($project && $project->exists()) {
 			$viewerGroups = $project->Viewers();
 			$groups = $viewerGroups->sort('Title')->map()->toArray();
 			$members = array();
-			foreach($viewerGroups as $group) {
-				foreach($group->Members()->map() as $k => $v) {
+			foreach ($viewerGroups as $group) {
+				foreach ($group->Members()->map() as $k => $v) {
 					$members[$k] = $v;
 				}
 			}
@@ -755,7 +755,7 @@ 
 		// Backend identifier - pick from a named list of configurations specified in YML config
 		$backends = $this->config()->get('allowed_backends', Config::FIRST_SET);
 		// If there's only 1 backend, then user selection isn't needed
-		if(sizeof($backends) > 1) {
+		if (sizeof($backends) > 1) {
 			$fields->addFieldToTab('Root.Main', DropdownField::create('BackendIdentifier', 'Deployment backend')
 				->setSource($backends)
 				->setDescription('What kind of deployment system should be used to deploy to this environment'));
@@ -804,7 +804,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).'
 				),
 
@@ -824,14 +824,14 @@ 
 		));
 
 		// The Main.DeployConfig
-		if($this->Project()->exists()) {
+		if ($this->Project()->exists()) {
 			$this->setDeployConfigurationFields($fields);
 		}
 
 		// The DataArchives
 		$dataArchiveConfig = GridFieldConfig_RecordViewer::create();
 		$dataArchiveConfig->removeComponentsByType('GridFieldAddNewButton');
-		if(class_exists('GridFieldBulkManager')) {
+		if (class_exists('GridFieldBulkManager')) {
 			$dataArchiveConfig->addComponent(new GridFieldBulkManager());
 		}
 		$dataArchive = GridField::create('DataArchives', 'Data Archives', $this->DataArchives(), $dataArchiveConfig);
@@ -840,7 +840,7 @@ 
 		// Deployments
 		$deploymentsConfig = GridFieldConfig_RecordEditor::create();
 		$deploymentsConfig->removeComponentsByType('GridFieldAddNewButton');
-		if(class_exists('GridFieldBulkManager')) {
+		if (class_exists('GridFieldBulkManager')) {
 			$deploymentsConfig->addComponent(new GridFieldBulkManager());
 		}
 		$deployments = GridField::create('Deployments', 'Deployments', $this->Deployments(), $deploymentsConfig);
@@ -851,7 +851,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');
 
@@ -864,11 +864,11 @@ 
 	 * @param FieldList $fields
 	 */
 	protected function setDeployConfigurationFields(&$fields) {
-		if(!$this->config()->get('allow_web_editing')) {
+		if (!$this->config()->get('allow_web_editing')) {
 			return;
 		}
 
-		if($this->envFileExists()) {
+		if ($this->envFileExists()) {
 			$deployConfig = new TextareaField('DeployConfig', 'Deploy config', $this->getEnvironmentConfig());
 			$deployConfig->setRows(40);
 			$fields->insertAfter($deployConfig, 'Filename');
@@ -888,8 +888,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();
@@ -898,13 +898,13 @@ 
 	public function onAfterWrite() {
 		parent::onAfterWrite();
 
-		if($this->Usage === self::PRODUCTION || $this->Usage === self::UAT) {
+		if ($this->Usage === self::PRODUCTION || $this->Usage === self::UAT) {
 			$conflicting = DNEnvironment::get()
 				->filter('ProjectID', $this->ProjectID)
 				->filter('Usage', $this->Usage)
 				->exclude('ID', $this->ID);
 
-			foreach($conflicting as $otherEnvironment) {
+			foreach ($conflicting as $otherEnvironment) {
 				$otherEnvironment->Usage = self::UNSPECIFIED;
 				$otherEnvironment->write();
 			}
@@ -918,7 +918,7 @@ 
 	protected function checkEnvironmentPath() {
 		// Create folder if it doesn't exist
 		$configDir = dirname($this->getConfigFilename());
-		if(!file_exists($configDir) && $configDir) {
+		if (!file_exists($configDir) && $configDir) {
 			mkdir($configDir, 0777, true);
 		}
 	}
@@ -927,18 +927,18 @@ 
 	 * Write the deployment config file to filesystem
 	 */
 	protected function writeConfigFile() {
-		if(!$this->config()->get('allow_web_editing')) {
+		if (!$this->config()->get('allow_web_editing')) {
 			return;
 		}
 
 		// Create a basic new environment config from a template
-		if(!$this->envFileExists()
+		if (!$this->envFileExists()
 			&& $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) {
+		} else if ($this->envFileExists() && $this->DeployConfig) {
 			file_put_contents($this->getConfigFilename(), $this->DeployConfig);
 		}
 	}
@@ -949,12 +949,12 @@ 
 	public function onAfterDelete() {
 		parent::onAfterDelete();
 		// Create a basic new environment config from a template
-		if($this->config()->get('allow_web_editing') && $this->envFileExists()) {
+		if ($this->config()->get('allow_web_editing') && $this->envFileExists()) {
 			unlink($this->getConfigFilename());
 		}
 
 		$create = $this->CreateEnvironment();
-		if($create && $create->exists()) {
+		if ($create && $create->exists()) {
 			$create->delete();
 		}
 	}
@@ -963,7 +963,7 @@ 
 	 * @return string
 	 */
 	protected function getEnvironmentConfig() {
-		if(!$this->envFileExists()) {
+		if (!$this->envFileExists()) {
 			return '';
 		}
 		return file_get_contents($this->getConfigFilename());
@@ -973,7 +973,7 @@ 
 	 * @return boolean
 	 */
 	protected function envFileExists() {
-		if(!$this->getConfigFilename()) {
+		if (!$this->getConfigFilename()) {
 			return false;
 		}
 		return file_exists($this->getConfigFilename());
@@ -985,13 +985,13 @@ 
 	 * @return string
 	 */
 	public function getConfigFilename() {
-		if(!$this->Project()->exists()) {
+		if (!$this->Project()->exists()) {
 			return '';
 		}
-		if(!$this->Filename) {
+		if (!$this->Filename) {
 			return '';
 		}
-		return $this->DNData()->getEnvironmentDir() . '/' . $this->Project()->Name . '/' . $this->Filename;
+		return $this->DNData()->getEnvironmentDir().'/'.$this->Project()->Name.'/'.$this->Filename;
 	}
 
 	/**
@@ -1004,24 +1004,24 @@ 
 	 */
 	public static function array_to_viewabledata($array) {
 		// Don't transform non-arrays
-		if(!is_array($array)) {
+		if (!is_array($array)) {
 			return $array;
 		}
 
 		// Figure out whether this is indexed or associative
 		$keys = array_keys($array);
 		$assoc = ($keys != array_keys($keys));
-		if($assoc) {
+		if ($assoc) {
 			// Treat as viewable data
 			$data = new ArrayData(array());
-			foreach($array as $key => $value) {
+			foreach ($array as $key => $value) {
 				$data->setField($key, self::array_to_viewabledata($value));
 			}
 			return $data;
 		} else {
 			// Treat this as basic non-associative list
 			$list = new ArrayList();
-			foreach($array as $value) {
+			foreach ($array as $value) {
 				$list->push(self::array_to_viewabledata($value));
 			}
 			return $list;
@@ -1032,7 +1032,7 @@ 
 		$result = parent::validate();
 		$backend = $this->Backend();
 
-		if(strcasecmp('test', $this->Name) === 0 && get_class($backend) == 'CapistranoDeploymentBackend') {
+		if (strcasecmp('test', $this->Name) === 0 && get_class($backend) == 'CapistranoDeploymentBackend') {
 			$result->error('"test" is not a valid environment name when using Capistrano backend.');
 		}
 

_config.php

Spacing +1 added lines, -1 removed lines

@@ -10,7 +10,7 @@
 // This will ensure jobs can correctly clean themselves up on any type of failure
 Resque_Event::listen('onFailure', function(Exception $exception, Resque_job $job) {
 	$inst = $job->getInstance();
-	if($inst instanceof DeploynautJobInterface) {
+	if ($inst instanceof DeploynautJobInterface) {
 		$inst->onFailure($exception);
 	}
 });

code/control/EnvironmentOverview.php

Spacing +3 added lines, -3 removed lines

@@ -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(),