silverstripe / deploynaut

code/api/DeploynautAPI.php

Spacing +1 added lines, -1 removed lines

@@ -49,7 +49,7 @@
 			'projects' => array(),
 		);
 
-		if($request->httpMethod() != 'GET') return $this->message('API not found', 404);;
+		if($request->httpMethod() != 'GET') return $this->message('API not found', 404); ;
 
 		foreach(DNProject::get() as $item) {
 			if($item->canView($this->getMember())) {

Braces +4 added lines, -1 removed lines

@@ -49,7 +49,10 @@
 			'projects' => array(),
 		);
 
-		if($request->httpMethod() != 'GET') return $this->message('API not found', 404);;
+		if($request->httpMethod() != 'GET') {
+			return $this->message('API not found', 404);
+		}
+		;
 
 		foreach(DNProject::get() as $item) {
 			if($item->canView($this->getMember())) {

code/api/nouns/APIEnvironment.php

Spacing +3 added lines, -3 removed lines

@@ -38,7 +38,7 @@ 
 							"href" => "$href/deploy",
 							"type" => "application/json",
 							"fields" => array(
-								array( "name" => "release", "type" => "text" ),
+								array("name" => "release", "type" => "text"),
 							),
 						)
 					)
@@ -126,7 +126,7 @@ 
 		$ping->write();
 		$ping->start();
 
-		$location = Director::absoluteBaseURL().$this->Link().'/ping/'.$ping->ID;
+		$location = Director::absoluteBaseURL() . $this->Link() . '/ping/' . $ping->ID;
 		$output = array(
 			'message' => 'Ping queued as job ' . $ping->ResqueToken,
 			'href' => $location,
@@ -180,7 +180,7 @@ 
 		$deploy->SHA = $reqBody['release'];
 		$deploy->write();
 		$deploy->start();
-		$location = Director::absoluteBaseURL().$this->Link().'/deploy/'.$deploy->ID;
+		$location = Director::absoluteBaseURL() . $this->Link() . '/deploy/' . $deploy->ID;
 		$output = array(
 			'message' => 'Deploy queued as job ' . $deploy->ResqueToken,
 			'href' => $location,

code/api/nouns/APINoun.php

Spacing +1 added lines, -1 removed lines

@@ -119,7 +119,7 @@
 	 * @return SS_HTTPResponse
 	 */
 	protected function message($message, $statusCode) {
-		$response =  $this->getAPIResponse(array(
+		$response = $this->getAPIResponse(array(
 			'message' => $message,
 			'statusCode' => $statusCode
 		));

code/api/nouns/APIProject.php

Spacing +1 added lines, -1 removed lines

@@ -97,7 +97,7 @@
 		$fetch->write();
 		$fetch->start();
 
-		$location = Director::absoluteBaseURL().$this->Link().'/fetch/'.$fetch->ID;
+		$location = Director::absoluteBaseURL() . $this->Link() . '/fetch/' . $fetch->ID;
 		$output = array(
 			'message' => 'Ping queued as job ' . $fetch->ResqueToken,
 			'href' => $location,

code/backends/CapistranoDeploymentBackend.php

Spacing +3 added lines, -3 removed lines

@@ -177,7 +177,7 @@ 
 		$env = $environment->Project()->getProcessEnv();
 
 		if(!$args) $args = array();
-		$args['history_path'] = realpath(DEPLOYNAUT_LOG_PATH.'/');
+		$args['history_path'] = realpath(DEPLOYNAUT_LOG_PATH . '/');
 
 		// Inject env string directly into the command.
 		// Capistrano doesn't like the $process->setEnv($env) we'd normally do below.
@@ -191,7 +191,7 @@ 
 
 		$data = DNData::inst();
 		// Generate a capfile from a template
-		$capTemplate = file_get_contents(BASE_PATH.'/deploynaut/Capfile.template');
+		$capTemplate = file_get_contents(BASE_PATH . '/deploynaut/Capfile.template');
 		$cap = str_replace(
 			array('<config root>', '<ssh key>', '<base path>'),
 			array($data->getEnvironmentDir(), DEPLOYNAUT_SSH_KEY, BASE_PATH),
@@ -201,7 +201,7 @@ 
 		if(defined('DEPLOYNAUT_CAPFILE')) {
 			$capFile = DEPLOYNAUT_CAPFILE;
 		} else {
-			$capFile = ASSETS_PATH.'/Capfile';
+			$capFile = ASSETS_PATH . '/Capfile';
 		}
 		file_put_contents($capFile, $cap);
 

Braces +3 added lines, -1 removed lines

@@ -176,7 +176,9 @@
 		$name = $environment->getFullName();
 		$env = $environment->Project()->getProcessEnv();
 
-		if(!$args) $args = array();
+		if(!$args) {
+			$args = array();
+		}
 		$args['history_path'] = realpath(DEPLOYNAUT_LOG_PATH.'/');
 
 		// Inject env string directly into the command.

code/backends/PackageGenerator.php

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/SimplePackageGenerator.php

Spacing +2 added lines, -2 removed lines

@@ -25,7 +25,7 @@ 
 
 	public function getIdentifier() {
 		// If the build script changes, don't re-use cached items
-		return substr(sha1($this->buildScript),0,8);
+		return substr(sha1($this->buildScript), 0, 8);
 	}
 
 	/**
@@ -72,7 +72,7 @@ 
 	 */
 	protected function executeProcesses($processes, DeploynautLogFile $log) {
 		foreach($processes as $process) {
-			$process->mustRun(function ($type, $buffer) use($log) {
+			$process->mustRun(function($type, $buffer) use($log) {
 				$log->write($buffer);
 			});
 		}

Braces +3 added lines, -1 removed lines

@@ -33,7 +33,9 @@
 	 */
 	public function generatePackage($sha, $baseDir, $outputFilename, DeploynautLogFile $log) {
 		$tempPath = TEMP_FOLDER . "/" . str_replace(".tar.gz", "", basename($outputFilename));
-		if(!file_exists($tempPath)) mkdir($tempPath);
+		if(!file_exists($tempPath)) {
+			mkdir($tempPath);
+		}
 
 		// Execute these in sequence until there's a failure
 		$processes = array(

code/backends/SizeRestrictedPackageCache.php

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/DNRoot.php

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