silverstripe / sspak

src/DataExtractor/CsvTableReader.php

Doc Comments +3 added lines

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

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;

src/DataExtractor/CsvTableWriter.php

Doc Comments +3 added lines

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

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

Spacing +46 added lines, -46 removed lines

@@ -88,16 +88,16 @@ 
 
 	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");
@@ -150,7 +150,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);
@@ -181,9 +181,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);
@@ -204,10 +204,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 {
@@ -229,16 +229,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();
@@ -247,7 +247,7 @@ 
 		$details = $webroot->sniff();
 
 		// Create a build folder for the sspak file
-		$buildFolder = "/tmp/sspak-" . rand(100000,999999);
+		$buildFolder = "/tmp/sspak-".rand(100000, 999999);
 		$webroot->exec(array('mkdir', $buildFolder));
 
 		$dbFile = "$buildFolder/database.sql.gz";
@@ -258,22 +258,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));
 		}
 
@@ -293,7 +293,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]);
@@ -332,16 +332,16 @@ 
 
 	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 {
@@ -350,11 +350,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";
@@ -382,22 +382,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);
 		}
 	}
@@ -419,13 +419,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);
 		}
@@ -434,12 +434,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);
 		}
 	}
@@ -466,10 +466,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/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 @@ 
 	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 @@ 
 	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 @@ 
 	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]);

tests/DataExtractor/CsvTableReaderTest.php

Spacing +4 added lines, -4 removed lines

@@ -6,18 +6,18 @@
 {
 	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
 		);

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