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

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

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

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

src/Executor.php

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']}"));
 		}

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

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