silverstripe / deploynaut

code/events/GenericEvent.php

Spacing +1 added lines, -1 removed lines

@@ -70,7 +70,7 @@
 	 * @return string
 	 */
 	public function get($keyname) {
-		if(array_key_exists($keyname, $this->data)) {
+		if (array_key_exists($keyname, $this->data)) {
 			return $this->data[$keyname];
 		}
 		return '';

code/api/nouns/APINoun.php

Spacing +5 added lines, -5 removed lines

@@ -59,7 +59,7 @@ 
 	 */
 	protected function getAPIResponse($output) {
 		$response = $this->getResponse();
-		if($this->respondWithText()) {
+		if ($this->respondWithText()) {
 			$body = print_r($output, true);
 			$response->addHeader('Content-Type', 'text/plain');
 		} else {
@@ -74,10 +74,10 @@ 
 	 * @return boolean
 	 */
 	protected function respondWithJSON() {
-		if($this->getRequest()->getExtension() == 'json') {
+		if ($this->getRequest()->getExtension() == 'json') {
 			return true;
 		}
-		if(strpos($this->getRequest()->getHeader('Accept'), 'application/json') !== false) {
+		if (strpos($this->getRequest()->getHeader('Accept'), 'application/json') !== false) {
 			return true;
 		}
 		return false;
@@ -87,10 +87,10 @@ 
 	 * @return boolean
 	 */
 	protected function respondWithText() {
-		if($this->getRequest()->getExtension() == 'txt') {
+		if ($this->getRequest()->getExtension() == 'txt') {
 			return true;
 		}
-		if(strpos($this->getRequest()->getHeader('Accept'), 'text/plain') !== false) {
+		if (strpos($this->getRequest()->getHeader('Accept'), 'text/plain') !== false) {
 			return true;
 		}
 		return false;

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/tasks/SyncProjectsAndEnvironments.php

Spacing +31 added lines, -31 removed lines

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

code/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/DeployJob.php

Spacing +12 added lines, -12 removed lines

@@ -30,7 +30,7 @@ 
 				SIGCONT
 			])) {
 				echo sprintf(
-					'[-] Signal "%s" received, delivering to own process group, PID "%s".' . PHP_EOL,
+					'[-] Signal "%s" received, delivering to own process group, PID "%s".'.PHP_EOL,
 					$signal,
 					getmypid()
 				);
@@ -40,9 +40,9 @@ 
 
 				// Dispatch to own process group.
 				$pgid = posix_getpgid(getmypid());
-				if ($pgid<=0) {
+				if ($pgid <= 0) {
 					echo sprintf(
-						'[-] Unable to send signal to invalid PGID "%s".' . PHP_EOL,
+						'[-] Unable to send signal to invalid PGID "%s".'.PHP_EOL,
 						$pgid
 					);
 				} else {
@@ -60,9 +60,9 @@ 
 		// to this job as a whole (including any subprocesses such as spawned by Symfony).
 		posix_setsid();
 
-		if(function_exists('pcntl_alarm') && function_exists('pcntl_signal')) {
+		if (function_exists('pcntl_alarm') && function_exists('pcntl_signal')) {
 			if (!empty($this->args['sigFile'])) {
-				echo sprintf('[-] Signal file requested, polling "%s".' . PHP_EOL, $this->args['sigFile']);
+				echo sprintf('[-] Signal file requested, polling "%s".'.PHP_EOL, $this->args['sigFile']);
 				declare(ticks = 1);
 				pcntl_signal(SIGALRM, [$this, 'alarmHandler']);
 				pcntl_alarm(1);
@@ -74,7 +74,7 @@ 
 	}
 
 	public function perform() {
-		echo "[-] DeployJob starting" . PHP_EOL;
+		echo "[-] DeployJob starting".PHP_EOL;
 		$log = new DeploynautLogFile($this->args['logfile']);
 
 		$deployment = DNDeployment::get()->byID($this->args['deploymentID']);
@@ -92,7 +92,7 @@ 
 		// deploy onto a clean environment will not be performing any backup regardless of
 		// whether the predeploy_backup option was passed or not.
 		// Sometimes predeploy_backup comes through as string false from the frontend.
-		if(
+		if (
 			!empty($this->args['predeploy_backup'])
 			&& $this->args['predeploy_backup'] !== 'false'
 			&& !empty($currentBuild)
@@ -114,7 +114,7 @@ 
 			// Disallow concurrent deployments (don't rely on queuing implementation to restrict this)
 			// Only consider deployments started in the last 30 minutes (older jobs probably got stuck)
 			$runningDeployments = $environment->runningDeployments()->exclude('ID', $this->args['deploymentID']);
-			if($runningDeployments->count()) {
+			if ($runningDeployments->count()) {
 				$runningDeployment = $runningDeployments->first();
 				$message = sprintf(
 					'Error: another deployment is in progress (started at %s by %s)',
@@ -134,14 +134,14 @@ 
 				// all options from the DeploymentStrategy merged in, including sha.
 				$this->args
 			);
-		} catch(Exception $e) {
+		} catch (Exception $e) {
 			// DeploynautJob will automatically trigger onFailure.
-			echo "[-] DeployJob failed" . PHP_EOL;
+			echo "[-] DeployJob failed".PHP_EOL;
 			throw $e;
 		}
 
 		$this->updateStatus(DNDeployment::TR_COMPLETE);
-		echo "[-] DeployJob finished" . PHP_EOL;
+		echo "[-] DeployJob finished".PHP_EOL;
 	}
 
 	public function onFailure(Exception $exception) {
@@ -160,7 +160,7 @@ 
 			DB::connect($databaseConfig);
 			$backupDataTransfer->Status = 'Finished';
 			$backupDataTransfer->write();
-		} catch(Exception $e) {
+		} catch (Exception $e) {
 			global $databaseConfig;
 			DB::connect($databaseConfig);
 			$backupDataTransfer->Status = 'Failed';