silverstripe / sspak

src/sspak-sniffer.php

Spacing +12 added lines, -12 removed lines

@@ -7,13 +7,13 @@ 
  */
 
 // Argument parsing
-if(empty($_SERVER['argv'][1])) {
+if (empty($_SERVER['argv'][1])) {
 	echo "Usage: {$_SERVER['argv'][0]} (site-docroot)\n";
 	exit(1);
 }
 
 $basePath = $_SERVER['argv'][1];
-if($basePath[0] != '/') $basePath = getcwd() . '/' . $basePath;
+if ($basePath[0] != '/') $basePath = getcwd().'/'.$basePath;
 
 // SilverStripe bootstrap
 define('BASE_PATH', $basePath);
@@ -23,24 +23,24 @@ 
 $_SERVER['HTTP_HOST'] = 'localhost';
 chdir(BASE_PATH);
 
-if(file_exists(BASE_PATH.'/sapphire/core/Core.php')) {
+if (file_exists(BASE_PATH.'/sapphire/core/Core.php')) {
 	//SS 2.x
-	require_once(BASE_PATH . '/sapphire/core/Core.php');
-} else if(file_exists(BASE_PATH.'/framework/core/Core.php')) {
+	require_once(BASE_PATH.'/sapphire/core/Core.php');
+} else if (file_exists(BASE_PATH.'/framework/core/Core.php')) {
 	//SS 3.x
-	require_once(BASE_PATH. '/framework/core/Core.php');
-} else if(file_exists(BASE_PATH.'/framework/src/Core/Core.php')) {
+	require_once(BASE_PATH.'/framework/core/Core.php');
+} else if (file_exists(BASE_PATH.'/framework/src/Core/Core.php')) {
 	//SS 4.x
-	require_once(BASE_PATH. '/vendor/autoload.php');
-	require_once(BASE_PATH. '/framework/src/Core/Core.php');
+	require_once(BASE_PATH.'/vendor/autoload.php');
+	require_once(BASE_PATH.'/framework/src/Core/Core.php');
 } else {
-	echo "Couldn't locate framework's Core.php. Perhaps " . BASE_PATH . " is not a SilverStripe project?\n";
+	echo "Couldn't locate framework's Core.php. Perhaps ".BASE_PATH." is not a SilverStripe project?\n";
 	exit(2);
 }
 
 $output = array();
-foreach($databaseConfig as $k => $v) {
-	$output['db_' . $k] = $v;
+foreach ($databaseConfig as $k => $v) {
+	$output['db_'.$k] = $v;
 }
 $output['assets_path'] = ASSETS_PATH;
 

src/SSPak.php

Spacing +47 added lines, -47 removed lines

@@ -88,16 +88,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";
 		}
@@ -121,13 +121,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");
@@ -154,7 +154,7 @@ 
 		// manually.
 		// There is no cross-platform way of checking the assets.tar.gz size without unpacking, so we assume the size
 		// of database is negligible which let's us approximate the size of assets.
-		if (filesize($file) > 8*1024*1024*1024) {
+		if (filesize($file) > 8 * 1024 * 1024 * 1024) {
 			$msg = <<<EOM
 
 ERROR: SSPak is unable to extract archives over 8 GB.
@@ -175,7 +175,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);
@@ -206,9 +206,9 @@ 
 
 		$db = new DatabaseConnector($webroot);
 
-		foreach($db->getTables() as $table) {
-			$filename = $destPath . '/' . $table . '.csv';
-			echo $filename . "...\n";
+		foreach ($db->getTables() as $table) {
+			$filename = $destPath.'/'.$table.'.csv';
+			echo $filename."...\n";
 			touch($filename);
 			$writer = new CsvTableWriter($filename);
 			$db->saveTable($table, $writer);
@@ -229,10 +229,10 @@ 
 
 		$db = new DatabaseConnector($webroot);
 
-		foreach($db->getTables() as $table) {
-			$filename = $srcPath . '/' . $table . '.csv';
-			if(file_exists($filename)) {
-				echo $filename . "...\n";
+		foreach ($db->getTables() as $table) {
+			$filename = $srcPath.'/'.$table.'.csv';
+			if (file_exists($filename)) {
+				echo $filename."...\n";
 				$reader = new CsvTableReader($filename);
 				$db->loadTable($table, $reader);
 			} else {
@@ -254,16 +254,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();
@@ -272,7 +272,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";
@@ -283,22 +283,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));
 		}
 
@@ -318,7 +318,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]);
@@ -357,16 +357,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 {
@@ -375,11 +375,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";
@@ -407,22 +407,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);
 		}
 	}
@@ -444,13 +444,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);
 		}
@@ -459,12 +459,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);
 		}
 	}
@@ -491,10 +491,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);

src/Webroot.php

Spacing +19 added lines, -19 removed lines

@@ -16,7 +16,7 @@ 
 	 * Calls sniff once and then caches
 	 */
 	function details() {
-		if(!$this->details) $this->details = $this->sniff();
+		if (!$this->details) $this->details = $this->sniff();
 		return $this->details;
 	}
 
@@ -26,16 +26,16 @@ 
 	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';
+		$remoteSniffer = '/tmp/sspak-sniffer-'.rand(100000, 999999).'.php';
 		$this->uploadContent($snifferFileContent, $remoteSniffer);
 
 		$result = $this->execSudo(array('/usr/bin/env', 'php', $remoteSniffer, $this->path));
 		$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;
 	}
 
@@ -44,19 +44,19 @@ 
 	 * @param  string $command Shell command, either a fully escaped string or an array
 	 */
 	function execSudo($command) {
-		if($this->sudo) {
-			if(is_array($command)) $command = $this->executor->commandArrayToString($command);
+		if ($this->sudo) {
+			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);
+				return $this->exec("sudo -n -u ".escapeshellarg($this->sudo)." ".$command);
 
 			// Otherwise capture SUDO password ourselves and pass it in through STDIN
-			} catch(Exception $e) {
+			} catch (Exception $e) {
 				echo "[sspak sudo] Enter your password: ";
-				$stdin = fopen( 'php://stdin', 'r');
+				$stdin = fopen('php://stdin', 'r');
 				$password = fgets($stdin);
 
-				return $this->exec("sudo -S -p '' -u " . escapeshellarg($this->sudo) . " " . $command, array('inputContent' => $password));
+				return $this->exec("sudo -S -p '' -u ".escapeshellarg($this->sudo)." ".$command, array('inputContent' => $password));
 			}
 
 		} else {
@@ -75,8 +75,8 @@ 
 
 		// Check the database type
 		$dbFunction = 'putdb_'.$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']."'");
 		}
 
 		// Extract DB direct from sspak file
@@ -95,7 +95,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]);
@@ -104,9 +104,9 @@ 
 				$hostArg = escapeshellarg("--host=".$conf['db_server']);
 			}
 		}
-		$dbCommand = "create database if not exists `" . addslashes($conf['db_database']) . "`";
-		if($dropdb) {
-			$dbCommand = "drop database if exists `" . addslashes($conf['db_database']) . "`; " . $dbCommand;
+		$dbCommand = "create database if not exists `".addslashes($conf['db_database'])."`";
+		if ($dropdb) {
+			$dbCommand = "drop database if exists `".addslashes($conf['db_database'])."`; ".$dbCommand;
 		}
 
 		$this->exec("echo '$dbCommand' | mysql $usernameArg $passwordArg $hostArg $portArg");
@@ -126,7 +126,7 @@ 
 
 		// Create database if needed
 		$result = $this->exec("echo \"select count(*) from pg_catalog.pg_database where datname = $databaseArg\" | $passwordArg psql $usernameArg $hostArg $databaseArg -qt");
-		if(trim($result['output']) == '0') {
+		if (trim($result['output']) == '0') {
 			$this->exec("$passwordArg createdb $usernameArg $hostArg $databaseArg");
 		}
 
@@ -138,7 +138,7 @@ 
 	function putassets($sspak) {
 		$details = $this->details();
 		$assetsPath = $details['assets_path'];
-		$assetsOldPath = $assetsPath . '.old';
+		$assetsOldPath = $assetsPath.'.old';
 
 		$assetsParentArg = escapeshellarg(dirname($assetsPath));
 
@@ -164,7 +164,7 @@ 
 	 */
 	function putgit($details) {
 		$this->exec(array('git', 'clone', $details['remote'], $this->path));
-		$this->exec("cd $this->path && git checkout " . escapeshellarg($details['branch']));
+		$this->exec("cd $this->path && git checkout ".escapeshellarg($details['branch']));
 		return true;
 	}
 }