silverstripe / sspak

src/SSPak.php

Spacing +47 added lines, -47 removed lines

@@ -88,16 +88,16 @@ 
 
 	public 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");
@@ -155,7 +155,7 @@ 
 		// from other formats.
 		// 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 lets 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.
@@ -176,7 +176,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);
@@ -207,9 +207,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);
@@ -230,10 +230,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 {
@@ -255,16 +255,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();
@@ -273,7 +273,7 @@ 
 		$details = $webroot->sniff();
 
 		// Create a build folder for the sspak file
-		$buildFolder = sprintf("%s/sspak-%d", sys_get_temp_dir(), rand(100000,999999));
+		$buildFolder = sprintf("%s/sspak-%d", sys_get_temp_dir(), rand(100000, 999999));
 		$webroot->exec(array('mkdir', $buildFolder));
 
 		$dbFile = "$buildFolder/database.sql.gz";
@@ -284,22 +284,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));
 		}
 
@@ -319,7 +319,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]);
@@ -358,16 +358,16 @@ 
 
 	public 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 {
@@ -376,11 +376,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";
@@ -408,22 +408,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);
 		}
 	}
@@ -445,13 +445,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);
 		}
@@ -460,12 +460,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);
 		}
 	}
@@ -492,10 +492,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);