silverstripe / sspak

tests/DataExtractor/CsvTableReaderTest.php

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

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

src/FilesystemEntity.php

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

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

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

Spacing +2 added lines, -2 removed lines

@@ -33,9 +33,9 @@
                 $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;
         }

src/Args.php

Spacing +4 added lines, -4 removed lines

@@ -63,8 +63,8 @@ 
      */
     public function sudo($optionalPrefix)
     {
-        if (!empty($this->namedArgs[$optionalPrefix . '-sudo'])) {
-            return $this->namedArgs[$optionalPrefix . '-sudo'];
+        if (!empty($this->namedArgs[$optionalPrefix.'-sudo'])) {
+            return $this->namedArgs[$optionalPrefix.'-sudo'];
         } elseif (!empty($this->namedArgs['sudo'])) {
             return $this->namedArgs['sudo'];
         } else {
@@ -79,7 +79,7 @@ 
     {
         // 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]);
         }
 
@@ -93,7 +93,7 @@ 
     public function requireUnnamed($items)
     {
         if (sizeof($this->unnamedArgs) < sizeof($items)) {
-            echo "Usage: {$_SERVER['argv'][0]} " . $this->action . " (";
+            echo "Usage: {$_SERVER['argv'][0]} ".$this->action." (";
             echo implode(") (", $items);
             echo ")\n";
             throw new Exception('Arguments missing.');

src/Webroot.php

Spacing +12 added lines, -12 removed lines

@@ -37,10 +37,10 @@ 
         global $snifferFileContent;
 
         if (!$snifferFileContent) {
-            $snifferFileContent = file_get_contents(PACKAGE_ROOT . 'src/sspak-sniffer.php');
+            $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));
@@ -67,7 +67,7 @@ 
             }
             // 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) {
@@ -76,7 +76,7 @@ 
                 $password = fgets($stdin);
 
                 return $this->exec(
-                    "sudo -S -p '' -u " . escapeshellarg($this->sudo) . " " . $command,
+                    "sudo -S -p '' -u ".escapeshellarg($this->sudo)." ".$command,
                     array('inputContent' => $password)
                 );
             }
@@ -98,7 +98,7 @@ 
         // 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'] . "'");
+            throw new Exception("Can't process database type '".$details['db_type']."'");
         }
 
         // Extract DB direct from sspak file
@@ -119,7 +119,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]);
@@ -128,15 +128,15 @@ 
                 $hostArg = escapeshellarg("--host=".$conf['db_server']);
             }
         }
-        $dbCommand = "create database if not exists `" . addslashes($conf['db_database']) . "`";
+        $dbCommand = "create database if not exists `".addslashes($conf['db_database'])."`";
         if ($dropdb) {
-            $dbCommand = "drop database if exists `" . addslashes($conf['db_database']) . "`; " . $dbCommand;
+            $dbCommand = "drop database if exists `".addslashes($conf['db_database'])."`; ".$dbCommand;
         }
 
         $this->exec("echo '$dbCommand' | mysql $usernameArg $passwordArg $hostArg $portArg");
 
         $stream = $sspak->readStreamForFile('database.sql.gz');
-        $this->exec("gunzip -c | sed '/^CREATE DATABASE/d;/^USE/d' | mysql --default-character-set=utf8 " .
+        $this->exec("gunzip -c | sed '/^CREATE DATABASE/d;/^USE/d' | mysql --default-character-set=utf8 ".
         "$usernameArg $passwordArg $hostArg $portArg $databaseArg", array('inputStream' => $stream));
         fclose($stream);
         return true;
@@ -151,7 +151,7 @@ 
         $hostArg = escapeshellarg("--host=".$conf['db_server']);
 
         // Create database if needed
-        $result = $this->exec("echo \"select count(*) from pg_catalog.pg_database where datname = $databaseArg\" | " .
+        $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') {
             $this->exec("$passwordArg createdb $usernameArg $hostArg $databaseArg");
@@ -181,7 +181,7 @@ 
         );
         $assetsPath = trim($assetsPathExec["output"]);
 
-        $assetsOldPath = $assetsPath . '.old';
+        $assetsOldPath = $assetsPath.'.old';
         $assetsParentArg = escapeshellarg(dirname($assetsPath));
 
         // Move existing assets to assets.old
@@ -211,7 +211,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;
     }
 }

src/SSPak.php

Spacing +18 added lines, -18 removed lines

@@ -45,14 +45,14 @@ 
                 "method" => "load",
             ),
             "saveexisting" => array(
-                "description" => "Create an .sspak file from database SQL dump and/or assets. " .
+                "description" => "Create an .sspak file from database SQL dump and/or assets. ".
                 "Does not require a SilverStripe site.",
                 "unnamedArgs" => array("sspak file"),
                 "namedArgs" => array("db", "assets"),
                 "method" => "saveexisting"
             ),
             "extract" => array(
-                "description" => "Extract an .sspak file into the current working directory. Does not require a " .
+                "description" => "Extract an .sspak file into the current working directory. Does not require a ".
                  "SilverStripe site.",
                 "unnamedArgs" => array("sspak file", "destination path"),
                 "method" => "extract"
@@ -173,7 +173,7 @@ 
         // from other formats.
         // There is no cross-platform way of checking the assets.tar.gz size without unpacking, so we assume the size
         // of database is negligible which lets us approximate the size of assets.
-        if (filesize($file) > 8*1024*1024*1024) {
+        if (filesize($file) > 8 * 1024 * 1024 * 1024) {
             $msg = <<<EOM
 
 ERROR: SSPak is unable to extract archives over 8 GB.
@@ -230,8 +230,8 @@ 
         $db = new DatabaseConnector($webroot);
 
         foreach ($db->getTables() as $table) {
-            $filename = $destPath . '/' . $table . '.csv';
-            echo $filename . "...\n";
+            $filename = $destPath.'/'.$table.'.csv';
+            echo $filename."...\n";
             touch($filename);
             $writer = new CsvTableWriter($filename);
             $db->saveTable($table, $writer);
@@ -254,9 +254,9 @@ 
         $db = new DatabaseConnector($webroot);
 
         foreach ($db->getTables() as $table) {
-            $filename = $srcPath . '/' . $table . '.csv';
+            $filename = $srcPath.'/'.$table.'.csv';
             if (file_exists($filename)) {
-                echo $filename . "...\n";
+                echo $filename."...\n";
                 $reader = new CsvTableReader($filename);
                 $db->loadTable($table, $reader);
             } else {
@@ -317,7 +317,7 @@ 
             // 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'] . "'");
+                throw new Exception("Can't process database type '".$details['db_type']."'");
             }
             $this->$dbFunction($webroot, $details, $sspak, basename($dbFile));
         }
@@ -350,7 +350,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]);
@@ -363,8 +363,8 @@ 
         $filenameArg = escapeshellarg($filename);
 
         $process = $webroot->createProcess(
-            "mysqldump --no-tablespaces --skip-opt --add-drop-table --extended-insert --create-options --quick " .
-            "--set-charset --default-character-set=utf8 --column-statistics=0 $usernameArg $passwordArg $hostArg " .
+            "mysqldump --no-tablespaces --skip-opt --add-drop-table --extended-insert --create-options --quick ".
+            "--set-charset --default-character-set=utf8 --column-statistics=0 $usernameArg $passwordArg $hostArg ".
             "$portArg $databaseArg | gzip -c"
         );
         $sspak->writeFileFromProcess($filename, $process);
@@ -398,17 +398,17 @@ 
     public function getgitremote($webroot, $sspak, $gitRemoteFile)
     {
         // Only do anything if we're copying from a git checkout
-        $gitRepo = $webroot->getPath() .'/.git';
+        $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
+                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")
+                    array('git', '--git-dir='.$gitRepo, 'config', '--get', "branch.$currentBranch.remote")
                 );
                 $remoteName = trim($output['output']);
                 if (!$remoteName) {
@@ -422,11 +422,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";
@@ -547,11 +547,11 @@ 
         $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",
+            . str_replace(array("\\", "'"), array("\\\\", "\\'"), file_get_contents($snifferFile))."';\n",
             $sspakScript
         );