silverstripe / deploynaut

code/api/nouns/APIProject.php

Spacing +8 added lines, -8 removed lines

@@ -15,11 +15,11 @@ 
 	 * @return SS_HTTPResponse
 	 */
 	public function index(SS_HTTPRequest $request) {
-		if(!$this->record->canView($this->getMember())) {
+		if (!$this->record->canView($this->getMember())) {
 			return $this->message('You are not authorized to this environment', 403);
 		}
 
-		switch($request->httpMethod()) {
+		switch ($request->httpMethod()) {
 			case 'GET':
 				$response = array(
 					"name" => $this->record->Name,
@@ -29,7 +29,7 @@ 
 					"disk-quota-mb" => $this->record->DiskQuotaMB,
 					"environments" => array(),
 				);
-				foreach($this->record->DNEnvironmentList() as $environment) {
+				foreach ($this->record->DNEnvironmentList() as $environment) {
 					$response['environments'][] = array(
 						'name' => $environment->Name,
 						'href' => Director::absoluteURL($this->record->APILink($environment->Name)),
@@ -47,10 +47,10 @@ 
 	 * @return SS_HTTPResponse
 	 */
 	public function fetch(SS_HTTPRequest $request) {
-		if(!$this->record->canView($this->getMember())) {
+		if (!$this->record->canView($this->getMember())) {
 			return $this->message('You are not authorized to do that on this environment', 403);
 		}
-		switch($request->httpMethod()) {
+		switch ($request->httpMethod()) {
 			case 'GET':
 				return $this->getFetch($this->getRequest()->param('ID'));
 			case 'POST':
@@ -66,7 +66,7 @@ 
 	 */
 	protected function getFetch($ID) {
 		$ping = DNGitFetch::get()->byID($ID);
-		if(!$ping) {
+		if (!$ping) {
 			return $this->message('Fetch not found', 404);
 		}
 		$output = array(
@@ -87,9 +87,9 @@ 
 		$fetch->write();
 		$fetch->start();
 
-		$location = Director::absoluteBaseURL() . $this->Link() . '/fetch/' . $fetch->ID;
+		$location = Director::absoluteBaseURL().$this->Link().'/fetch/'.$fetch->ID;
 		$output = array(
-			'message' => 'Fetch queued as job ' . $fetch->ResqueToken,
+			'message' => 'Fetch queued as job '.$fetch->ResqueToken,
 			'href' => $location,
 		);
 

code/api/nouns/APIEnvironment.php

Spacing +16 added lines, -16 removed lines

@@ -15,10 +15,10 @@ 
 	 * @return SS_HTTPResponse
 	 */
 	public function index(SS_HTTPRequest $request) {
-		if(!$this->record->canView($this->getMember())) {
+		if (!$this->record->canView($this->getMember())) {
 			return $this->message('You are not authorized to view this environment', 403);
 		}
-		switch($request->httpMethod()) {
+		switch ($request->httpMethod()) {
 			case 'GET':
 				$href = Director::absoluteURL($this->record->Project()->APILink($this->record->Name));
 				return $this->getAPIResponse(array(
@@ -51,10 +51,10 @@ 
 	 * @return SS_HTTPResponse
 	 */
 	public function ping(SS_HTTPRequest $request) {
-		if(!$this->record->canView($this->getMember())) {
+		if (!$this->record->canView($this->getMember())) {
 			return $this->message('You are not authorized to do that on this environment', 403);
 		}
-		switch($request->httpMethod()) {
+		switch ($request->httpMethod()) {
 			case 'GET':
 				return $this->getPing($this->getRequest()->param('ID'));
 			case 'POST':
@@ -71,10 +71,10 @@ 
 	 * @return SS_HTTPResponse
 	 */
 	public function deploy(SS_HTTPRequest $request) {
-		if(!$this->record->canView($this->getMember())) {
+		if (!$this->record->canView($this->getMember())) {
 			return $this->message('You are not authorized to do that on this environment', 403);
 		}
-		switch($request->httpMethod()) {
+		switch ($request->httpMethod()) {
 			case 'GET':
 				return $this->getDeploy($this->getRequest()->param('ID'));
 			case 'POST':
@@ -106,7 +106,7 @@ 
 	 * @return SS_HTTPResponse
 	 */
 	protected function createPing() {
-		if(!$this->record->canDeploy($this->getMember())) {
+		if (!$this->record->canDeploy($this->getMember())) {
 			return $this->message('You are not authorized to do that on this environment', 403);
 		}
 		$ping = DNPing::create();
@@ -114,9 +114,9 @@ 
 		$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,
+			'message' => 'Ping queued as job '.$ping->ResqueToken,
 			'href' => $location,
 		);
 
@@ -132,7 +132,7 @@ 
 	 */
 	protected function getPing($ID) {
 		$ping = DNPing::get()->byID($ID);
-		if(!$ping) {
+		if (!$ping) {
 			return $this->message('Ping not found', 404);
 		}
 		$output = array(
@@ -149,17 +149,17 @@ 
 	 * @return SS_HTTPResponse
 	 */
 	protected function createDeploy() {
-		if(!$this->record->canDeploy($this->getMember())) {
+		if (!$this->record->canDeploy($this->getMember())) {
 			return $this->message('You are not authorized to do that on this environment', 403);
 		}
 
 		$reqBody = $this->getRequestBody();
 
-		if($reqBody === null) {
+		if ($reqBody === null) {
 			return $this->message('the request body did not contain a valid JSON object.', 400);
 		}
 
-		if(empty($reqBody['release'])) {
+		if (empty($reqBody['release'])) {
 			return $this->message('deploy requires a {"release": "sha1"} in the body of the request.', 400);
 		}
 
@@ -168,9 +168,9 @@ 
 		));
 		$deploy = $strategy->createDeployment();
 		$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,
+			'message' => 'Deploy queued as job '.$deploy->ResqueToken,
 			'href' => $location,
 		);
 		$response = $this->getAPIResponse($output);
@@ -187,7 +187,7 @@ 
 	 */
 	protected function getDeploy($id) {
 		$deploy = DNDeployment::get()->byID($id);
-		if(!$deploy) {
+		if (!$deploy) {
 			return $this->message('Deploy not found', 404);
 		}
 		$output = array(

code/api/DeploynautAPI.php

Spacing +8 added lines, -8 removed lines

@@ -51,12 +51,12 @@ 
 			'projects' => array(),
 		);
 
-		if($request->httpMethod() != 'GET') {
+		if ($request->httpMethod() != 'GET') {
 			return $this->message('API not found', 404);
 		}
 
-		foreach(DNProject::get() as $item) {
-			if($item->canView($this->getMember())) {
+		foreach (DNProject::get() as $item) {
+			if ($item->canView($this->getMember())) {
 				$response['projects'][] = array(
 					"name" => $item->Name,
 					"href" => Director::absoluteURL($item->APILink("")),
@@ -75,7 +75,7 @@ 
 	 */
 	public function project(SS_HTTPRequest $request) {
 		$project = $this->getProject();
-		if(!$project) {
+		if (!$project) {
 			return $this->project404Response();
 		}
 		return new APIProject($this, $project);
@@ -89,12 +89,12 @@ 
 	 */
 	public function environment(SS_HTTPRequest $request) {
 		$project = $this->getProject();
-		if(!$project) {
+		if (!$project) {
 			return $this->project404Response();
 		}
 
 		$environment = $this->getEnvironment();
-		if(!$environment) {
+		if (!$environment) {
 			return $this->environment404Response();
 		}
 		return new APIEnvironment($this, $environment);
@@ -105,7 +105,7 @@ 
 	 */
 	protected function project404Response() {
 		$projectName = Convert::raw2xml($this->getRequest()->latestParam('Project'));
-		return new SS_HTTPResponse('Project "' . $projectName . '" not found.', 404);
+		return new SS_HTTPResponse('Project "'.$projectName.'" not found.', 404);
 	}
 
 	/**
@@ -113,7 +113,7 @@ 
 	 */
 	protected function environment404Response() {
 		$envName = Convert::raw2xml($this->getRequest()->latestParam('Environment'));
-		return new SS_HTTPResponse('Environment "' . $envName . '" not found.', 404);
+		return new SS_HTTPResponse('Environment "'.$envName.'" not found.', 404);
 	}
 
 	/**

code/tasks/MigrateDeploymentStatusTask.php

Spacing +2 added lines, -2 removed lines

@@ -4,8 +4,8 @@
 
 	public function run($request) {
 		$log = function($message) {
-			$message = sprintf('[%s] ', date('Y-m-d H:i:s')) . $message;
-			echo $message . PHP_EOL;
+			$message = sprintf('[%s] ', date('Y-m-d H:i:s')).$message;
+			echo $message.PHP_EOL;
 		};
 
 		if (!Director::is_cli()) {

code/jobs/DataTransferJob.php

Spacing +7 added lines, -7 removed lines

@@ -20,13 +20,13 @@ 
 	}
 
 	public function perform() {
-		echo "[-] DataTransferJob starting" . PHP_EOL;
+		echo "[-] DataTransferJob starting".PHP_EOL;
 		$log = new DeploynautLogFile($this->args['logfile']);
 		$dataTransfer = DNDataTransfer::get()->byID($this->args['dataTransferID']);
 		$environment = $dataTransfer->Environment();
 		$backupDataTransfer = null;
 
-		if(
+		if (
 			!empty($this->args['backupBeforePush'])
 			&& $this->args['backupBeforePush'] !== 'false'
 			&& $dataTransfer->Direction == 'push'
@@ -54,7 +54,7 @@ 
 					'Created:GreaterThan' => strtotime('-30 minutes')
 				))
 				->exclude('ID', $dataTransfer->ID);
-			if($runningTransfers->count()) {
+			if ($runningTransfers->count()) {
 				$runningTransfer = $runningTransfers->first();
 				$message = sprintf(
 					'Error: another transfer is in progress (started at %s by %s)',
@@ -67,13 +67,13 @@ 
 
 			$this->performBackup($backupDataTransfer, $log);
 			$environment->Backend()->dataTransfer($dataTransfer, $log);
-		} catch(Exception $e) {
-			echo "[-] DataTransferJob failed" . PHP_EOL;
+		} catch (Exception $e) {
+			echo "[-] DataTransferJob failed".PHP_EOL;
 			throw $e;
 		}
 
 		$this->updateStatus('Finished');
-		echo "[-] DataTransferJob finished" . PHP_EOL;
+		echo "[-] DataTransferJob finished".PHP_EOL;
 	}
 
 	protected function performBackup($backupDataTransfer, DeploynautLogFile $log) {
@@ -88,7 +88,7 @@ 
 			DB::connect($databaseConfig);
 			$backupDataTransfer->Status = 'Finished';
 			$backupDataTransfer->write();
-		} catch(Exception $e) {
+		} catch (Exception $e) {
 			global $databaseConfig;
 			DB::connect($databaseConfig);
 			$backupDataTransfer->Status = 'Failed';

code/jobs/CreateEnvJob.php

Spacing +5 added lines, -5 removed lines

@@ -19,23 +19,23 @@
 	 *
 	 */
 	public function perform() {
-		echo "[-] CreateEnvJob starting" . PHP_EOL;
+		echo "[-] CreateEnvJob starting".PHP_EOL;
 		// This is a bit icky, but there is no easy way of capturing a failed deploy by using the PHP Resque
 		try {
 			$envCreate = DNCreateEnvironment::get()->byId($this->args['createID']);
-			if(!($envCreate && $envCreate->exists())) {
+			if (!($envCreate && $envCreate->exists())) {
 				throw new RuntimeException(sprintf('Could not find create environment record %s', $args['createID']));
 			}
 
 			// This will throw and exception if it fails.
 			$envCreate->createEnvironment();
 
-		} catch(Exception $e) {
-			echo "[-] CreateEnvJob failed" . PHP_EOL;
+		} catch (Exception $e) {
+			echo "[-] CreateEnvJob failed".PHP_EOL;
 			throw $e;
 		}
 		$this->updateStatus('Finished');
-		echo "[-] CreateEnvJob finished" . PHP_EOL;
+		echo "[-] CreateEnvJob finished".PHP_EOL;
 	}
 
 	/**

code/jobs/FetchJob.php

Spacing +14 added lines, -14 removed lines

@@ -33,12 +33,12 @@ 
 	public function perform() {
 		set_time_limit(0);
 
-		if(!empty($this->args['logfile'])) {
+		if (!empty($this->args['logfile'])) {
 			$this->log = new DeploynautLogFile($this->args['logfile']);
 		}
 
 		$this->project = DNProject::get()->byId($this->args['projectID']);
-		if(!($this->project && $this->project->exists())) {
+		if (!($this->project && $this->project->exists())) {
 			throw new RuntimeException(sprintf('Project ID %s not found', $this->args['projectID']));
 		}
 
@@ -47,7 +47,7 @@ 
 		// Disallow concurrent git fetches on the same project.
 		// Only consider fetches started in the last 30 minutes (older jobs probably got stuck)
 		try {
-			if(!empty($this->args['fetchID'])) {
+			if (!empty($this->args['fetchID'])) {
 				$runningFetches = DNGitFetch::get()
 					->filter(array(
 						'ProjectID' => $this->project->ID,
@@ -56,14 +56,14 @@ 
 					))
 					->exclude('ID', $this->args['fetchID']);
 
-				if($runningFetches->count()) {
+				if ($runningFetches->count()) {
 					$runningFetch = $runningFetches->first();
 					$message = sprintf(
 						'Another fetch is in progress (started at %s by %s)',
 						$runningFetch->dbObject('Created')->Nice(),
 						$runningFetch->Deployer()->Title
 					);
-					if($this->log) {
+					if ($this->log) {
 						$this->log->write($message);
 					}
 					throw new RuntimeException($message);
@@ -72,13 +72,13 @@ 
 
 			// Decide whether we need to just update what we already have
 			// or initiate a clone if no local repo exists.
-			if($this->project->repoExists() && empty($this->args['forceClone'])) {
+			if ($this->project->repoExists() && empty($this->args['forceClone'])) {
 				$this->fetchRepo();
 			} else {
 				$this->cloneRepo();
 			}
-		} catch(Exception $e) {
-			if($this->log) {
+		} catch (Exception $e) {
+			if ($this->log) {
 				$this->log->write($e->getMessage());
 			}
 			throw $e;
@@ -95,7 +95,7 @@ 
 	}
 
 	protected function cloneRepo() {
-		if(file_exists($this->project->getLocalCVSPath())) {
+		if (file_exists($this->project->getLocalCVSPath())) {
 			$this->runCommand(sprintf(
 				'rm -rf %s',
 				escapeshellarg($this->project->getLocalCVSPath())
@@ -117,17 +117,17 @@ 
 	 * @throws RuntimeException
 	 */
 	protected function runCommand($command, $workingDir = null) {
-		if(!empty($this->user)) {
+		if (!empty($this->user)) {
 			$command = sprintf('sudo -u %s %s', $this->user, $command);
 		}
-		if($this->log) {
+		if ($this->log) {
 			$this->log->write(sprintf('Running command: %s', $command));
 		}
 		$process = new AbortableProcess($command, $workingDir);
 		$process->setEnv($this->project->getProcessEnv());
 		$process->setTimeout(1800);
 		$process->run();
-		if(!$process->isSuccessful()) {
+		if (!$process->isSuccessful()) {
 			throw new RuntimeException($process->getErrorOutput());
 		}
 	}
@@ -140,9 +140,9 @@ 
 		global $databaseConfig;
 		DB::connect($databaseConfig);
 
-		if(!empty($this->args['fetchID'])) {
+		if (!empty($this->args['fetchID'])) {
 			$fetch = DNGitFetch::get()->byID($this->args['fetchID']);
-			if($fetch && $fetch->exists()) {
+			if ($fetch && $fetch->exists()) {
 				$fetch->Status = $status;
 				$fetch->write();
 			}

code/form/TabbedSelectionGroup.php

Spacing +1 added lines, -1 removed lines

@@ -9,7 +9,7 @@
 		$items = CompositeField::FieldList()->toArray();
 		$fields = new ArrayList();
 
-		foreach($items as $item) {
+		foreach ($items as $item) {
 			$extra = array(
 				'Selected' => $this->value == $item->getValue(),
 			);

code/form/DataArchiveFileField.php

Spacing +7 added lines, -7 removed lines

@@ -15,11 +15,11 @@ 
 	 * @return bool|DataArchiveFileField
 	 */
 	public function saveInto(DataObjectInterface $record) {
-		if(!isset($_FILES[$this->name])) {
+		if (!isset($_FILES[$this->name])) {
 			return false;
 		}
 
-		if(!($record instanceof DNDataArchive)) {
+		if (!($record instanceof DNDataArchive)) {
 			throw new LogicException('Saving into wrong type, expected DNDataArchive');
 		}
 
@@ -27,7 +27,7 @@ 
 
 		/** @var DNDataTransfer $dataTransfer */
 		$dataTransfer = $dataArchive->DataTransfers()->First();
-		if(!$dataTransfer) {
+		if (!$dataTransfer) {
 			throw new LogicException('No transfer found');
 		}
 
@@ -36,16 +36,16 @@ 
 		// Hack: loadIntoFile assumes paths relative to assets,
 		//  otherwise it creates the whole structure *within* that folder
 		$absolutePath = $dataArchive->generateFilepath($dataTransfer);
-		$relativePath = preg_replace('#^' . preg_quote(ASSETS_PATH) . '/#', '', $absolutePath);
+		$relativePath = preg_replace('#^'.preg_quote(ASSETS_PATH).'/#', '', $absolutePath);
 		$this->upload->loadIntoFile($_FILES[$this->name], $file, $relativePath);
-		if($this->upload->isError()) {
+		if ($this->upload->isError()) {
 			return false;
 		}
 
 		$file = $this->upload->getFile();
-		if($this->relationAutoSetting) {
+		if ($this->relationAutoSetting) {
 			// save to record
-			$record->{$this->name . 'ID'} = $file->ID;
+			$record->{$this->name.'ID'} = $file->ID;
 		}
 
 		return $this;