silverstripe / sspak

src/Executor.php

Spacing +18 added lines, -18 removed lines

@@ -35,7 +35,7 @@ 
 
 	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);
 	}
@@ -53,8 +53,8 @@ 
 	 */
 	function commandArrayToString($command) {
 		$string = escapeshellcmd(array_shift($command));
-		foreach($command as $arg) {
-			$string .= ' ' . escapeshellarg($arg);
+		foreach ($command as $arg) {
+			$string .= ' '.escapeshellarg($arg);
 		}
 		return $string;
 	}
@@ -80,13 +80,13 @@ 
 		$options = array_merge($this->options, $options);
 
 		// Modify command for remote execution, if necessary.
-		if($this->remoteServer) {
-			if(!empty($options['outputFile']) || !empty($options['outputStream'])) $ssh = "ssh -T ";
+		if ($this->remoteServer) {
+			if (!empty($options['outputFile']) || !empty($options['outputStream'])) $ssh = "ssh -T ";
 			else $ssh = "ssh -t ";
 			if (!empty($options['identity'])) {
-				$ssh .= '-i ' . escapeshellarg($options['identity']) . ' ';
+				$ssh .= '-i '.escapeshellarg($options['identity']).' ';
 			}
-			$command = $ssh . escapeshellarg($this->remoteServer) . ' ' . escapeshellarg($this->command);
+			$command = $ssh.escapeshellarg($this->remoteServer).' '.escapeshellarg($this->command);
 		} else {
 			$command = $this->command;
 		}
@@ -99,9 +99,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']) {
+		if ($options['outputFile']) {
 			$pipeSpec[1] = array('file',
 				$options['outputFile'],
 				$options['outputFileAppend'] ? 'a' : 'w');
@@ -109,24 +109,24 @@ 
 
 		$process = proc_open($command, $pipeSpec, $pipes);
 
-		if($options['inputContent']) {
+		if ($options['inputContent']) {
 			fwrite($pipes[0], $options['inputContent']);
 
-		} else if($options['inputStream']) {
-			while($content = fread($options['inputStream'], 8192)) {
+		} else if ($options['inputStream']) {
+			while ($content = fread($options['inputStream'], 8192)) {
 				fwrite($pipes[0], $content);
 			}
 		}
-		if(isset($pipes[0])) fclose($pipes[0]);
+		if (isset($pipes[0])) fclose($pipes[0]);
 
 		$result = array();
 
-		if(isset($pipes[1])) {
+		if (isset($pipes[1])) {
 			// If a stream was provided, then pipe all the content
 			// Doing it this way rather than passing outputStream to $pipeSpec
 			// Means that streams as well as simple FDs can be used
-			if($options['outputStream']) {
-				while($content = fread($pipes[1], 8192)) {
+			if ($options['outputStream']) {
+				while ($content = fread($pipes[1], 8192)) {
 					fwrite($options['outputStream'], $content);
 				}
 
@@ -136,14 +136,14 @@ 
 			}
 			fclose($pipes[1]);
 		}
-		if(isset($pipes[2])) {
+		if (isset($pipes[2])) {
 			$result['error'] = stream_get_contents($pipes[2]);
 			fclose($pipes[2]);
 		}
 
 		$result['return'] = proc_close($process);
 
-		if($options['throwException'] && $result['return'] != 0)	{
+		if ($options['throwException'] && $result['return'] != 0) {
 			throw new Exception("Command: $command\nExecution failed: returned {$result['return']}.\n"
 				. (empty($result['output']) ? "" : "Output:\n{$result['output']}"));
 		}

src/FilesystemEntity.php

Spacing +13 added lines, -13 removed lines

@@ -12,8 +12,8 @@ 
 	function __construct($path, $executor) {
 		$this->executor = $executor;
 
-		if(strpos($path,':') !== false) {
-			list($this->server,$this->path) = explode(':', $path, 2);
+		if (strpos($path, ':') !== false) {
+			list($this->server, $this->path) = explode(':', $path, 2);
 		} else {
 			$this->server = null;
 			$this->path = $path;
@@ -47,7 +47,7 @@ 
 	 * @return Process
 	 */
 	function createProcess($command, $options = array()) {
-		if($this->server) {
+		if ($this->server) {
 			if ($this->identity && !isset($options['identity'])) {
 				$options['identity'] = $this->identity;
 			}
@@ -63,7 +63,7 @@ 
 	 * @param string $dest The remote filename/dir to upload to
 	 */
 	function upload($source, $dest) {
-		if($this->server) {
+		if ($this->server) {
 			$this->executor->execLocal(array("scp", $source, "$this->server:$dest"));
 		} else {
 			$this->executor->execLocal(array("cp", $source, $dest));
@@ -76,7 +76,7 @@ 
 	 * @param string $dest The remote filename/dir to upload to
 	 */
 	function uploadContent($content, $dest) {
-		$this->exec("echo " . escapeshellarg($content) . " > " . escapeshellarg($dest));
+		$this->exec("echo ".escapeshellarg($content)." > ".escapeshellarg($dest));
 	}
 
 	/**
@@ -85,7 +85,7 @@ 
 	 * @param string $dest The local filename/dir to download to
 	 */
 	function download($source, $dest) {
-		if($this->server) {
+		if ($this->server) {
 			$this->executor->execLocal(array("scp", "$this->server:$source", $dest));
 		} else {
 			$this->executor->execLocal(array("cp", $file, $dest));
@@ -98,11 +98,11 @@ 
 	 * @return boolean
 	 */
 	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");
+		if ($this->server) {
+			$result = $this->exec("if [ -e ".escapeshellarg($file)." ]; then echo yes; fi");
 			return (trim($result['output']) == 'yes');
 
 		} else {
@@ -114,8 +114,8 @@ 
 	 * Create the given file with the given content
 	 */
 	function writeFile($file, $content) {
-		if($this->server) {
-			$this->exec("echo " . escapeshellarg($content) . " > " . escapeshellarg($file));
+		if ($this->server) {
+			$this->exec("echo ".escapeshellarg($content)." > ".escapeshellarg($file));
 
 		} else {
 			file_put_contents($file, $content);
@@ -128,7 +128,7 @@ 
 	 * @param string $file The file to remove
 	 */
 	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;
 	}

Braces +9 added lines, -3 removed lines

@@ -98,8 +98,12 @@ 
 	 * @return boolean
 	 */
 	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
 	 */
 	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/SSPak.php

Spacing +39 added lines, -39 removed lines

@@ -66,16 +66,16 @@ 
 
 	function help($args) {
 		echo "SSPak: manage SilverStripe .sspak archives.\n\nUsage:\n";
-		foreach($this->getActions() as $action => $info) {
+		foreach ($this->getActions() as $action => $info) {
 			echo "sspak $action";
-			if(!empty($info['unnamedArgs'])) {
-				foreach($info['unnamedArgs'] as $arg) echo " ($arg)";
+			if (!empty($info['unnamedArgs'])) {
+				foreach ($info['unnamedArgs'] as $arg) echo " ($arg)";
 			}
-			if(!empty($info['namedFlags'])) {
-				foreach($info['namedFlags'] as $arg) echo " (--$arg)";
+			if (!empty($info['namedFlags'])) {
+				foreach ($info['namedFlags'] as $arg) echo " (--$arg)";
 			}
-			if(!empty($info['namedArgs'])) {
-				foreach($info['namedArgs'] as $arg) echo " --$arg=\"$arg value\"";
+			if (!empty($info['namedArgs'])) {
+				foreach ($info['namedArgs'] as $arg) echo " --$arg=\"$arg value\"";
 			}
 			echo "\n  {$info['description']}\n\n";
 		}
@@ -99,13 +99,13 @@ 
 
 		$filesystem = new FilesystemEntity(null, $executor);
 
-		if($pakParts['db']) {
+		if ($pakParts['db']) {
 			$dbPath = escapeshellarg($namedArgs['db']);
 			$process = $filesystem->createProcess("cat $dbPath | gzip -c");
 			$sspak->writeFileFromProcess('database.sql.gz', $process);
 		}
 
-		if($pakParts['assets']) {
+		if ($pakParts['assets']) {
 			$assetsParentArg = escapeshellarg(dirname($namedArgs['assets']));
 			$assetsBaseArg = escapeshellarg(basename($namedArgs['assets']));
 			$process = $filesystem->createProcess("cd $assetsParentArg && tar cfh - $assetsBaseArg | gzip -c");
@@ -128,7 +128,7 @@ 
 		$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);
@@ -147,16 +147,16 @@ 
 
 		$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);
 
-		if(!empty($namedArgs['identity'])) {
+		if (!empty($namedArgs['identity'])) {
 			// 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();
@@ -165,7 +165,7 @@ 
 		$details = $webroot->sniff();
 
 		// Create a build folder for the sspak file
-		$buildFolder = "/tmp/sspak-" . rand(100000,999999);
+		$buildFolder = "/tmp/sspak-".rand(100000, 999999);
 		$webroot->exec(array('mkdir', $buildFolder));
 
 		$dbFile = "$buildFolder/database.sql.gz";
@@ -176,22 +176,22 @@ 
 		$fileList = array();
 
 		// Save DB
-		if($pakParts['db']) {
+		if ($pakParts['db']) {
 			// Check the database type
 			$dbFunction = 'getdb_'.$details['db_type'];
-			if(!method_exists($this,$dbFunction)) {
-				throw new Exception("Can't process database type '" . $details['db_type'] . "'");
+			if (!method_exists($this, $dbFunction)) {
+				throw new Exception("Can't process database type '".$details['db_type']."'");
 			}
 			$this->$dbFunction($webroot, $details, $sspak, basename($dbFile));
 		}
 
 		// Save Assets
-		if($pakParts['assets']) {
+		if ($pakParts['assets']) {
 			$this->getassets($webroot, $details['assets_path'], $sspak, basename($assetsFile));
 		}
 
 		// Save git-remote
-		if($pakParts['git-remote']) {
+		if ($pakParts['git-remote']) {
 			$this->getgitremote($webroot, $sspak, basename($gitRemoteFile));
 		}
 
@@ -211,7 +211,7 @@ 
 		$hostArg = '';
 		$portArg = '';
 		if (!empty($conf['db_server']) && $conf['db_server'] != 'localhost') {
-			if (strpos($conf['db_server'], ':')!==false) {
+			if (strpos($conf['db_server'], ':') !== false) {
 				// Handle "server:port" format.
 				$server = explode(':', $conf['db_server'], 2);
 				$hostArg = escapeshellarg("--host=".$server[0]);
@@ -250,16 +250,16 @@ 
 
 	function getgitremote($webroot, $sspak, $gitRemoteFile) {
 		// Only do anything if we're copying from a git checkout
-		$gitRepo = $webroot->getPath() .'/.git';
-		if($webroot->exists($gitRepo)) {
+		$gitRepo = $webroot->getPath().'/.git';
+		if ($webroot->exists($gitRepo)) {
 			// Identify current branch
 			$output = $webroot->exec(array('git', '--git-dir='.$gitRepo, 'branch'));
-			if(preg_match("/\* ([^ \n]*)/", $output['output'], $matches) && strpos("(no branch)", $matches[1])===false) {
+			if (preg_match("/\* ([^ \n]*)/", $output['output'], $matches) && strpos("(no branch)", $matches[1]) === false) {
 				// If there is a current branch, use that branch's remove
 				$currentBranch = trim($matches[1]);
-				$output = $webroot->exec(array('git', '--git-dir='.$gitRepo, 'config','--get',"branch.$currentBranch.remote"));
+				$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 {
@@ -268,11 +268,11 @@ 
 			}
 
 			// Determine the URL of that remote
-			$output = $webroot->exec(array('git', '--git-dir='.$gitRepo, 'config','--get',"remote.$remoteName.url"));
+			$output = $webroot->exec(array('git', '--git-dir='.$gitRepo, 'config', '--get', "remote.$remoteName.url"));
 			$remoteURL = trim($output['output']);
 
 			// Determine the current SHA
-			$output = $webroot->exec(array('git', '--git-dir='.$gitRepo, 'log','-1','--format=%H'));
+			$output = $webroot->exec(array('git', '--git-dir='.$gitRepo, 'log', '-1', '--format=%H'));
 			$sha = trim($output['output']);
 
 			$content = "remote = $remoteURL\nbranch = $currentBranch\nsha = $sha\n";
@@ -300,22 +300,22 @@ 
 		$pakParts = $args->pakParts();
 
 		$namedArgs = $args->getNamedArgs();
-		if(!empty($namedArgs['identity'])) {
+		if (!empty($namedArgs['identity'])) {
 			// SSH private key
 			$webroot->setSSHItentityFile($namedArgs['identity']);
 		}
 
 		// 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();
-		if($pakParts['db'] && $sspak->contains('database.sql.gz')) {
+		if ($pakParts['db'] && $sspak->contains('database.sql.gz')) {
 			$webroot->putdb($sspak, isset($namedArgs['drop-db']));
 		}
 
 		// Push assets, if neccessary
-		if($pakParts['assets'] && $sspak->contains('assets.tar.gz')) {
+		if ($pakParts['assets'] && $sspak->contains('assets.tar.gz')) {
 			$webroot->putassets($sspak);
 		}
 	}
@@ -337,13 +337,13 @@ 
 		$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()));
 
-		if($sspak->contains('git-remote')) {
+		if ($sspak->contains('git-remote')) {
 			$details = $sspak->gitRemoteDetails();
 			$webroot->putgit($details);
 		}
@@ -352,12 +352,12 @@ 
 
 		// Push database, if necessary
 		$namedArgs = $args->getNamedArgs();
-		if($pakParts['db'] && $sspak->contains('database.sql.gz')) {
+		if ($pakParts['db'] && $sspak->contains('database.sql.gz')) {
 			$webroot->putdb($sspak, isset($namedArgs['drop-db']));
 		}
 
 		// Push assets, if neccessary
-		if($pakParts['assets'] && $sspak->contains('assets.tar.gz')) {
+		if ($pakParts['assets'] && $sspak->contains('assets.tar.gz')) {
 			$webroot->putassets($sspak);
 		}
 	}
@@ -384,10 +384,10 @@ 
 		$sspakScript = str_replace('$isSelfExtracting = false;', '$isSelfExtracting = true;', $sspakScript);
 
 		// Load the sniffer file
-		$snifferFile = dirname(__FILE__) . '/sspak-sniffer.php';
+		$snifferFile = dirname(__FILE__).'/sspak-sniffer.php';
 		$sspakScript = str_replace("\$snifferFileContent = '';\n",
 			"\$snifferFileContent = '"
-			. str_replace(array("\\","'"),array("\\\\", "\\'"), file_get_contents($snifferFile)) . "';\n", $sspakScript);
+			. str_replace(array("\\", "'"), array("\\\\", "\\'"), file_get_contents($snifferFile))."';\n", $sspakScript);
 
 		file_put_contents($destFile, $sspakScript);
 		chmod($destFile, 0775);