silverstripe / deploynaut

code/backends/DeploymentBackend.php

Doc Comments +5 added lines

@@ -10,6 +10,7 @@ 
 	 * @param DeploynautLogFile $log
 	 * @param DNProject $project
 	 * @param type $leaveMaintenancePage
+	 * @return void
 	 */
 	public function deploy(DNEnvironment $environment, $sha, DeploynautLogFile $log, DNProject $project, $leaveMaintenancePage = false);
 
@@ -19,6 +20,7 @@ 
 	 *
 	 * @param DNDataTransfer $dataTransfer
 	 * @param DeploynautLogFile $log
+	 * @return void
 	 */
 	public function dataTransfer(DNDataTransfer $dataTransfer, DeploynautLogFile $log);
 
@@ -28,6 +30,7 @@ 
 	 * @param DNEnvironment $environment
 	 * @param DeploynautLogFile $log
 	 * @param DNProject $project
+	 * @return void
 	 */
 	public function enableMaintenance(DNEnvironment $environment, DeploynautLogFile $log, DNProject $project);
 
@@ -37,6 +40,7 @@ 
 	 * @param DNEnvironment $environment
 	 * @param DeploynautLogFile $log
 	 * @param DNProject $project
+	 * @return void
 	 */
 	public function disableMaintenance(DNEnvironment $environment, DeploynautLogFile $log, DNProject $project);
 
@@ -46,6 +50,7 @@ 
 	 * @param DNEnvironment $environment
 	 * @param DeploynautLogFile $log
 	 * @param DNProject $project
+	 * @return void
 	 */
 	public function ping(DNEnvironment $environment, DeploynautLogFile $log, DNProject $project);
 

code/backends/PackageGenerator.php

Doc Comments +2 added lines, -1 removed lines

@@ -13,8 +13,9 @@
 	/**
 	 * Generate the package file, saving to the given location
 	 *
-	 * @param $baseDir string The base directory of the project, checked out from git.
+	 * @param string $baseDir string The base directory of the project, checked out from git.
 	 * @param $outputFilename string The filename to write to.
+	 * @param string $sha
 	 *
 	 * @return boolean True on success
 	 */

Spacing +1 added lines, -1 removed lines

@@ -53,7 +53,7 @@
 
  		// Default, cacheless implementation
  		} else {
- 			$filename = TEMP_FOLDER .'/' . $sha . '.tar.gz';
+ 			$filename = TEMP_FOLDER . '/' . $sha . '.tar.gz';
  			if($this->generatePackage($sha, $repositoryDir, $outputFilename, $log)) {
  				return $filename;
  			}

code/backends/SizeRestrictedPackageCache.php

Doc Comments +1 added lines, -1 removed lines

@@ -72,7 +72,7 @@
 	/**
 	 * Take the identifier an make it safe to use as a directory name.
 	 *
-	 * @param string $identfiier The unsanitised directory name.
+	 * @param string $identifier The unsanitised directory name.
 	 */
 	protected function sanitiseDirName($identifier) {
 		$safe = preg_replace('/[^A-Za-z0-9_-]/', '', $identifier);

Indentation +1 added lines, -1 removed lines

@@ -91,7 +91,7 @@
 		$files = glob($dir . '/*.tar.gz');
 		if(sizeof($files) > $count) {
 			usort($files, function($a, $b) {
-			    return filemtime($a) > filemtime($b);
+				return filemtime($a) > filemtime($b);
 			});
 
 			for($i=0;$i<sizeof($files)-$count;$i++) {

Spacing +2 added lines, -2 removed lines

@@ -61,7 +61,7 @@ 
 			return $filename;
 
 		} else {
-			if($this->cacheSize) $this->reduceDirSizeTo($buildPath, $this->cacheSize-1, $log);
+			if($this->cacheSize) $this->reduceDirSizeTo($buildPath, $this->cacheSize - 1, $log);
 
 			if($generator->generatePackage($sha, $repositoryDir, $filename, $log)) {
 				return $filename;
@@ -94,7 +94,7 @@ 
 			    return filemtime($a) > filemtime($b);
 			});
 
-			for($i=0;$i<sizeof($files)-$count;$i++) {
+			for($i = 0; $i < sizeof($files) - $count; $i++) {
 				$log->write("Removing " . $files[$i] . " from package cache");
 				unlink($files[$i]);
 			}

Braces +12 added lines, -4 removed lines

@@ -41,16 +41,22 @@ 
 	 * @param DeploynautLogFile $log The log to write status output to, including package-generation commands
 	 */
 	public function getPackageFilename(PackageGenerator $generator, $identifier, $sha, $repositoryDir, DeploynautLogFile $log) {
-		if(!$this->baseDir) throw new \LogicException("Can't use PackageCache without setting BaseDir");
+		if(!$this->baseDir) {
+			throw new \LogicException("Can't use PackageCache without setting BaseDir");
+		}
 
 		$buildPath = $this->baseDir . '/' . $this->sanitiseDirName($identifier);
 		$filename = "$buildPath/$sha.tar.gz";
 
 		if(!file_exists($this->baseDir)) {
-			if(!mkdir($this->baseDir)) throw new \LogicException("Can't create base dir {$this->baseDir}");
+			if(!mkdir($this->baseDir)) {
+				throw new \LogicException("Can't create base dir {$this->baseDir}");
+			}
 		}
 		if(!file_exists($buildPath)) {
-			if(!mkdir($buildPath)) throw new \LogicException("Can't create build path $buildPath");
+			if(!mkdir($buildPath)) {
+				throw new \LogicException("Can't create build path $buildPath");
+			}
 		}
 
 		if(file_exists($filename)) {
@@ -61,7 +67,9 @@ 
 			return $filename;
 
 		} else {
-			if($this->cacheSize) $this->reduceDirSizeTo($buildPath, $this->cacheSize-1, $log);
+			if($this->cacheSize) {
+				$this->reduceDirSizeTo($buildPath, $this->cacheSize-1, $log);
+			}
 
 			if($generator->generatePackage($sha, $repositoryDir, $filename, $log)) {
 				return $filename;

code/control/DeployForm.php

Doc Comments +5 added lines, -1 removed lines

@@ -18,6 +18,7 @@ 
 	 * Validate a commit sha
 	 *
 	 * @param string $sha
+	 * @param string $field
 	 * @return boolean
 	 */
 	protected function validateCommit($sha, $field) {
@@ -100,6 +101,10 @@ 
  */
 class DeployForm extends Form {
 
+	/**
+	 * @param DNRoot $controller
+	 * @param string $name
+	 */
 	public function __construct($controller, $name, DNEnvironment $environment, DNProject $project) {
 		if($environment->HasPipelineSupport()) {
 			// Determine if commits are filtered
@@ -261,7 +266,6 @@ 
 	/**
 	 * Generate fields necessary to select from a filtered commit list
 	 *
-	 * @param DNEnvironment $environment
 	 * @param DataList $commits List of commits
 	 * @return FormField
 	 */

Spacing +8 added lines, -8 removed lines

@@ -32,7 +32,7 @@ 
 		}
 
 		// Check validity of commit
-		if (!preg_match('/^[a-f0-9]{40}$/', $sha)) {
+		if(!preg_match('/^[a-f0-9]{40}$/', $sha)) {
 			$this->validationError(
 				$field,
 				"Invalid release SHA: " . Convert::raw2xml($sha),
@@ -143,7 +143,7 @@ 
 						->setAttribute('onclick',
 							"return confirm('This will begin a release pipeline, but with the following exclusions:\\n" .
 							" - No messages will be sent\\n" .
-							" - No capistrano actions will be invoked\\n".
+							" - No capistrano actions will be invoked\\n" .
 							" - No deployments or snapshots will be created.');"
 						)
 				);
@@ -153,7 +153,7 @@ 
 					FormAction::create('doDeploy', "Direct deployment (bypass pipeline)")
 						->addExtraClass('btn btn-warning')
 						->setAttribute('onclick',
-							"return confirm('This will start a direct deployment, bypassing the pipeline ".
+							"return confirm('This will start a direct deployment, bypassing the pipeline " .
 							"process in place.\\n\\nAre you sure this is necessary?');"
 						)
 				);
@@ -188,7 +188,7 @@ 
 		foreach($project->DNBranchList() as $branch) {
 			$sha = $branch->SHA();
 			$name = $branch->Name();
-			$branches[$sha . '-' . $name] = $name . ' (' . substr($sha,0,8) . ', ' . $branch->LastUpdated()->TimeDiff() . ' old)';
+			$branches[$sha . '-' . $name] = $name . ' (' . substr($sha, 0, 8) . ', ' . $branch->LastUpdated()->TimeDiff() . ' old)';
 		}
 
 		// Tags
@@ -196,7 +196,7 @@ 
 		foreach($project->DNTagList()->setLimit(null) as $tag) {
 			$sha = $tag->SHA();
 			$name = $tag->Name();
-			$tags[$sha . '-' . $tag] = $name . ' (' . substr($sha,0,8) . ', ' . $tag->Created()->TimeDiff() . ' old)';
+			$tags[$sha . '-' . $tag] = $name . ' (' . substr($sha, 0, 8) . ', ' . $tag->Created()->TimeDiff() . ' old)';
 		}
 		$tags = array_reverse($tags);
 
@@ -210,7 +210,7 @@ 
 					$redeploy[$envName] = array();
 				}
 				if(!isset($redeploy[$envName][$sha])) {
-					$redeploy[$envName][$sha] = substr($sha,0,8) . ' (deployed ' . $deploy->obj('LastEdited')->Ago() . ')';
+					$redeploy[$envName][$sha] = substr($sha, 0, 8) . ' (deployed ' . $deploy->obj('LastEdited')->Ago() . ')';
 				}
 			}
 		}
@@ -268,11 +268,11 @@ 
 	protected function buildPipelineField($commits) {
 		// Get filtered commits
 		$filteredCommits = array();
-		foreach ($commits as $commit) {
+		foreach($commits as $commit) {
 			$title = sprintf(
 				"%s (%s, %s old)",
 				$commit->Message,
-				substr($commit->SHA,0,8),
+				substr($commit->SHA, 0, 8),
 				$commit->dbObject('Created')->TimeDiff()
 			);
 			$filteredCommits[$commit->SHA] = $title;

code/control/DNRoot.php

Doc Comments +7 added lines, -4 removed lines

@@ -161,7 +161,7 @@ 
 	/**
 	 * Action
 	 *
-	 * @return string - HTML
+	 * @return HTMLText - HTML
 	 */
 	public function projects(SS_HTTPRequest $request) {
 		// Performs canView permission check by limiting visible projects in DNProjectsList() call.
@@ -854,6 +854,7 @@ 
 	}
 
 	/**
+	 * @param SS_HTTPRequest $request
 	 * @return Form
 	 */
 	public function getDataTransferForm($request) {
@@ -1189,6 +1190,8 @@ 
 
 	/**
 	 * Build snapshot move form.
+	 * @param SS_HTTPRequest $request
+	 * @param DataObject $dataArchive
 	 */
 	public function getMoveForm($request, $dataArchive = null) {
 		$dataArchive = $dataArchive ? $dataArchive : DNDataArchive::get()->byId($request->requestVar('DataArchiveID'));
@@ -1330,7 +1333,7 @@ 
 	 * TODO To be replaced with a method that just returns the list of archives this {@link Member} has access to.
 	 *
 	 * @param Member $member The {@link Member} to check (or null to check the currently logged in Member)
-	 * @return boolean true if $member has access to upload or download to at least one {@link DNEnvironment}.
+	 * @return boolean|null true if $member has access to upload or download to at least one {@link DNEnvironment}.
 	 */
 	public function CanViewArchives(Member $member = null) {
 		if(!$member) $member = Member::currentUser();
@@ -1357,7 +1360,7 @@ 
 	}
 
 	/**
-	 * @return ArrayList The list of all archive files that can be accessed by the currently logged-in {@link Member}
+	 * @return PaginatedList The list of all archive files that can be accessed by the currently logged-in {@link Member}
 	 */
 	public function CompleteDataArchives() {
 		$project = $this->getCurrentProject();
@@ -1375,7 +1378,7 @@ 
 	}
 
 	/**
-	 * @return ArrayList The list of "pending" data archives which are waiting for a file
+	 * @return PaginatedList The list of "pending" data archives which are waiting for a file
 	 * to be delivered offline by post, and manually uploaded into the system.
 	 */
 	public function PendingDataArchives() {

Spacing +18 added lines, -18 removed lines

@@ -107,11 +107,11 @@ 
 	 * @return boolean
 	 */
 	public static function FlagSnapshotsEnabled() {
-		if (defined('FLAG_SNAPSHOTS_ENABLED') && FLAG_SNAPSHOTS_ENABLED) return true;
-		if (defined('FLAG_SNAPSHOTS_ENABLED_FOR_MEMBERS') && FLAG_SNAPSHOTS_ENABLED_FOR_MEMBERS) {
+		if(defined('FLAG_SNAPSHOTS_ENABLED') && FLAG_SNAPSHOTS_ENABLED) return true;
+		if(defined('FLAG_SNAPSHOTS_ENABLED_FOR_MEMBERS') && FLAG_SNAPSHOTS_ENABLED_FOR_MEMBERS) {
 			$allowedMembers = explode(';', FLAG_SNAPSHOTS_ENABLED_FOR_MEMBERS);
 			$member = Member::currentUser();
-			if ($allowedMembers && $member && in_array($member->Email, $allowedMembers)) return true;
+			if($allowedMembers && $member && in_array($member->Email, $allowedMembers)) return true;
 		}
 		return false;
 	}
@@ -138,7 +138,7 @@ 
 			)
 		);
 
-		Requirements::css(FRAMEWORK_ADMIN_DIR .'/thirdparty/chosen/chosen/chosen.css');
+		Requirements::css(FRAMEWORK_ADMIN_DIR . '/thirdparty/chosen/chosen/chosen.css');
 	}
 
 	/**
@@ -265,7 +265,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) {return $item->canUploadArchive();});
+		$envs = $project->DNEnvironmentList()->filterByCallback(function($item) {return $item->canUploadArchive(); });
 		$envsMap = array();
 		foreach($envs as $env) {
 			$envsMap[$env->ID] = $env->Name;
@@ -293,7 +293,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;
 	}
@@ -412,7 +412,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) {return $item->canUploadArchive();});
+		$envs = $project->DNEnvironmentList()->filterByCallback(function($item) {return $item->canUploadArchive(); });
 		$envsMap = array();
 		foreach($envs as $env) {
 			$envsMap[$env->ID] = $env->Name;
@@ -434,7 +434,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;
 	}
@@ -446,7 +446,7 @@ 
 		}
 
 		$validEnvs = $project->DNEnvironmentList()
-			->filterByCallback(function($item) {return $item->canUploadArchive();});
+			->filterByCallback(function($item) {return $item->canUploadArchive(); });
 
 		// Validate $data['EnvironmentID'] by checking against $validEnvs.
 		$environment = $validEnvs->find('ID', $data['EnvironmentID']);
@@ -745,7 +745,7 @@ 
 		$form = new DeployForm($this, 'DeployForm', $environment, $project);
 
 		// Tweak the action so it plays well with our fake URL structure.
-		$form->setFormAction($request->getURL().'/DeployForm');
+		$form->setFormAction($request->getURL() . '/DeployForm');
 		return $form;
 	}
 
@@ -859,7 +859,7 @@ 
 	public function getDataTransferForm($request) {
 		// Performs canView permission check by limiting visible projects
 		$envs = $this->getCurrentProject()->DNEnvironmentList()
-			->filterByCallback(function($item) {return $item->canBackup();});
+			->filterByCallback(function($item) {return $item->canBackup(); });
 		if(!$envs) {
 			return new SS_HTTPResponse("Environment '" . Convert::raw2xml($request->latestParam('Environment')) . "' not found.", 404);
 		}
@@ -876,7 +876,7 @@ 
 				FormAction::create('doDataTransfer', 'Create')->addExtraClass('btn')
 			)
 		);
-		$form->setFormAction($request->getURL().'/DataTransferForm');
+		$form->setFormAction($request->getURL() . '/DataTransferForm');
 
 		return $form;
 	}
@@ -892,12 +892,12 @@ 
 		$dataArchive = null;
 
 		// Validate direction.
-		if ($data['Direction']=='get') {
+		if($data['Direction'] == 'get') {
 			$validEnvs = $this->getCurrentProject()->DNEnvironmentList()
-				->filterByCallback(function($item) {return $item->canBackup();});
-		} else if ($data['Direction']=='push') {
+				->filterByCallback(function($item) {return $item->canBackup(); });
+		} else if($data['Direction'] == 'push') {
 			$validEnvs = $this->getCurrentProject()->DNEnvironmentList()
-				->filterByCallback(function($item) {return $item->canRestore();});
+				->filterByCallback(function($item) {return $item->canRestore(); });
 		} else {
 			throw new LogicException('Invalid direction');
 		}
@@ -909,7 +909,7 @@ 
 		}
 
 		// Validate mode.
-		if (!in_array($data['Mode'], array('all', 'assets', 'db'))) {
+		if(!in_array($data['Mode'], array('all', 'assets', 'db'))) {
 			throw new LogicException('Invalid mode');
 		}
 
@@ -1022,7 +1022,7 @@ 
 		// Performs canView permission check by limiting visible projects
 		$project = $this->getCurrentProject();
 		$envs = $project->DNEnvironmentList()
-			->filterByCallback(function($item) {return $item->canRestore();});
+			->filterByCallback(function($item) {return $item->canRestore(); });
 
 		if(!$envs) {
 			return new SS_HTTPResponse("Environment '" . Convert::raw2xml($request->latestParam('Environment')) . "' not found.", 404);

Braces +75 added lines, -25 removed lines

@@ -107,11 +107,15 @@ 
 	 * @return boolean
 	 */
 	public static function FlagSnapshotsEnabled() {
-		if (defined('FLAG_SNAPSHOTS_ENABLED') && FLAG_SNAPSHOTS_ENABLED) return true;
+		if (defined('FLAG_SNAPSHOTS_ENABLED') && FLAG_SNAPSHOTS_ENABLED) {
+			return true;
+		}
 		if (defined('FLAG_SNAPSHOTS_ENABLED_FOR_MEMBERS') && FLAG_SNAPSHOTS_ENABLED_FOR_MEMBERS) {
 			$allowedMembers = explode(';', FLAG_SNAPSHOTS_ENABLED_FOR_MEMBERS);
 			$member = Member::currentUser();
-			if ($allowedMembers && $member && in_array($member->Email, $allowedMembers)) return true;
+			if ($allowedMembers && $member && in_array($member->Email, $allowedMembers)) {
+				return true;
+			}
 		}
 		return false;
 	}
@@ -655,14 +659,22 @@ 
 		$params = $request->params();
 		$pipeline = Pipeline::get()->byID($params['Identifier']);
 
-		if(!$pipeline || !$pipeline->ID || !$pipeline->Environment()) throw new SS_HTTPResponse_Exception('Pipeline not found', 404);
-		if(!$pipeline->Environment()->canView()) return Security::permissionFailure();
+		if(!$pipeline || !$pipeline->ID || !$pipeline->Environment()) {
+			throw new SS_HTTPResponse_Exception('Pipeline not found', 404);
+		}
+		if(!$pipeline->Environment()->canView()) {
+			return Security::permissionFailure();
+		}
 
 		$environment = $pipeline->Environment();
 		$project = $pipeline->Environment()->Project();
 
-		if($environment->Name != $params['Environment']) throw new LogicException("Environment in URL doesn't match this pipeline");
-		if($project->Name != $params['Project']) throw new LogicException("Project in URL doesn't match this pipeline");
+		if($environment->Name != $params['Environment']) {
+			throw new LogicException("Environment in URL doesn't match this pipeline");
+		}
+		if($project->Name != $params['Project']) {
+			throw new LogicException("Project in URL doesn't match this pipeline");
+		}
 
 		// Delegate to sub-requesthandler
 		return PipelineController::create($this, $pipeline);
@@ -795,14 +807,22 @@ 
 		$params = $request->params();
 		$deployment = DNDeployment::get()->byId($params['Identifier']);
 
-		if(!$deployment || !$deployment->ID) throw new SS_HTTPResponse_Exception('Deployment not found', 404);
-		if(!$deployment->canView()) return Security::permissionFailure();
+		if(!$deployment || !$deployment->ID) {
+			throw new SS_HTTPResponse_Exception('Deployment not found', 404);
+		}
+		if(!$deployment->canView()) {
+			return Security::permissionFailure();
+		}
 
 		$environment = $deployment->Environment();
 		$project = $environment->Project();
 
-		if($environment->Name != $params['Environment']) throw new LogicException("Environment in URL doesn't match this deploy");
-		if($project->Name != $params['Project']) throw new LogicException("Project in URL doesn't match this deploy");
+		if($environment->Name != $params['Environment']) {
+			throw new LogicException("Environment in URL doesn't match this deploy");
+		}
+		if($project->Name != $params['Project']) {
+			throw new LogicException("Project in URL doesn't match this deploy");
+		}
 
 		return $this->customise(new ArrayData(array(
 			'Deployment' => $deployment,
@@ -818,14 +838,22 @@ 
 		$params = $request->params();
 		$deployment = DNDeployment::get()->byId($params['Identifier']);
 
-		if(!$deployment || !$deployment->ID) throw new SS_HTTPResponse_Exception('Deployment not found', 404);
-		if(!$deployment->canView()) return Security::permissionFailure();
+		if(!$deployment || !$deployment->ID) {
+			throw new SS_HTTPResponse_Exception('Deployment not found', 404);
+		}
+		if(!$deployment->canView()) {
+			return Security::permissionFailure();
+		}
 
 		$environment = $deployment->Environment();
 		$project = $environment->Project();
 
-		if($environment->Name != $params['Environment']) throw new LogicException("Environment in URL doesn't match this deploy");
-		if($project->Name != $params['Project']) throw new LogicException("Project in URL doesn't match this deploy");
+		if($environment->Name != $params['Environment']) {
+			throw new LogicException("Environment in URL doesn't match this deploy");
+		}
+		if($project->Name != $params['Project']) {
+			throw new LogicException("Project in URL doesn't match this deploy");
+		}
 
 		$log = $deployment->log();
 		if($log->exists()) {
@@ -950,13 +978,19 @@ 
 		$params = $request->params();
 		$transfer = DNDataTransfer::get()->byId($params['Identifier']);
 
-		if(!$transfer || !$transfer->ID) throw new SS_HTTPResponse_Exception('Transfer not found', 404);
-		if(!$transfer->canView()) return Security::permissionFailure();
+		if(!$transfer || !$transfer->ID) {
+			throw new SS_HTTPResponse_Exception('Transfer not found', 404);
+		}
+		if(!$transfer->canView()) {
+			return Security::permissionFailure();
+		}
 
 		$environment = $transfer->Environment();
 		$project = $environment->Project();
 
-		if($project->Name != $params['Project']) throw new LogicException("Project in URL doesn't match this deploy");
+		if($project->Name != $params['Project']) {
+			throw new LogicException("Project in URL doesn't match this deploy");
+		}
 
 		return $this->customise(new ArrayData(array(
 			'Transfer' => $transfer,
@@ -973,13 +1007,19 @@ 
 		$params = $request->params();
 		$transfer = DNDataTransfer::get()->byId($params['Identifier']);
 
-		if(!$transfer || !$transfer->ID) throw new SS_HTTPResponse_Exception('Transfer not found', 404);
-		if(!$transfer->canView()) return Security::permissionFailure();
+		if(!$transfer || !$transfer->ID) {
+			throw new SS_HTTPResponse_Exception('Transfer not found', 404);
+		}
+		if(!$transfer->canView()) {
+			return Security::permissionFailure();
+		}
 
 		$environment = $transfer->Environment();
 		$project = $environment->Project();
 
-		if($project->Name != $params['Project']) throw new LogicException("Project in URL doesn't match this deploy");
+		if($project->Name != $params['Project']) {
+			throw new LogicException("Project in URL doesn't match this deploy");
+		}
 
 		$log = $transfer->log();
 		if($log->exists()) {
@@ -1318,7 +1358,9 @@ 
 	 * @return DNEnvironment
 	 */
 	protected function getCurrentEnvironment($project = null) {
-		if(!$project) $project = $this->getCurrentProject();
+		if(!$project) {
+			$project = $this->getCurrentProject();
+		}
 		return $project->DNEnvironmentList()->filter('Name', $this->getRequest()->latestParam('Environment'))->First();
 	}
 
@@ -1333,12 +1375,18 @@ 
 	 * @return boolean true if $member has access to upload or download to at least one {@link DNEnvironment}.
 	 */
 	public function CanViewArchives(Member $member = null) {
-		if(!$member) $member = Member::currentUser();
+		if(!$member) {
+			$member = Member::currentUser();
+		}
 
-		if(Permission::checkMember($member, 'ADMIN')) return true;
+		if(Permission::checkMember($member, 'ADMIN')) {
+			return true;
+		}
 
 		$allProjects = $this->DNProjectList();
-		if(!$allProjects) return false;
+		if(!$allProjects) {
+			return false;
+		}
 
 		foreach($allProjects as $project) {
 			if($project->Environments()) {
@@ -1383,7 +1431,9 @@ 
 		$archives = new ArrayList();
 		foreach($project->DNEnvironmentList() as $env) {
 			foreach($env->DataArchives() as $archive) {
-				if($archive->canView() && $archive->isPending()) $archives->push($archive);
+				if($archive->canView() && $archive->isPending()) {
+					$archives->push($archive);
+				}
 			}
 		}
 		return new PaginatedList($archives->sort("Created", "DESC"), $this->request);

code/control/EmailMessagingService.php

Doc Comments +1 added lines, -1 removed lines

@@ -84,7 +84,7 @@
 	 *
 	 * @param PipelineStep $source Client step
 	 * @param string $from
-	 * @param string|Member $to
+	 * @param string $to
 	 * @param string $subject
 	 * @param string $body
 	 */

Braces +3 added lines, -1 removed lines

@@ -75,7 +75,9 @@
 	 * @param string $body
 	 */
 	protected function sendMessageTo($source, $from, $to, $subject, $body) {
-		if($to instanceof Member) $to = $to->Email;
+		if($to instanceof Member) {
+			$to = $to->Email;
+		}
 		$this->sendViaEmail($source, $from, $to, $subject, $body);
 	}
 

code/model/DNProject.php

Doc Comments +4 added lines, -4 removed lines

@@ -97,8 +97,8 @@ 
 	/**
 	 * Return the used quota in MB.
 	 *
-	 * @param mixed $round Number of decimal places to round to
-	 * @return string|int The used quota size in MB
+	 * @param integer $round Number of decimal places to round to
+	 * @return double The used quota size in MB
 	 */
 	public function getUsedQuotaMB($round = 2) {
 		$size = 0;
@@ -221,7 +221,7 @@ 
 	 * Return all archives which are "manual upload requests",
 	 * meaning they don't have a file attached to them (yet).
 	 *
-	 * @return ArrayList
+	 * @return DataList
 	 */
 	public function PendingManualUploadDataArchives() {
 		return $this->DataArchives()->filter('ArchiveFileID', null);
@@ -565,7 +565,7 @@ 
 	 * Setup a gridfield for the environment configs
 	 *
 	 * @param FieldList $fields
-	 * @param $environments
+	 * @param FormField $environments
 	 * @return void
 	 */
 	protected function setEnvironmentFields(&$fields, $environments) {

Spacing +13 added lines, -13 removed lines

@@ -238,7 +238,7 @@ 
 	 * @return array
 	 */
 	public function getProcessEnv() {
-		if (file_exists($this->getPrivateKeyPath())) {
+		if(file_exists($this->getPrivateKeyPath())) {
 			// Key-pair is available, use it.
 			$processEnv = array(
 				'IDENT_KEY' => $this->getPrivateKeyPath(),
@@ -324,21 +324,21 @@ 
 	 * Returns a map of envrionment name to build name
 	 */
 	public function currentBuilds() {
-		if(!isset(self::$relation_cache['currentBuilds.'.$this->ID])) {
+		if(!isset(self::$relation_cache['currentBuilds.' . $this->ID])) {
 			$currentBuilds = array();
 			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];
 	}
 
 	/**
 	 *
 	 * @return string
 	 */
-	public function Link($action='') {
+	public function Link($action = '') {
 		return Controller::join_links("naut", "project", $this->Name, $action);
 	}
 
@@ -417,7 +417,7 @@ 
 	 * @return boolean
 	 */
 	public function projectFolderExists() {
-		if(file_exists($this->DNData()->getEnvironmentDir().'/'.$this->Name)) {
+		if(file_exists($this->DNData()->getEnvironmentDir() . '/' . $this->Name)) {
 			return true;
 		}
 		return false;
@@ -428,7 +428,7 @@ 
 	 * @return bool
 	 */
 	public function repoExists() {
-		return file_exists(DEPLOYNAUT_LOCAL_VCS_PATH . '/' . $this->Name.'/HEAD');
+		return file_exists(DEPLOYNAUT_LOCAL_VCS_PATH . '/' . $this->Name . '/HEAD');
 	}
 
 	/**
@@ -468,7 +468,7 @@ 
 	protected function checkProjectPath() {
 		// Create the project capistrano folder
 		if($this->CreateEnvFolder && !file_exists($this->getProjectFolderPath())) {
-			mkdir($this->DNData()->getEnvironmentDir().'/'.$this->Name);
+			mkdir($this->DNData()->getEnvironmentDir() . '/' . $this->Name);
 		}
 	}
 
@@ -477,10 +477,10 @@ 
 	 */
 	protected function checkCVSPath() {
 		$changedFields = $this->getChangedFields(true, 2);
-		if (!$this->CVSPath) {
+		if(!$this->CVSPath) {
 			return;
 		}
-		if (isset($changedFields['CVSPath']) || isset($changedFields['Name'])) {
+		if(isset($changedFields['CVSPath']) || isset($changedFields['Name'])) {
 			$this->cloneRepo();
 		}
 	}
@@ -511,7 +511,7 @@ 
 	public function getPublicKey() {
 		$key = $this->getPublicKeyPath();
 
-		if (file_exists($key)) {
+		if(file_exists($key)) {
 			return file_get_contents($key);
 		}
 	}
@@ -592,7 +592,7 @@ 
 	 */
 	public function getRepositoryURL() {
 		$showUrl = Config::inst()->get($this->class, 'show_repository_url');
-		if ($showUrl) {
+		if($showUrl) {
 			return $this->CVSPath;
 		}
 	}
@@ -602,6 +602,6 @@ 
 	 * @return string
 	 */
 	protected function getProjectFolderPath() {
-		return $this->DNData()->getEnvironmentDir().'/'.$this->Name;
+		return $this->DNData()->getEnvironmentDir() . '/' . $this->Name;
 	}
 }

Braces +9 added lines, -3 removed lines

@@ -181,9 +181,13 @@ 
 	 * @return boolean
 	 */
 	public function canView($member = null) {
-		if(!$member) $member = Member::currentUser();
+		if(!$member) {
+			$member = Member::currentUser();
+		}
 
-		if(Permission::checkMember($member, 'ADMIN')) return true;
+		if(Permission::checkMember($member, 'ADMIN')) {
+			return true;
+		}
 
 		return $member->inGroups($this->Viewers());
 	}
@@ -553,7 +557,9 @@ 
 	 */
 	public function getKeyDir() {
 		$keyDir = $this->DNData()->getKeyDir();
-		if(!$keyDir) return null;
+		if(!$keyDir) {
+			return null;
+		}
 
 		$filter = FileNameFilter::create();
 		$name = $filter->filter($this->Name);

code/model/DNReferenceList.php

Doc Comments +1 added lines, -1 removed lines

@@ -55,7 +55,6 @@ 
 	}
 
 	/**
-	 * @param int $limit - defaults to the ten lates
 	 * @return array()
 	 */
 	protected function getReferences() {
@@ -106,6 +105,7 @@ 
 
 	/**
 	 * Find a build in this set by hash.
+	 * @param string $hash
 	 */
 	public function byName($hash) {
 		if($this->loaded == false) {

Braces +6 added lines, -2 removed lines

@@ -61,7 +61,9 @@ 
 	protected function getReferences() {
 		$repository = new Gitonomy\Git\Repository($this->project->LocalCVSPath);
 		if($this->getTags) {
-			if($this->reference) throw new LogicException("Can't have \$reference and \$getTags both set");
+			if($this->reference) {
+				throw new LogicException("Can't have \$reference and \$getTags both set");
+			}
 			$log = $repository->getReferences()->getTags();
 
 		} else if($this->reference) {
@@ -140,7 +142,9 @@ 
 			$this->loaded = true;
 		}
 		foreach($this->items as $i => $item) {
-			if(is_array($item)) $this->items[$i] = new ArrayData($item);
+			if(is_array($item)) {
+				$this->items[$i] = new ArrayData($item);
+			}
 		}
 		return new ArrayIterator($this->items);
 	}

code/model/DNTag.php

Doc Comments -1 removed lines

@@ -22,7 +22,6 @@
 	);
 
 	/**
-	 * @param Gitonomy\Git\Commit $commit
 	 * @param DNProject $project
 	 * @param DNData $data
 	 */