silverstripe / sspak

src/DataExtractor/CsvTableWriter.php

Spacing +1 added lines, -1 removed lines

@@ -33,7 +33,7 @@
 
 	private function mapFromColumns($record) {
 		$row = [];
-		foreach($this->columns as $i => $column)
+		foreach ($this->columns as $i => $column)
 		{
 			$row[$i] = isset($record[$column]) ? $record[$column] : null;
 		}

Doc Comments +3 added lines

@@ -9,6 +9,9 @@
 	private $handle;
 	private $columns;
 
+	/**
+	 * @param string $filename
+	 */
 	public function __construct($filename) {
 		$this->filename = $filename;
 	}

src/DataExtractor/CsvTableReader.php

Spacing +4 added lines, -4 removed lines

@@ -24,7 +24,7 @@ 
 		$this->columns = null;
 		$this->initColumns();
 
-		while(($row = $this->getRow()) !== false) {
+		while (($row = $this->getRow()) !== false) {
 			yield $this->mapToColumns($row);
 		}
 
@@ -33,12 +33,12 @@ 
 
 	private function mapToColumns($row) {
 		$record = [];
-		foreach($row as $i => $value)
+		foreach ($row as $i => $value)
 		{
-			if(isset($this->columns[$i])) {
+			if (isset($this->columns[$i])) {
 				$record[$this->columns[$i]] = $value;
 			} else {
-				throw new \LogicException("Row contains invalid column #$i\n" . var_export($row, true));
+				throw new \LogicException("Row contains invalid column #$i\n".var_export($row, true));
 			}
 		}
 		return $record;

tests/DataExtractor/CsvTableWriterTest.php

Spacing +6 added lines, -6 removed lines

@@ -13,14 +13,14 @@ 
 		$csv = new CsvTableWriter('/tmp/output.csv');
 
 		$csv->start(['Col1', 'Col2', 'Col3']);
-		$csv->writeRecord([ 'Col1' => 'One', 'Col2' => 2, 'Col3' => 'Three' ]);
-		$csv->writeRecord([ 'Col1' => 'Hello, Sam', 'Col2' => 5, 'Col3' => "Nice to meet you\nWhat is your name?" ]);
+		$csv->writeRecord(['Col1' => 'One', 'Col2' => 2, 'Col3' => 'Three']);
+		$csv->writeRecord(['Col1' => 'Hello, Sam', 'Col2' => 5, 'Col3' => "Nice to meet you\nWhat is your name?"]);
 		$csv->finish();
 
 		$csvContent = file_get_contents('/tmp/output.csv');
 		unlink('/tmp/output.csv');
 
-		$fixture = file_get_contents(__DIR__ . '/fixture/input.csv');
+		$fixture = file_get_contents(__DIR__.'/fixture/input.csv');
 
 		$this->assertEquals($fixture, $csvContent);
 	}
@@ -33,14 +33,14 @@ 
 
 		$csv = new CsvTableWriter('/tmp/output.csv');
 
-		$csv->writeRecord([ 'Col1' => 'One', 'Col2' => 2, 'Col3' => 'Three' ]);
-		$csv->writeRecord([ 'Col1' => 'Hello, Sam', 'Col2' => 5, 'Col3' => "Nice to meet you\nWhat is your name?" ]);
+		$csv->writeRecord(['Col1' => 'One', 'Col2' => 2, 'Col3' => 'Three']);
+		$csv->writeRecord(['Col1' => 'Hello, Sam', 'Col2' => 5, 'Col3' => "Nice to meet you\nWhat is your name?"]);
 		$csv->finish();
 
 		$csvContent = file_get_contents('/tmp/output.csv');
 		unlink('/tmp/output.csv');
 
-		$fixture = file_get_contents(__DIR__ . '/fixture/input.csv');
+		$fixture = file_get_contents(__DIR__.'/fixture/input.csv');
 
 		$this->assertEquals($fixture, $csvContent);
 	}

tests/SmokeTest.php

Spacing +2 added lines, -2 removed lines

@@ -1,7 +1,7 @@
 <?php
 
-define('PACKAGE_ROOT' , dirname(__DIR__).'/');
-require_once(PACKAGE_ROOT . 'src/SSPak.php');
+define('PACKAGE_ROOT', dirname(__DIR__).'/');
+require_once(PACKAGE_ROOT.'src/SSPak.php');
 
 /**
  * Confirm that the compile binary executes

src/Executor.php

Doc Comments -3 removed lines

@@ -18,9 +18,6 @@
 
 	/**
 	 * @param string $command The command
-	 * @param boolean $throwException If true, an Exception will be thrown on a nonzero error code
-	 * @param boolean $returnOutput If true, output will be captured
-	 * @param boolean $inputContent Content for STDIN. Otherwise the parent script's STDIN is used
 	 * @return A map containing 'return', 'output', and 'error'
 	 */
 	public function execLocal($command, $options = array()) {

Spacing +18 added lines, -18 removed lines

@@ -35,7 +35,7 @@ 
 
 	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);
 	}
@@ -53,8 +53,8 @@ 
 	 */
 	public 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']}"));
 		}

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/FilesystemEntity.php

Doc Comments +4 added lines, -1 removed lines

@@ -23,6 +23,10 @@ 
 	public function isLocal() {
 		return $this->server == null;
 	}
+
+	/**
+	 * @return string|null
+	 */
 	public function getPath() {
 		return $this->path;
 	}
@@ -59,7 +63,6 @@ 
 
 	/**
 	 * Upload a file to the given destination on the server
-	 * @param string $file The file to upload
 	 * @param string $dest The remote filename/dir to upload to
 	 */
 	public function upload($source, $dest) {

Spacing +13 added lines, -13 removed lines

@@ -12,8 +12,8 @@ 
 	public 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
 	 */
 	public 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
 	 */
 	public 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
 	 */
 	public 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
 	 */
 	public 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
 	 */
 	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");
+		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
 	 */
 	public 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
 	 */
 	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;
 	}

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/SSPak.php

Doc Comments +10 added lines

@@ -348,6 +348,11 @@ 
 		return true;
 	}
 
+	/**
+	 * @param Webroot $webroot
+	 * @param SSPakFile $sspak
+	 * @param string $filename
+	 */
 	public function getassets($webroot, $assetsPath, $sspak, $filename) {
 		$assetsParentArg = escapeshellarg(dirname($assetsPath));
 		$assetsBaseArg = escapeshellarg(basename($assetsPath));
@@ -356,6 +361,11 @@ 
 		$sspak->writeFileFromProcess($filename, $process);
 	}
 
+	/**
+	 * @param Webroot $webroot
+	 * @param SSPakFile $sspak
+	 * @param string $gitRemoteFile
+	 */
 	public function getgitremote($webroot, $sspak, $gitRemoteFile) {
 		// Only do anything if we're copying from a git checkout
 		$gitRepo = $webroot->getPath() .'/.git';

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()));

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);

src/SSPakFile.php

Spacing +17 added lines, -17 removed lines

@@ -8,16 +8,16 @@ 
 
 	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;
 
 		// Executable Phar version
-		if(substr($path,-5) === '.phar') {
+		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 {
@@ -34,11 +34,11 @@ 
 	 * Add the SSPak executable information into this SSPak file
 	 */
 	public function makeExecutable() {
-		if(ini_get('phar.readonly')) {
+		if (ini_get('phar.readonly')) {
 			throw new Exception("Please set phar.readonly to false in your php.ini.");
 		}
 
-		passthru("composer install -d " . escapeshellarg(PACKAGE_ROOT) . " --no-dev");
+		passthru("composer install -d ".escapeshellarg(PACKAGE_ROOT)." --no-dev");
 
 		$root = PACKAGE_ROOT;
 		$srcRoots = [
@@ -47,11 +47,11 @@ 
 		];
 
 		// Add the bin file, but strip of the #! exec header.
-		$this->phar['bin/sspak'] = preg_replace("/^#!\/usr\/bin\/env php\n/", '', file_get_contents($root . "bin/sspak"));
+		$this->phar['bin/sspak'] = preg_replace("/^#!\/usr\/bin\/env php\n/", '', file_get_contents($root."bin/sspak"));
 
-		foreach($srcRoots as $srcRoot) {
-			foreach(new RecursiveIteratorIterator(new RecursiveDirectoryIterator($root . $srcRoot)) as $fileObj) {
-				if($fileObj->isFile()) {
+		foreach ($srcRoots as $srcRoot) {
+			foreach (new RecursiveIteratorIterator(new RecursiveDirectoryIterator($root.$srcRoot)) as $fileObj) {
+				if ($fileObj->isFile()) {
 					$file = $fileObj->getRealPath();
 
 					$relativeFile = str_replace($root, '', $file);
@@ -74,7 +74,7 @@ 
 		$this->phar->setStub($stub);
 		chmod($this->path, 0775);
 
-		passthru("composer install -d " . escapeshellarg(PACKAGE_ROOT));
+		passthru("composer install -d ".escapeshellarg(PACKAGE_ROOT));
 	}
 
 	/**
@@ -103,8 +103,8 @@ 
 		// Non-executable Phars can't have content streamed into them
 		// This means that we need to create a temp file, which is a pain, if that file happens to be a 3GB
 		// asset dump. :-/
-		if($this->phar instanceof PharData) {
-			$tmpFile = '/tmp/sspak-content-' .rand(100000,999999);
+		if ($this->phar instanceof PharData) {
+			$tmpFile = '/tmp/sspak-content-'.rand(100000, 999999);
 			$process->exec(array('outputFile' => $tmpFile));
 			$this->phar->addFile($tmpFile, $filename);
 			unlink($tmpFile);
@@ -123,7 +123,7 @@ 
 	 * @return Stream context
 	 */
 	public function writeStreamForFile($filename) {
-		return fopen('phar://' . $this->pharAlias . '/' . $filename, 'w');
+		return fopen('phar://'.$this->pharAlias.'/'.$filename, 'w');
 	}
 
 	/**
@@ -134,7 +134,7 @@ 
 	public function readStreamForFile($filename) {
 		// Note: using pharAlias here doesn't work on Debian Wheezy (nor on Windows for that matter).
 		//return fopen('phar://' . $this->pharAlias . '/' . $filename, 'r');
-		return fopen('phar://' . $this->pharPath . '/' . $filename, 'r');
+		return fopen('phar://'.$this->pharPath.'/'.$filename, 'r');
 	}
 
 	/**
@@ -153,10 +153,10 @@ 
 	public function gitRemoteDetails() {
 		$content = $this->content('git-remote');
 		$details = array();
-		foreach(explode("\n", trim($content)) as $line) {
-			if(!$line) continue;
+		foreach (explode("\n", trim($content)) as $line) {
+			if (!$line) continue;
 
-			if(preg_match('/^([^ ]+) *= *(.*)$/', $line, $matches)) {
+			if (preg_match('/^([^ ]+) *= *(.*)$/', $line, $matches)) {
 				$details[$matches[1]] = $matches[2];
 			} else {
 				throw new Exception("Bad line '$line'");

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/DataExtractor/DatabaseConnector.php

Spacing +11 added lines, -11 removed lines

@@ -26,19 +26,19 @@ 
 		$this->isConnected = true;
 
 		// Necessary for SilverStripe's _ss_environment.php loader to work
-		$_SERVER['SCRIPT_FILENAME'] = $this->basePath . '/dummy.php';
+		$_SERVER['SCRIPT_FILENAME'] = $this->basePath.'/dummy.php';
 
 		global $databaseConfig;
 
 		// require composers autoloader
-		if (file_exists($this->basePath . '/vendor/autoload.php')) {
-			require_once $this->basePath . '/vendor/autoload.php';
+		if (file_exists($this->basePath.'/vendor/autoload.php')) {
+			require_once $this->basePath.'/vendor/autoload.php';
 		}
 
-		if (file_exists($this->basePath . '/framework/core/Core.php')) {
-			require_once($this->basePath . '/framework/core/Core.php');
-		} elseif (file_exists($this->basePath . '/sapphire/core/Core.php')) {
-			require_once($this->basePath . '/sapphire/core/Core.php');
+		if (file_exists($this->basePath.'/framework/core/Core.php')) {
+			require_once($this->basePath.'/framework/core/Core.php');
+		} elseif (file_exists($this->basePath.'/sapphire/core/Core.php')) {
+			require_once($this->basePath.'/sapphire/core/Core.php');
 		} else {
 			throw new \LogicException("No framework/core/Core.php or sapphire/core/Core.php included in project.  Perhaps $this->basePath is not a SilverStripe project?");
 		}
@@ -56,7 +56,7 @@ 
 	public function getDatabase() {
 		$this->connect();
 
-		if(method_exists('DB', 'get_conn')) {
+		if (method_exists('DB', 'get_conn')) {
 			return DB::get_conn();
 		} else {
 			return DB::getConn();
@@ -69,7 +69,7 @@ 
 	public function getTables() {
 		$this->connect();
 
-		if(method_exists('DB', 'table_list')) {
+		if (method_exists('DB', 'table_list')) {
 			return DB::table_list();
 		} else {
 			return DB::tableList();
@@ -82,7 +82,7 @@ 
 	public function getFieldsForTable($tableName) {
 		$this->connect();
 
-		if(method_exists('DB', 'field_list')) {
+		if (method_exists('DB', 'field_list')) {
 			return DB::field_list($tableName);
 		} else {
 			return DB::fieldList($tableName);
@@ -110,7 +110,7 @@ 
 
 		$fields = $this->getFieldsForTable($tableName);
 
-		foreach($reader as $record) {
+		foreach ($reader as $record) {
 			foreach ($record as $k => $v) {
 				if (!isset($fields[$k])) {
 					unset($record[$k]);