silverstripe / sspak

tests/DataExtractor/CsvTableReaderTest.php

Indentation +16 added lines, -16 removed lines

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

Spacing +3 added lines, -3 removed lines

@@ -10,7 +10,7 @@ 
     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 = [];
@@ -20,8 +20,8 @@ 
 
         $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

Indentation +29 added lines, -29 removed lines

@@ -7,45 +7,45 @@
 
 class CsvTableWriterTest extends TestCase
 {
-    public function testCsvReading()
-    {
-        if (file_exists('/tmp/output.csv')) {
-            unlink('/tmp/output.csv');
-        }
+	public function testCsvReading()
+	{
+		if (file_exists('/tmp/output.csv')) {
+			unlink('/tmp/output.csv');
+		}
 
-        $csv = new CsvTableWriter('/tmp/output.csv');
+		$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->finish();
+		$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->finish();
 
-        $csvContent = file_get_contents('/tmp/output.csv');
-        unlink('/tmp/output.csv');
+		$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);
-    }
+		$this->assertEquals($fixture, $csvContent);
+	}
 
-    public function testNoStartCall()
-    {
+	public function testNoStartCall()
+	{
 
-        if (file_exists('/tmp/output.csv')) {
-            unlink('/tmp/output.csv');
-        }
+		if (file_exists('/tmp/output.csv')) {
+			unlink('/tmp/output.csv');
+		}
 
-        $csv = new CsvTableWriter('/tmp/output.csv');
+		$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->finish();
+		$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');
+		$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);
-    }
+		$this->assertEquals($fixture, $csvContent);
+	}
 }

Spacing +6 added lines, -6 removed lines

@@ -16,14 +16,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);
     }
@@ -37,14 +37,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

Indentation +14 added lines, -14 removed lines

@@ -10,20 +10,20 @@
  */
 class SmokeTest extends TestCase
 {
-    /**
-     * Check that the help output of the binary matches what the internal function generates
-     */
-    public function testHelpOutput()
-    {
-        $ssPak = new SSPak(null);
+	/**
+	 * Check that the help output of the binary matches what the internal function generates
+	 */
+	public function testHelpOutput()
+	{
+		$ssPak = new SSPak(null);
 
-        // Internal call
-        ob_start();
-        $ssPak->help(array());
-        $helpText = ob_get_contents();
-        ob_end_clean();
+		// Internal call
+		ob_start();
+		$ssPak->help(array());
+		$helpText = ob_get_contents();
+		ob_end_clean();
 
-        // Call to binary
-        $this->assertEquals($helpText, `build/sspak.phar help &> /dev/stdout`);
-    }
+		// Call to binary
+		$this->assertEquals($helpText, `build/sspak.phar help &> /dev/stdout`);
+	}
 }

src/FilesystemEntity.php

Indentation +145 added lines, -145 removed lines

@@ -9,149 +9,149 @@
  */
 class FilesystemEntity
 {
-    protected $server;
-    protected $path;
-    protected $executor;
-    protected $identity = null;
-
-    public function __construct($path, $executor)
-    {
-        $this->executor = $executor;
-
-        if (strpos($path, ':') !== false) {
-            list($this->server,$this->path) = explode(':', $path, 2);
-        } else {
-            $this->server = null;
-            $this->path = $path;
-        }
-    }
-
-    public function isLocal()
-    {
-        return $this->server == null;
-    }
-    public function getPath()
-    {
-        return $this->path;
-    }
-    public function getServer()
-    {
-        return $this->server;
-    }
-    public function setSSHItentityFile($filename)
-    {
-        $this->identity = $filename;
-    }
-
-    /**
-     * Execute a command on the relevant server
-     * @param  string $command Shell command, either a fully escaped string or an array
-     */
-    public function exec($command, $options = array())
-    {
-        return $this->createProcess($command, $options)->exec();
-    }
-
-    /**
-     * Create a process for later exection
-     * @param  string $command Shell command, either a fully escaped string or an array
-     * @return Process
-     */
-    public function createProcess($command, $options = array())
-    {
-        if ($this->server) {
-            if ($this->identity && !isset($options['identity'])) {
-                $options['identity'] = $this->identity;
-            }
-            return $this->executor->createRemote($this->server, $command, $options);
-        }
-
-        return $this->executor->createLocal($command, $options);
-    }
-
-    /**
-     * Upload a file to the given destination on the server
-     * @param string $file The file to upload
-     * @param string $dest The remote filename/dir to upload to
-     */
-    public function upload($source, $dest)
-    {
-        if ($this->server) {
-            $this->executor->execLocal(array("scp", $source, "$this->server:$dest"));
-        } else {
-            $this->executor->execLocal(array("cp", $source, $dest));
-        }
-    }
-
-    /**
-     * Create a file with the given content at the given destination on the server
-     * @param string $content The content of the file
-     * @param string $dest The remote filename/dir to upload to
-     */
-    public function uploadContent($content, $dest)
-    {
-        $this->exec("echo " . escapeshellarg($content) . " > " . escapeshellarg($dest));
-    }
-
-    /**
-     * Download a file from the given source on the server to the given file
-     * @param string $source The remote filename to download
-     * @param string $dest The local filename/dir to download to
-     */
-    public function download($source, $dest)
-    {
-        if ($this->server) {
-            $this->executor->execLocal(array("scp", "$this->server:$source", $dest));
-        } else {
-            $this->executor->execLocal(array("cp", $file, $dest));
-        }
-    }
-
-    /**
-     * Returns true if the given file or directory exists
-     * @param string $file The file/dir to look for
-     * @return boolean
-     */
-    public function exists($file = null)
-    {
-        if (!$file) {
-            $file = $this->path;
-        }
-        if ($file == '@self') {
-            return true;
-        }
-
-        if ($this->server) {
-            $result = $this->exec("if [ -e " . escapeshellarg($file) . " ]; then echo yes; fi");
-            return (trim($result['output']) == 'yes');
-        } else {
-            return file_exists($file);
-        }
-    }
-
-    /**
-     * Create the given file with the given content
-     */
-    public function writeFile($file, $content)
-    {
-        if ($this->server) {
-            $this->exec("echo " . escapeshellarg($content) . " > " . escapeshellarg($file));
-        } else {
-            file_put_contents($file, $content);
-        }
-    }
-
-    /**
-     * Remove a file or folder from the webroot's server
-     *
-     * @param string $file The file to remove
-     */
-    public function unlink($file)
-    {
-        if (!$file || $file == '/' || $file == '.') {
-            throw new Exception("Can't unlink file '$file'");
-        }
-        $this->exec(array('rm', '-rf', $file));
-        return true;
-    }
+	protected $server;
+	protected $path;
+	protected $executor;
+	protected $identity = null;
+
+	public function __construct($path, $executor)
+	{
+		$this->executor = $executor;
+
+		if (strpos($path, ':') !== false) {
+			list($this->server,$this->path) = explode(':', $path, 2);
+		} else {
+			$this->server = null;
+			$this->path = $path;
+		}
+	}
+
+	public function isLocal()
+	{
+		return $this->server == null;
+	}
+	public function getPath()
+	{
+		return $this->path;
+	}
+	public function getServer()
+	{
+		return $this->server;
+	}
+	public function setSSHItentityFile($filename)
+	{
+		$this->identity = $filename;
+	}
+
+	/**
+	 * Execute a command on the relevant server
+	 * @param  string $command Shell command, either a fully escaped string or an array
+	 */
+	public function exec($command, $options = array())
+	{
+		return $this->createProcess($command, $options)->exec();
+	}
+
+	/**
+	 * Create a process for later exection
+	 * @param  string $command Shell command, either a fully escaped string or an array
+	 * @return Process
+	 */
+	public function createProcess($command, $options = array())
+	{
+		if ($this->server) {
+			if ($this->identity && !isset($options['identity'])) {
+				$options['identity'] = $this->identity;
+			}
+			return $this->executor->createRemote($this->server, $command, $options);
+		}
+
+		return $this->executor->createLocal($command, $options);
+	}
+
+	/**
+	 * Upload a file to the given destination on the server
+	 * @param string $file The file to upload
+	 * @param string $dest The remote filename/dir to upload to
+	 */
+	public function upload($source, $dest)
+	{
+		if ($this->server) {
+			$this->executor->execLocal(array("scp", $source, "$this->server:$dest"));
+		} else {
+			$this->executor->execLocal(array("cp", $source, $dest));
+		}
+	}
+
+	/**
+	 * Create a file with the given content at the given destination on the server
+	 * @param string $content The content of the file
+	 * @param string $dest The remote filename/dir to upload to
+	 */
+	public function uploadContent($content, $dest)
+	{
+		$this->exec("echo " . escapeshellarg($content) . " > " . escapeshellarg($dest));
+	}
+
+	/**
+	 * Download a file from the given source on the server to the given file
+	 * @param string $source The remote filename to download
+	 * @param string $dest The local filename/dir to download to
+	 */
+	public function download($source, $dest)
+	{
+		if ($this->server) {
+			$this->executor->execLocal(array("scp", "$this->server:$source", $dest));
+		} else {
+			$this->executor->execLocal(array("cp", $file, $dest));
+		}
+	}
+
+	/**
+	 * Returns true if the given file or directory exists
+	 * @param string $file The file/dir to look for
+	 * @return boolean
+	 */
+	public function exists($file = null)
+	{
+		if (!$file) {
+			$file = $this->path;
+		}
+		if ($file == '@self') {
+			return true;
+		}
+
+		if ($this->server) {
+			$result = $this->exec("if [ -e " . escapeshellarg($file) . " ]; then echo yes; fi");
+			return (trim($result['output']) == 'yes');
+		} else {
+			return file_exists($file);
+		}
+	}
+
+	/**
+	 * Create the given file with the given content
+	 */
+	public function writeFile($file, $content)
+	{
+		if ($this->server) {
+			$this->exec("echo " . escapeshellarg($content) . " > " . escapeshellarg($file));
+		} else {
+			file_put_contents($file, $content);
+		}
+	}
+
+	/**
+	 * Remove a file or folder from the webroot's server
+	 *
+	 * @param string $file The file to remove
+	 */
+	public function unlink($file)
+	{
+		if (!$file || $file == '/' || $file == '.') {
+			throw new Exception("Can't unlink file '$file'");
+		}
+		$this->exec(array('rm', '-rf', $file));
+		return true;
+	}
 }

Spacing +4 added lines, -4 removed lines

@@ -19,7 +19,7 @@ 
         $this->executor = $executor;
 
         if (strpos($path, ':') !== false) {
-            list($this->server,$this->path) = explode(':', $path, 2);
+            list($this->server, $this->path) = explode(':', $path, 2);
         } else {
             $this->server = null;
             $this->path = $path;
@@ -90,7 +90,7 @@ 
      */
     public function uploadContent($content, $dest)
     {
-        $this->exec("echo " . escapeshellarg($content) . " > " . escapeshellarg($dest));
+        $this->exec("echo ".escapeshellarg($content)." > ".escapeshellarg($dest));
     }
 
     /**
@@ -122,7 +122,7 @@ 
         }
 
         if ($this->server) {
-            $result = $this->exec("if [ -e " . escapeshellarg($file) . " ]; then echo yes; fi");
+            $result = $this->exec("if [ -e ".escapeshellarg($file)." ]; then echo yes; fi");
             return (trim($result['output']) == 'yes');
         } else {
             return file_exists($file);
@@ -135,7 +135,7 @@ 
     public function writeFile($file, $content)
     {
         if ($this->server) {
-            $this->exec("echo " . escapeshellarg($content) . " > " . escapeshellarg($file));
+            $this->exec("echo ".escapeshellarg($content)." > ".escapeshellarg($file));
         } else {
             file_put_contents($file, $content);
         }

src/DataExtractor/TableWriter.php

Indentation +16 added lines, -16 removed lines

@@ -4,22 +4,22 @@
 
 interface TableWriter
 {
-    /**
-     * Start writing, declaring the columns that will be provided.
-     * Must be called before writeRecord()
-     * @param array $columns The columns to be provided as keys in writeRecord() calls
-     */
-    public function start($columns);
+	/**
+	 * Start writing, declaring the columns that will be provided.
+	 * Must be called before writeRecord()
+	 * @param array $columns The columns to be provided as keys in writeRecord() calls
+	 */
+	public function start($columns);
 
-    /**
-     * Write a single record.
-     * @param array $record A map of column => value data
-     */
-    public function writeRecord($record);
+	/**
+	 * Write a single record.
+	 * @param array $record A map of column => value data
+	 */
+	public function writeRecord($record);
 
-    /**
-     * Finish writing.
-     * writeRecord() must not be called after this
-     */
-    public function finish();
+	/**
+	 * Finish writing.
+	 * writeRecord() must not be called after this
+	 */
+	public function finish();
 }

src/DataExtractor/CsvTableWriter.php

Indentation +54 added lines, -54 removed lines

@@ -4,67 +4,67 @@
 
 class CsvTableWriter implements TableWriter
 {
-    private $filename;
-    private $handle;
-    private $columns;
+	private $filename;
+	private $handle;
+	private $columns;
 
-    public function __construct($filename)
-    {
-        $this->filename = $filename;
-    }
+	public function __construct($filename)
+	{
+		$this->filename = $filename;
+	}
 
-    public function start($columns)
-    {
-        $this->open();
-        $this->putRow($columns);
-        $this->columns = $columns;
-    }
+	public function start($columns)
+	{
+		$this->open();
+		$this->putRow($columns);
+		$this->columns = $columns;
+	}
 
-    public function finish()
-    {
-        $this->close();
-    }
+	public function finish()
+	{
+		$this->close();
+	}
 
-    public function writeRecord($record)
-    {
-        if (!$this->columns) {
-            $this->start(array_keys($record));
-        }
+	public function writeRecord($record)
+	{
+		if (!$this->columns) {
+			$this->start(array_keys($record));
+		}
 
-        $this->putRow($this->mapFromColumns($record));
-    }
+		$this->putRow($this->mapFromColumns($record));
+	}
 
-    private function mapFromColumns($record)
-    {
-        $row = [];
-        foreach ($this->columns as $i => $column) {
-            $row[$i] = isset($record[$column]) ? $record[$column] : null;
-        }
-        return $row;
-    }
+	private function mapFromColumns($record)
+	{
+		$row = [];
+		foreach ($this->columns as $i => $column) {
+			$row[$i] = isset($record[$column]) ? $record[$column] : null;
+		}
+		return $row;
+	}
 
-    private function putRow($row)
-    {
-        return fputcsv($this->handle, $row);
-    }
+	private function putRow($row)
+	{
+		return fputcsv($this->handle, $row);
+	}
 
-    private function open()
-    {
-        if ($this->handle) {
-            fclose($this->handle);
-            $this->handle = null;
-        }
-        $this->handle = fopen($this->filename, 'w');
-        if (!$this->handle) {
-            throw new \LogicException("Can't open $this->filename for writing.");
-        }
-    }
+	private function open()
+	{
+		if ($this->handle) {
+			fclose($this->handle);
+			$this->handle = null;
+		}
+		$this->handle = fopen($this->filename, 'w');
+		if (!$this->handle) {
+			throw new \LogicException("Can't open $this->filename for writing.");
+		}
+	}
 
-    private function close()
-    {
-        if ($this->handle) {
-            fclose($this->handle);
-            $this->handle = null;
-        }
-    }
+	private function close()
+	{
+		if ($this->handle) {
+			fclose($this->handle);
+			$this->handle = null;
+		}
+	}
 }

src/DataExtractor/CsvTableReader.php

Indentation +59 added lines, -59 removed lines

@@ -4,73 +4,73 @@
 
 class CsvTableReader implements TableReader
 {
-    private $filename;
-    private $handle;
-    private $columns;
+	private $filename;
+	private $handle;
+	private $columns;
 
-    public function __construct($filename)
-    {
-        $this->filename = $filename;
-    }
+	public function __construct($filename)
+	{
+		$this->filename = $filename;
+	}
 
-    public function getColumns()
-    {
-        if (!$this->columns) {
-            $this->initColumns();
-        }
-        return $this->columns;
-    }
+	public function getColumns()
+	{
+		if (!$this->columns) {
+			$this->initColumns();
+		}
+		return $this->columns;
+	}
 
-    public function getIterator()
-    {
-        $this->columns = null;
-        $this->initColumns();
+	public function getIterator()
+	{
+		$this->columns = null;
+		$this->initColumns();
 
-        while (($row = $this->getRow()) !== false) {
-            yield $this->mapToColumns($row);
-        }
+		while (($row = $this->getRow()) !== false) {
+			yield $this->mapToColumns($row);
+		}
 
-        $this->close();
-    }
+		$this->close();
+	}
 
-    private function mapToColumns($row)
-    {
-        $record = [];
-        foreach ($row as $i => $value) {
-            if (isset($this->columns[$i])) {
-                $record[$this->columns[$i]] = $value;
-            } else {
-                throw new \LogicException("Row contains invalid column #$i\n" . var_export($row, true));
-            }
-        }
-        return $record;
-    }
+	private function mapToColumns($row)
+	{
+		$record = [];
+		foreach ($row as $i => $value) {
+			if (isset($this->columns[$i])) {
+				$record[$this->columns[$i]] = $value;
+			} else {
+				throw new \LogicException("Row contains invalid column #$i\n" . var_export($row, true));
+			}
+		}
+		return $record;
+	}
 
-    private function initColumns()
-    {
-        $this->open();
-        $this->columns = $this->getRow();
-    }
+	private function initColumns()
+	{
+		$this->open();
+		$this->columns = $this->getRow();
+	}
 
-    private function getRow()
-    {
-        return fgetcsv($this->handle);
-    }
+	private function getRow()
+	{
+		return fgetcsv($this->handle);
+	}
 
-    private function open()
-    {
-        if ($this->handle) {
-            fclose($this->handle);
-            $this->handle = null;
-        }
-        $this->handle = fopen($this->filename, 'r');
-    }
+	private function open()
+	{
+		if ($this->handle) {
+			fclose($this->handle);
+			$this->handle = null;
+		}
+		$this->handle = fopen($this->filename, 'r');
+	}
 
-    private function close()
-    {
-        if ($this->handle) {
-            fclose($this->handle);
-            $this->handle = null;
-        }
-    }
+	private function close()
+	{
+		if ($this->handle) {
+			fclose($this->handle);
+			$this->handle = null;
+		}
+	}
 }

Spacing +1 added lines, -1 removed lines

@@ -40,7 +40,7 @@
             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/DatabaseConnector.php

Indentation +125 added lines, -125 removed lines

@@ -10,129 +10,129 @@
  */
 class DatabaseConnector
 {
-    private $basePath;
-    private $isConnected = false;
-
-    public function __construct($basePath)
-    {
-        $this->basePath = $basePath;
-    }
-
-    public function connect()
-    {
-        if ($this->isConnected) {
-            return;
-        }
-
-        $this->isConnected = true;
-
-        // Necessary for SilverStripe's _ss_environment.php loader to work
-        $_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 . '/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?"
-            );
-        }
-
-        // Connect to database
-        require_once('model/DB.php');
-
-        if ($databaseConfig) {
-            DB::connect($databaseConfig);
-        } else {
-            throw new \LogicException("No \$databaseConfig found");
-        }
-    }
-
-    public function getDatabase()
-    {
-        $this->connect();
-
-        if (method_exists('DB', 'get_conn')) {
-            return DB::get_conn();
-        } else {
-            return DB::getConn();
-        }
-    }
-
-    /**
-     * Get a list of tables from the database
-     */
-    public function getTables()
-    {
-        $this->connect();
-
-        if (method_exists('DB', 'table_list')) {
-            return DB::table_list();
-        } else {
-            return DB::tableList();
-        }
-    }
-
-    /**
-     * Get a list of tables from the database
-     */
-    public function getFieldsForTable($tableName)
-    {
-        $this->connect();
-
-        if (method_exists('DB', 'field_list')) {
-            return DB::field_list($tableName);
-        } else {
-            return DB::fieldList($tableName);
-        }
-    }
-
-    /**
-     * Save the named table to the given table write
-     */
-    public function saveTable($tableName, TableWriter $writer)
-    {
-        $query = $this->getDatabase()->query("SELECT * FROM \"$tableName\"");
-
-        foreach ($query as $record) {
-            $writer->writeRecord($record);
-        }
-
-        $writer->finish();
-    }
-
-    /**
-     * Save the named table to the given table write
-     */
-    public function loadTable($tableName, TableReader $reader)
-    {
-        $this->getDatabase()->clearTable($tableName);
-
-        $fields = $this->getFieldsForTable($tableName);
-
-        foreach ($reader as $record) {
-            foreach ($record as $k => $v) {
-                if (!isset($fields[$k])) {
-                    unset($record[$k]);
-                }
-            }
-            // TODO: Batch records
-            $manipulation = [
-                $tableName => [
-                    'command' => 'insert',
-                    'fields' => $record,
-                ],
-            ];
-            DB::manipulate($manipulation);
-        }
-    }
+	private $basePath;
+	private $isConnected = false;
+
+	public function __construct($basePath)
+	{
+		$this->basePath = $basePath;
+	}
+
+	public function connect()
+	{
+		if ($this->isConnected) {
+			return;
+		}
+
+		$this->isConnected = true;
+
+		// Necessary for SilverStripe's _ss_environment.php loader to work
+		$_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 . '/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?"
+			);
+		}
+
+		// Connect to database
+		require_once('model/DB.php');
+
+		if ($databaseConfig) {
+			DB::connect($databaseConfig);
+		} else {
+			throw new \LogicException("No \$databaseConfig found");
+		}
+	}
+
+	public function getDatabase()
+	{
+		$this->connect();
+
+		if (method_exists('DB', 'get_conn')) {
+			return DB::get_conn();
+		} else {
+			return DB::getConn();
+		}
+	}
+
+	/**
+	 * Get a list of tables from the database
+	 */
+	public function getTables()
+	{
+		$this->connect();
+
+		if (method_exists('DB', 'table_list')) {
+			return DB::table_list();
+		} else {
+			return DB::tableList();
+		}
+	}
+
+	/**
+	 * Get a list of tables from the database
+	 */
+	public function getFieldsForTable($tableName)
+	{
+		$this->connect();
+
+		if (method_exists('DB', 'field_list')) {
+			return DB::field_list($tableName);
+		} else {
+			return DB::fieldList($tableName);
+		}
+	}
+
+	/**
+	 * Save the named table to the given table write
+	 */
+	public function saveTable($tableName, TableWriter $writer)
+	{
+		$query = $this->getDatabase()->query("SELECT * FROM \"$tableName\"");
+
+		foreach ($query as $record) {
+			$writer->writeRecord($record);
+		}
+
+		$writer->finish();
+	}
+
+	/**
+	 * Save the named table to the given table write
+	 */
+	public function loadTable($tableName, TableReader $reader)
+	{
+		$this->getDatabase()->clearTable($tableName);
+
+		$fields = $this->getFieldsForTable($tableName);
+
+		foreach ($reader as $record) {
+			foreach ($record as $k => $v) {
+				if (!isset($fields[$k])) {
+					unset($record[$k]);
+				}
+			}
+			// TODO: Batch records
+			$manipulation = [
+				$tableName => [
+					'command' => 'insert',
+					'fields' => $record,
+				],
+			];
+			DB::manipulate($manipulation);
+		}
+	}
 }

Spacing +8 added lines, -8 removed lines

@@ -27,22 +27,22 @@
         $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. " .
+                "No framework/core/Core.php or sapphire/core/Core.php included in project. ".
                 "Perhaps $this->basePath is not a SilverStripe project?"
             );
         }

src/DataExtractor/TableReader.php

Indentation +10 added lines, -10 removed lines

@@ -4,15 +4,15 @@
 
 interface TableReader extends \IteratorAggregate
 {
-    /**
-     * Return an iterator that returns each record of the table reader as a map.
-     * @return Iterator
-     */
-    public function getIterator();
+	/**
+	 * Return an iterator that returns each record of the table reader as a map.
+	 * @return Iterator
+	 */
+	public function getIterator();
 
-    /**
-     * Return the names of the the columns in this table
-     * @return array The column names
-     */
-    public function getColumns();
+	/**
+	 * Return the names of the the columns in this table
+	 * @return array The column names
+	 */
+	public function getColumns();
 }