silverstripe / sspak

src/SSPak.php

Braces +32 added lines, -11 removed lines

@@ -91,13 +91,19 @@ 
 		foreach($this->getActions() as $action => $info) {
 			echo "sspak $action";
 			if(!empty($info['unnamedArgs'])) {
-				foreach($info['unnamedArgs'] as $arg) echo " ($arg)";
+				foreach($info['unnamedArgs'] as $arg) {
+					echo " ($arg)";
+				}
 			}
 			if(!empty($info['namedFlags'])) {
-				foreach($info['namedFlags'] as $arg) echo " (--$arg)";
+				foreach($info['namedFlags'] as $arg) {
+					echo " (--$arg)";
+				}
 			}
 			if(!empty($info['namedArgs'])) {
-				foreach($info['namedArgs'] as $arg) echo " --$arg=\"$arg value\"";
+				foreach($info['namedArgs'] as $arg) {
+					echo " --$arg=\"$arg value\"";
+				}
 			}
 			echo "\n  {$info['description']}\n\n";
 		}
@@ -176,7 +182,9 @@ 
 		$sspak = new SSPakFile($file, $executor);
 
 		// Validation
-		if(!$sspak->exists()) throw new Exception("File '$file' doesn't exist.");
+		if(!$sspak->exists()) {
+			throw new Exception("File '$file' doesn't exist.");
+		}
 
 		$phar = $sspak->getPhar();
 		$phar->extractTo($dest);
@@ -255,7 +263,9 @@ 
 
 		$webroot = new Webroot($unnamedArgs[0], $executor);
 		$file = $unnamedArgs[1];
-		if(file_exists($file)) throw new Exception( "File '$file' already exists.");
+		if(file_exists($file)) {
+			throw new Exception( "File '$file' already exists.");
+		}
 
 		$sspak = new SSPakFile($file, $executor);
 
@@ -263,8 +273,11 @@ 
 			// SSH private key
 			$webroot->setSSHItentityFile($namedArgs['identity']);
 		}
-		if(!empty($namedArgs['from-sudo'])) $webroot->setSudo($namedArgs['from-sudo']);
-		else if(!empty($namedArgs['sudo'])) $webroot->setSudo($namedArgs['sudo']);
+		if(!empty($namedArgs['from-sudo'])) {
+			$webroot->setSudo($namedArgs['from-sudo']);
+		} else if(!empty($namedArgs['sudo'])) {
+			$webroot->setSudo($namedArgs['sudo']);
+		}
 
 		// Look up which parts of the sspak are going to be saved
 		$pakParts = $args->pakParts();
@@ -367,7 +380,9 @@ 
 				$currentBranch = trim($matches[1]);
 				$output = $webroot->exec(array('git', '--git-dir='.$gitRepo, 'config','--get',"branch.$currentBranch.remote"));
 				$remoteName = trim($output['output']);
-				if(!$remoteName) $remoteName = 'origin';
+				if(!$remoteName) {
+					$remoteName = 'origin';
+				}
 
 			// Default to origin
 			} else {
@@ -414,7 +429,9 @@ 
 		}
 
 		// Validation
-		if(!$sspak->exists()) throw new Exception( "File '$file' doesn't exist.");
+		if(!$sspak->exists()) {
+			throw new Exception( "File '$file' doesn't exist.");
+		}
 
 		// Push database, if necessary
 		$namedArgs = $args->getNamedArgs();
@@ -445,8 +462,12 @@ 
 		$pakParts = $args->pakParts();
 
 		// Validation
-		if($webroot->exists($webroot->getPath())) throw new Exception( "Webroot '$webrootDir' already exists.");
-		if(!$sspak->exists()) throw new Exception( "File '$file' doesn't exist.");
+		if($webroot->exists($webroot->getPath())) {
+			throw new Exception( "Webroot '$webrootDir' already exists.");
+		}
+		if(!$sspak->exists()) {
+			throw new Exception( "File '$file' doesn't exist.");
+		}
 
 		// Create new dir
 		$webroot->exec(array('mkdir', $webroot->getPath()));

src/FilesystemEntity.php

Braces +9 added lines, -3 removed lines

@@ -98,8 +98,12 @@ 
 	 * @return boolean
 	 */
 	public function exists($file = null) {
-		if(!$file) $file = $this->path;
-		if($file == '@self') return true;
+		if(!$file) {
+			$file = $this->path;
+		}
+		if($file == '@self') {
+			return true;
+		}
 
 		if($this->server) {
 			$result = $this->exec("if [ -e " . escapeshellarg($file) . " ]; then echo yes; fi");
@@ -128,7 +132,9 @@ 
 	 * @param string $file The file to remove
 	 */
 	public function unlink($file) {
-		if(!$file || $file == '/' || $file == '.') throw new Exception("Can't unlink file '$file'");
+		if(!$file || $file == '/' || $file == '.') {
+			throw new Exception("Can't unlink file '$file'");
+		}
 		$this->exec(array('rm', '-rf', $file));
 		return true;
 	}

src/SSPakFile.php

Braces +9 added lines, -3 removed lines

@@ -8,7 +8,9 @@ 
 
 	public function __construct($path, $executor, $pharAlias = 'sspak.phar') {
 		parent::__construct($path, $executor);
-		if(!$this->isLocal()) throw new LogicException("Can't manipulate remote .sspak.phar files, only remote webroots.");
+		if(!$this->isLocal()) {
+			throw new LogicException("Can't manipulate remote .sspak.phar files, only remote webroots.");
+		}
 
 		$this->pharAlias = $pharAlias;
 		$this->pharPath = $path;
@@ -17,7 +19,9 @@ 
 		if(substr($path,-5) === '.phar') {
 			$this->phar = new Phar($path, FilesystemIterator::CURRENT_AS_FILEINFO | FilesystemIterator::KEY_AS_FILENAME,
 				$this->pharAlias);
-			if(!file_exists($this->path)) $this->makeExecutable();
+			if(!file_exists($this->path)) {
+				$this->makeExecutable();
+			}
 
 		// Non-executable Tar version
 		} else {
@@ -154,7 +158,9 @@ 
 		$content = $this->content('git-remote');
 		$details = array();
 		foreach(explode("\n", trim($content)) as $line) {
-			if(!$line) continue;
+			if(!$line) {
+				continue;
+			}
 
 			if(preg_match('/^([^ ]+) *= *(.*)$/', $line, $matches)) {
 				$details[$matches[1]] = $matches[2];

src/Executor.php

Braces +14 added lines, -5 removed lines

@@ -35,7 +35,9 @@ 
 
 	public function createLocal($command, $options) {
 		$options = array_merge($this->defaultOptions, $options);
-		if(is_array($command)) $command = $this->commandArrayToString($command);
+		if(is_array($command)) {
+			$command = $this->commandArrayToString($command);
+		}
 
 		return new Process($command, $options);
 	}
@@ -81,8 +83,11 @@ 
 
 		// Modify command for remote execution, if necessary.
 		if($this->remoteServer) {
-			if(!empty($options['outputFile']) || !empty($options['outputStream'])) $ssh = "ssh -T ";
-			else $ssh = "ssh -t ";
+			if(!empty($options['outputFile']) || !empty($options['outputStream'])) {
+				$ssh = "ssh -T ";
+			} else {
+				$ssh = "ssh -t ";
+			}
 			if (!empty($options['identity'])) {
 				$ssh .= '-i ' . escapeshellarg($options['identity']) . ' ';
 			}
@@ -99,7 +104,9 @@ 
 		);
 
 		// Alternatives
-		if($options['inputContent'] || $options['inputStream']) $pipeSpec[0] = array('pipe', 'r');
+		if($options['inputContent'] || $options['inputStream']) {
+			$pipeSpec[0] = array('pipe', 'r');
+		}
 
 		if($options['outputFile']) {
 			$pipeSpec[1] = array('file',
@@ -117,7 +124,9 @@ 
 				fwrite($pipes[0], $content);
 			}
 		}
-		if(isset($pipes[0])) fclose($pipes[0]);
+		if(isset($pipes[0])) {
+			fclose($pipes[0]);
+		}
 
 		$result = array();
 

src/Args.php

Braces +10 added lines, -4 removed lines

@@ -51,9 +51,13 @@ 
 	 * Return the sudo argument, preferring a more specific one with the given optional prefix
 	 */
 	public function sudo($optionalPrefix) {
-		if(!empty($this->namedArgs[$optionalPrefix . '-sudo'])) return $this->namedArgs[$optionalPrefix . '-sudo'];
-		else if(!empty($this->namedArgs['sudo'])) return $this->namedArgs['sudo'];
-		else return null;
+		if(!empty($this->namedArgs[$optionalPrefix . '-sudo'])) {
+			return $this->namedArgs[$optionalPrefix . '-sudo'];
+		} else if(!empty($this->namedArgs['sudo'])) {
+			return $this->namedArgs['sudo'];
+		} else {
+			return null;
+		}
 	}
 
 	/**
@@ -67,7 +71,9 @@ 
 		}
 
 		// Default to db and assets
-		if(!array_filter($pakParts)) $pakParts = array('db' => true, 'assets' => true, 'git-remote' => true);
+		if(!array_filter($pakParts)) {
+			$pakParts = array('db' => true, 'assets' => true, 'git-remote' => true);
+		}
 		return $pakParts;
 	}
 

src/sspak-sniffer.php

Braces +3 added lines, -1 removed lines

@@ -13,7 +13,9 @@
 }
 
 $basePath = $_SERVER['argv'][1];
-if($basePath[0] != '/') $basePath = getcwd() . '/' . $basePath;
+if($basePath[0] != '/') {
+	$basePath = getcwd() . '/' . $basePath;
+}
 
 // SilverStripe bootstrap
 define('BASE_PATH', realpath($basePath));

src/Webroot.php

Braces +12 added lines, -4 removed lines

@@ -16,7 +16,9 @@ 
 	 * Calls sniff once and then caches
 	 */
 	public function details() {
-		if(!$this->details) $this->details = $this->sniff();
+		if(!$this->details) {
+			$this->details = $this->sniff();
+		}
 		return $this->details;
 	}
 
@@ -26,7 +28,9 @@ 
 	public function sniff() {
 		global $snifferFileContent;
 
-		if(!$snifferFileContent) $snifferFileContent = file_get_contents(PACKAGE_ROOT . 'src/sspak-sniffer.php');
+		if(!$snifferFileContent) {
+			$snifferFileContent = file_get_contents(PACKAGE_ROOT . 'src/sspak-sniffer.php');
+		}
 
 		$remoteSniffer = '/tmp/sspak-sniffer-' . rand(100000,999999) . '.php';
 		$this->uploadContent($snifferFileContent, $remoteSniffer);
@@ -35,7 +39,9 @@ 
 		$this->unlink($remoteSniffer);
 
 		$parsed = @unserialize($result['output']);
-		if(!$parsed) throw new Exception("Could not parse sspak-sniffer content:\n{$result['output']}\n");
+		if(!$parsed) {
+			throw new Exception("Could not parse sspak-sniffer content:\n{$result['output']}\n");
+		}
 		return $parsed;
 	}
 
@@ -45,7 +51,9 @@ 
 	 */
 	public function execSudo($command, $options = array()) {
 		if($this->sudo) {
-			if(is_array($command)) $command = $this->executor->commandArrayToString($command);
+			if(is_array($command)) {
+				$command = $this->executor->commandArrayToString($command);
+			}
 			// Try running sudo without asking for a password
 			try {
 				return $this->exec("sudo -n -u " . escapeshellarg($this->sudo) . " " . $command, $options);