silverstripe / sspak

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/sspak-sniffer.php

Braces +3 added lines, -1 removed lines

@@ -13,7 +13,9 @@
 }
 
 $basePath = $_SERVER['argv'][1];
-if($basePath[0] != '/') $basePath = getcwd() . '/' . $basePath;
+if($basePath[0] != '/') {
+	$basePath = getcwd() . '/' . $basePath;
+}
 
 // SilverStripe bootstrap
 define('BASE_PATH', realpath($basePath));

Spacing +11 added lines, -11 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', realpath($basePath));
@@ -23,15 +23,15 @@ 
 $_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.'/vendor/silverstripe/framework')) {
+	require_once(BASE_PATH.'/framework/core/Core.php');
+} else if (file_exists(BASE_PATH.'/vendor/silverstripe/framework')) {
 	//SS 4.x
-	require_once(BASE_PATH. '/vendor/autoload.php');
+	require_once(BASE_PATH.'/vendor/autoload.php');
 	$kernel = new SilverStripe\Core\CoreKernel(BASE_PATH);
 	//boot the parts of the kernel to populate the DB config
 	foreach (array('bootDatabaseEnvVars', 'bootDatabaseGlobals') as $bootMethod) {
@@ -41,13 +41,13 @@ 
 	}
 	$databaseConfig = SilverStripe\ORM\DB::getConfig();
 } 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/Webroot.php

Braces +12 added lines, -4 removed lines

@@ -16,7 +16,9 @@ 
 	 * 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,7 +28,9 @@ 
 	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';
 		$this->uploadContent($snifferFileContent, $remoteSniffer);
@@ -35,7 +39,9 @@ 
 		$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;
 	}
 
@@ -45,7 +51,9 @@ 
 	 */
 	public function execSudo($command, $options = array()) {
 		if($this->sudo) {
-			if(is_array($command)) $command = $this->executor->commandArrayToString($command);
+			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, $options);

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;
 	}
 
@@ -46,19 +46,19 @@ 
 	 * @return array A map containing 'return', 'output', and 'error'
 	 */
 	public function execSudo($command, $options = array()) {
-		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, $options);
+				return $this->exec("sudo -n -u ".escapeshellarg($this->sudo)." ".$command, $options);
 
 			// 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 {
@@ -77,8 +77,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
@@ -97,7 +97,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]);
@@ -106,9 +106,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");
@@ -128,7 +128,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");
 		}
 
@@ -150,7 +150,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
@@ -177,7 +177,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;
 	}
 }