silverstripe / deploynaut

code/model/DNDataArchive.php

Spacing +31 added lines, -31 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,18 +540,18 @@ 
 	 */
 	public function setArchiveFromFiles($workingDir) {
 		$commands = array();
-		if($this->Mode == 'db') {
-			if (file_exists($workingDir . '/database.sql')) {
+		if ($this->Mode == 'db') {
+			if (file_exists($workingDir.'/database.sql')) {
 				$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';
 		} else {
-			if (file_exists($workingDir . '/database.sql')) {
+			if (file_exists($workingDir.'/database.sql')) {
 				$commands[] = 'gzip database.sql';
 			}
 			$commands[] = 'GZIP=-1 tar --dereference -czf assets.tar.gz assets';
@@ -562,7 +562,7 @@ 
 		$process = new AbortableProcess(implode(' && ', $commands), $workingDir);
 		$process->setTimeout(3600);
 		$process->run();
-		if(!$process->isSuccessful()) {
+		if (!$process->isSuccessful()) {
 			throw new RuntimeException($process->getErrorOutput());
 		}
 

code/tasks/CleanupOrphanedRecordsTask.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/options/NoRollbackDeployOption.php

Spacing +2 added lines, -2 removed lines

@@ -12,8 +12,8 @@
 	}
 
 	public function __get($name) {
-		if (method_exists($this, 'get' . $name)) {
-			return $this->{'get' . $name}();
+		if (method_exists($this, 'get'.$name)) {
+			return $this->{'get'.$name}();
 		}
 		return $this->$name;
 	}

code/model/options/PredeployBackupOption.php

Spacing +2 added lines, -2 removed lines

@@ -12,8 +12,8 @@
 	}
 
 	public function __get($name) {
-		if (method_exists($this, 'get' . $name)) {
-			return $this->{'get' . $name}();
+		if (method_exists($this, 'get'.$name)) {
+			return $this->{'get'.$name}();
 		}
 		return $this->$name;
 	}

code/control/DeployForm.php

Spacing +2 added lines, -2 removed lines

@@ -94,7 +94,7 @@ 
 				substr($sha, 0, 8),
 				$branch->LastUpdated()->TimeDiff()
 			);
-			$branches[$sha . '-' . $name] = $branchValue;
+			$branches[$sha.'-'.$name] = $branchValue;
 		}
 
 		// Tags
@@ -107,7 +107,7 @@ 
 				substr($sha, 0, 8),
 				$branch->LastUpdated()->TimeDiff()
 			);
-			$tags[$sha . '-' . $name] = $tagValue;
+			$tags[$sha.'-'.$name] = $tagValue;
 		}
 		$tags = array_reverse($tags);