silverstripe / sspak

src/Args.php

Spacing +9 added lines, -9 removed lines

@@ -11,10 +11,10 @@ 
 	public function __construct($args) {
 		array_shift($args);
 
-		foreach($args as $arg) {
-			if(preg_match('/^--([^=]+)=(.*)$/', $arg, $matches)) {
+		foreach ($args as $arg) {
+			if (preg_match('/^--([^=]+)=(.*)$/', $arg, $matches)) {
 				$this->namedArgs[$matches[1]] = $matches[2];
-			} else if(preg_match('/^--([^=]+)$/', $arg, $matches)) {
+			} else if (preg_match('/^--([^=]+)$/', $arg, $matches)) {
 				$this->namedArgs[$matches[1]] = true;
 			} else {
 				$this->unnamedArgs[] = $arg;
@@ -51,8 +51,8 @@ 
 	 * 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'];
+		if (!empty($this->namedArgs[$optionalPrefix.'-sudo'])) return $this->namedArgs[$optionalPrefix.'-sudo'];
+		else if (!empty($this->namedArgs['sudo'])) return $this->namedArgs['sudo'];
 		else return null;
 	}
 
@@ -62,18 +62,18 @@ 
 	public function pakParts() {
 		// Look up which parts of the sspak are going to be saved
 		$pakParks = array();
-		foreach(array('assets','db','git-remote') as $part) {
+		foreach (array('assets', 'db', 'git-remote') as $part) {
 			$pakParts[$part] = !empty($this->namedArgs[$part]);
 		}
 
 		// 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;
 	}
 
 	public function requireUnnamed($items) {
-		if(sizeof($this->unnamedArgs) < sizeof($items)) {
-			echo "Usage: {$_SERVER['argv'][0]} " . $this->action . " (";
+		if (sizeof($this->unnamedArgs) < sizeof($items)) {
+			echo "Usage: {$_SERVER['argv'][0]} ".$this->action." (";
 			echo implode(") (", $items);
 			echo ")\n";
 			throw new Exception('Arguments missing.');

tests/DataExtractor/CsvTableReaderTest.php

Spacing +4 added lines, -4 removed lines

@@ -6,18 +6,18 @@
 {
 	public function testCsvReading() {
 
-		$csv = new CsvTableReader(__DIR__ . '/fixture/input.csv');
+		$csv = new CsvTableReader(__DIR__.'/fixture/input.csv');
 		$this->assertEquals(['Col1', 'Col2', 'Col3'], $csv->getColumns());
 
 		$extractedData = [];
-		foreach($csv as $record) {
+		foreach ($csv as $record) {
 			$extractedData[] = $record;
 		}
 
 		$this->assertEquals(
 			[
-				[ 'Col1' => 'One', 'Col2' => 2, 'Col3' => 'Three' ],
-				[ 'Col1' => 'Hello, Sam', 'Col2' => 5, 'Col3' => "Nice to meet you\nWhat is your name?" ]
+				['Col1' => 'One', 'Col2' => 2, 'Col3' => 'Three'],
+				['Col1' => 'Hello, Sam', 'Col2' => 5, 'Col3' => "Nice to meet you\nWhat is your name?"]
 			],
 			$extractedData
 		);

src/Webroot.php

Spacing +19 added lines, -19 removed lines

@@ -16,7 +16,7 @@ 
 	 * 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,16 +26,16 @@ 
 	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';
+		$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
 	 */
 	public 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");
 		}
 
@@ -144,7 +144,7 @@ 
 		$assetsPathExec = $this->exec("if [ -L {$assetsPath} ]; then readlink -f {$assetsPath}; else echo {$assetsPath}; fi");
 		$assetsPath = trim($assetsPathExec["output"]);
 
-		$assetsOldPath = $assetsPath . '.old';
+		$assetsOldPath = $assetsPath.'.old';
 		$assetsParentArg = escapeshellarg(dirname($assetsPath));
 
 		// Move existing assets to assets.old
@@ -167,7 +167,7 @@ 
 	 */
 	public 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;
 	}
 }