silverstripe / sspak

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

Braces +10 added lines, -4 removed lines

@@ -51,9 +51,13 @@ 
 	 * 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'];
-		else return null;
+		if(!empty($this->namedArgs[$optionalPrefix . '-sudo'])) {
+			return $this->namedArgs[$optionalPrefix . '-sudo'];
+		} else if(!empty($this->namedArgs['sudo'])) {
+			return $this->namedArgs['sudo'];
+		} else {
+			return null;
+		}
 	}
 
 	/**
@@ -67,7 +71,9 @@ 
 		}
 
 		// 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;
 	}
 

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