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/model/GitonomyCache.php

Spacing +2 added lines, -2 removed lines

@@ -7,8 +7,8 @@
 	public static $cache = array();
 
 	public static function getIncludingBranches($commit) {
-		$cacheKey = 'getIncludingBranches-' . $commit->getRepository()->getPath() . '-' . $commit->gethash();
-		if(!isset(self::$cache[$cacheKey])) {
+		$cacheKey = 'getIncludingBranches-'.$commit->getRepository()->getPath().'-'.$commit->gethash();
+		if (!isset(self::$cache[$cacheKey])) {
 			self::$cache[$cacheKey] = $commit->getIncludingBranches();
 		}
 		return self::$cache[$cacheKey];

code/model/DNBranchList.php

Spacing +9 added lines, -9 removed lines

@@ -58,20 +58,20 @@ 
 
 		try {
 			$repository = new Gitonomy\Git\Repository($this->project->getLocalCVSPath());
-		} catch(Exception $e) {
+		} catch (Exception $e) {
 			return $branches;
 		}
 
-		foreach($repository->getReferences()->getBranches() as $branch) {
+		foreach ($repository->getReferences()->getBranches() as $branch) {
 			/** @var DNBranch $obj */
 			$obj = DNBranch::create($branch, $this->project, $this->data);
-			if($branch->getName() == 'master') {
+			if ($branch->getName() == 'master') {
 				$firstBranch = array($branch->getName() => $obj);
 			} else {
 				$branches[$branch->getName()] = $obj;
 			}
 		}
-		if($firstBranch) {
+		if ($firstBranch) {
 			$branches = $firstBranch + $branches;
 		}
 
@@ -86,11 +86,11 @@ 
 	 * @return string
 	 */
 	public function byName($name) {
-		if($this->loaded === false) {
+		if ($this->loaded === false) {
 			$this->getIterator();
 		}
 
-		if(isset($this->items[$name])) {
+		if (isset($this->items[$name])) {
 			return $this->items[$name];
 		}
 
@@ -104,12 +104,12 @@ 
 	 * @return ArrayIterator
 	 */
 	public function getIterator() {
-		if($this->loaded === false) {
+		if ($this->loaded === false) {
 			$this->items = $this->getReferences();
 			$this->loaded = true;
 		}
-		foreach($this->items as $i => $item) {
-			if(is_array($item)) {
+		foreach ($this->items as $i => $item) {
+			if (is_array($item)) {
 				$this->items[$i] = new ArrayData($item);
 			}
 		}

code/model/DNDataArchive.php

Spacing +29 added lines, -29 removed lines

@@ -121,7 +121,7 @@ 
 	}
 
 	public function onBeforeWrite() {
-		if(!$this->AuthorID) {
+		if (!$this->AuthorID) {
 			$this->AuthorID = Member::currentUserID();
 		}
 
@@ -179,7 +179,7 @@ 
 	 * @return string The human-readable size of this archive file
 	 */
 	public function FileSize() {
-		if($this->ArchiveFile()->exists()) {
+		if ($this->ArchiveFile()->exists()) {
 			return $this->ArchiveFile()->getSize();
 		} else {
 			return "N/A";
@@ -187,7 +187,7 @@ 
 	}
 
 	public function getModeNice() {
-		if($this->Mode == 'all') {
+		if ($this->Mode == 'all') {
 			return 'database and assets';
 		} else {
 			return $this->Mode;
@@ -223,12 +223,12 @@ 
 	 */
 	public function canRestore($member = null) {
 		$memberID = $member ? $member->ID : Member::currentUserID();
-		if(!$memberID) {
+		if (!$memberID) {
 			return false;
 		}
 
-		$key = $memberID . '-' . $this->EnvironmentID;
-		if(!isset(self::$_cache_can_restore[$key])) {
+		$key = $memberID.'-'.$this->EnvironmentID;
+		if (!isset(self::$_cache_can_restore[$key])) {
 			self::$_cache_can_restore[$key] = $this->Environment()->canUploadArchive($member);
 		}
 
@@ -244,12 +244,12 @@ 
 	 */
 	public function canDownload($member = null) {
 		$memberID = $member ? $member->ID : Member::currentUserID();
-		if(!$memberID) {
+		if (!$memberID) {
 			return false;
 		}
 
-		$key = $memberID . '-' . $this->EnvironmentID;
-		if(!isset(self::$_cache_can_download[$key])) {
+		$key = $memberID.'-'.$this->EnvironmentID;
+		if (!isset(self::$_cache_can_download[$key])) {
 			self::$_cache_can_download[$key] = $this->Environment()->canDownloadArchive($member);
 		}
 		return self::$_cache_can_download[$key];
@@ -274,27 +274,27 @@ 
 	 * @return boolean true if $member can upload archives linked to this environment, false if they can't.
 	 */
 	public function canMoveTo($targetEnv, $member = null) {
-		if($this->Environment()->Project()->ID != $targetEnv->Project()->ID) {
+		if ($this->Environment()->Project()->ID != $targetEnv->Project()->ID) {
 			// We don't permit moving snapshots between projects at this stage.
 			return false;
 		}
 
-		if(!$member) {
+		if (!$member) {
 			$member = Member::currentUser();
 		}
 
 		// Must be logged in to check permissions
-		if(!$member) {
+		if (!$member) {
 			return false;
 		}
 
 		// Admin can always move.
-		if(Permission::checkMember($member, 'ADMIN')) {
+		if (Permission::checkMember($member, 'ADMIN')) {
 			return true;
 		}
 
 		// Checks if the user can actually access the archive.
-		if(!$this->canDownload($member)) {
+		if (!$this->canDownload($member)) {
 			return false;
 		}
 
@@ -403,7 +403,7 @@ 
 	 * @return bool
 	 */
 	public function extractArchive($workingDir = null) {
-		if(!is_dir($workingDir)) {
+		if (!is_dir($workingDir)) {
 			mkdir($workingDir, 0700, true);
 		}
 
@@ -422,28 +422,28 @@ 
 		));
 		$process->setTimeout(3600);
 		$process->run();
-		if(!$process->isSuccessful()) {
+		if (!$process->isSuccessful()) {
 			$cleanupFn();
 			throw new RuntimeException(sprintf('Could not extract the sspak file: %s', $process->getErrorOutput()));
 		}
 
 		// Extract database.sql.gz to <workingdir>/database.sql
-		if(file_exists($workingDir . DIRECTORY_SEPARATOR . 'database.sql.gz')) {
+		if (file_exists($workingDir.DIRECTORY_SEPARATOR.'database.sql.gz')) {
 			$process = new AbortableProcess('gunzip database.sql.gz', $workingDir);
 			$process->setTimeout(3600);
 			$process->run();
-			if(!$process->isSuccessful()) {
+			if (!$process->isSuccessful()) {
 				$cleanupFn();
 				throw new RuntimeException(sprintf('Could not extract the db archive: %s', $process->getErrorOutput()));
 			}
 		}
 
 		// Extract assets.tar.gz to <workingdir>/assets/
-		if(file_exists($workingDir . DIRECTORY_SEPARATOR . 'assets.tar.gz')) {
+		if (file_exists($workingDir.DIRECTORY_SEPARATOR.'assets.tar.gz')) {
 			$process = new AbortableProcess('tar xzf assets.tar.gz', $workingDir);
 			$process->setTimeout(3600);
 			$process->run();
-			if(!$process->isSuccessful()) {
+			if (!$process->isSuccessful()) {
 				$cleanupFn();
 				throw new RuntimeException(sprintf('Could not extract the assets archive: %s', $process->getErrorOutput()));
 			}
@@ -467,7 +467,7 @@ 
 
 		$file = $this->ArchiveFile()->FullPath;
 
-		if(!is_readable($file)) {
+		if (!is_readable($file)) {
 			$result->error(sprintf('SSPak file "%s" cannot be read.', $file));
 			return $result;
 		}
@@ -475,19 +475,19 @@ 
 		$process = new AbortableProcess(sprintf('tar -tf %s', escapeshellarg($file)));
 		$process->setTimeout(120);
 		$process->run();
-		if(!$process->isSuccessful()) {
+		if (!$process->isSuccessful()) {
 			throw new RuntimeException(sprintf('Could not list files in archive: %s', $process->getErrorOutput()));
 		}
 
 		$output = explode(PHP_EOL, $process->getOutput());
 		$files = array_filter($output);
 
-		if(in_array($mode, array('all', 'db')) && !in_array('database.sql.gz', $files)) {
+		if (in_array($mode, array('all', 'db')) && !in_array('database.sql.gz', $files)) {
 			$result->error('The snapshot is missing the database.');
 			return $result;
 		}
 
-		if(in_array($mode, array('all', 'assets')) && !in_array('assets.tar.gz', $files)) {
+		if (in_array($mode, array('all', 'assets')) && !in_array('assets.tar.gz', $files)) {
 			$result->error('The snapshot is missing assets.');
 			return $result;
 		}
@@ -517,11 +517,11 @@ 
 			sprintf('find %s -type f -exec chmod 644 {} +', escapeshellarg($workingDir))
 		);
 
-		foreach($fixCmds as $cmd) {
+		foreach ($fixCmds as $cmd) {
 			$process = new AbortableProcess($cmd);
 			$process->setTimeout(3600);
 			$process->run();
-			if(!$process->isSuccessful()) {
+			if (!$process->isSuccessful()) {
 				throw new RuntimeException($process->getErrorOutput());
 			}
 		}
@@ -540,11 +540,11 @@ 
 	 */
 	public function setArchiveFromFiles($workingDir) {
 		$commands = array();
-		if($this->Mode == 'db') {
+		if ($this->Mode == 'db') {
 			$commands[] = 'gzip database.sql';
 			$commands[] = sprintf('tar -cf %s database.sql.gz', $this->ArchiveFile()->FullPath);
 			$commands[] = 'rm -f database.sql.gz';
-		} elseif($this->Mode == 'assets') {
+		} elseif ($this->Mode == 'assets') {
 			$commands[] = 'GZIP=-1 tar --dereference -czf assets.tar.gz assets';
 			$commands[] = sprintf('tar -cf %s assets.tar.gz', $this->ArchiveFile()->FullPath);
 			$commands[] = 'rm -f assets.tar.gz';
@@ -558,7 +558,7 @@ 
 		$process = new AbortableProcess(implode(' && ', $commands), $workingDir);
 		$process->setTimeout(3600);
 		$process->run();
-		if(!$process->isSuccessful()) {
+		if (!$process->isSuccessful()) {
 			throw new RuntimeException($process->getErrorOutput());
 		}
 

code/model/jobs/DNCreateEnvironment.php

Spacing +9 added lines, -9 removed lines

@@ -68,7 +68,7 @@ 
 	 * @return string
 	 */
 	public function LogLink() {
-		return $this->Link() . '/log';
+		return $this->Link().'/log';
 	}
 
 	/**
@@ -110,9 +110,9 @@ 
 		$status = new Resque_Job_Status($this->ResqueToken);
 		$statusCode = $status->get();
 		// The Resque job can no longer be found, fallback to the DNDeployment.Status
-		if($statusCode === false) {
+		if ($statusCode === false) {
 			// Translate from the DNDeployment.Status to the Resque job status for UI purposes
-			switch($this->Status) {
+			switch ($this->Status) {
 				case 'Finished':
 					return 'Complete';
 				case 'Started':
@@ -139,11 +139,11 @@ 
 			'projectName' => $project->Name
 		);
 
-		if(!$this->CreatorID) {
+		if (!$this->CreatorID) {
 			$this->CreatorID = Member::currentUserID();
 		}
 
-		if($this->CreatorID) {
+		if ($this->CreatorID) {
 			$creator = $this->Creator();
 			$message = sprintf(
 				'Environment creation for project %s initiated by %s (%s), with IP address %s',
@@ -171,7 +171,7 @@ 
 
 	public function createEnvironment() {
 		$backend = $this->getBackend();
-		if($backend) {
+		if ($backend) {
 			return $backend->createEnvironment($this);
 		}
 		throw new Exception("Unable to find backend.");
@@ -185,12 +185,12 @@ 
 	 */
 	public function getBackend() {
 		$data = unserialize($this->Data);
-		if(isset($data['EnvironmentType']) && class_exists($data['EnvironmentType'])) {
+		if (isset($data['EnvironmentType']) && class_exists($data['EnvironmentType'])) {
 			$env = Injector::inst()->get($data['EnvironmentType']);
-			if($env instanceof EnvironmentCreateBackend) {
+			if ($env instanceof EnvironmentCreateBackend) {
 				return $env;
 			} else {
-				throw new Exception("Invalid backend: " . $data['EnvironmentType']);
+				throw new Exception("Invalid backend: ".$data['EnvironmentType']);
 			}
 		}
 		return null;

code/model/jobs/DNDataTransfer.php

Spacing +13 added lines, -13 removed lines

@@ -112,7 +112,7 @@ 
 	}
 
 	public function getTitle() {
-		return $this->dbObject('Created')->Nice() . " (Status: {$this->Status})";
+		return $this->dbObject('Created')->Nice()." (Status: {$this->Status})";
 	}
 
 	public function Link() {
@@ -169,11 +169,11 @@ 
 			'backupBeforePush' => $this->backupBeforePush
 		);
 
-		if(!$this->AuthorID) {
+		if (!$this->AuthorID) {
 			$this->AuthorID = Member::currentUserID();
 		}
 
-		if($this->AuthorID) {
+		if ($this->AuthorID) {
 			$author = $this->Author();
 			$message = sprintf(
 				'Data transfer on %s (%s, %s) initiated by %s (%s), with IP address %s',
@@ -231,23 +231,23 @@ 
 
 	public function getDescription() {
 		$envName = $this->Environment()->getFullName();
-		if($this->Direction == 'get') {
-			if($this->Origin == 'ManualUpload') {
-				$description = 'Manual upload of ' . $this->getModeNice() . ' to ' . $envName;
-			} elseif($this->IsBackupDataTransfer()) {
-				$description = 'Automated backup of ' . $this->getModeNice() . ' from ' . $envName;
+		if ($this->Direction == 'get') {
+			if ($this->Origin == 'ManualUpload') {
+				$description = 'Manual upload of '.$this->getModeNice().' to '.$envName;
+			} elseif ($this->IsBackupDataTransfer()) {
+				$description = 'Automated backup of '.$this->getModeNice().' from '.$envName;
 			} else {
-				$description = 'Backup of ' . $this->getModeNice() . ' to ' . $envName;
+				$description = 'Backup of '.$this->getModeNice().' to '.$envName;
 			}
 		} else {
-			$description = 'Restore ' . $this->getModeNice() . ' to ' . $envName;
+			$description = 'Restore '.$this->getModeNice().' to '.$envName;
 		}
 
 		return $description;
 	}
 
 	public function getModeNice() {
-		if($this->Mode == 'all') {
+		if ($this->Mode == 'all') {
 			return 'database and assets';
 		} else {
 			return $this->Mode;
@@ -287,9 +287,9 @@ 
 		$status = new Resque_Job_Status($this->ResqueToken);
 		$statusCode = $status->get();
 		// The Resque job can no longer be found, fallback to the DNDataTransfer.Status
-		if($statusCode === false) {
+		if ($statusCode === false) {
 			// Translate from the DNDataTransfer.Status to the Resque job status for UI purposes
-			switch($this->Status) {
+			switch ($this->Status) {
 				case 'Finished':
 					return 'Complete';
 				case 'Started':