gggeek / db-3v4l

app/admin/public/index.php

Spacing +1 added lines, -1 removed lines

@@ -7,7 +7,7 @@
     // Avoid bootstrapping Symfony for something so trivial...
     $config = \Symfony\Component\Yaml\Yaml::parseFile(dirname(dirname(__DIR__)).'/config/services.yaml');
     $servers = [];
-    foreach($config['parameters']['db3v4l.database_instances'] as $instance => $def) {
+    foreach ($config['parameters']['db3v4l.database_instances'] as $instance => $def) {
         $servers[$instance] = new AdminerLoginServerEnhanced(
             $def['host'].':'.$def['port'],
             $def['vendor'].' '.$def['version'],

app/src/Core/SqlExecutor/Forked/NativeClient.php

Spacing +17 added lines, -17 removed lines

@@ -55,10 +55,10 @@ 
             case 'mysql':
                 $command = 'mysql';
                 $options = [
-                    '--host=' . $this->databaseConfiguration['host'],
-                    '--port=' . $this->databaseConfiguration['port'] ?? '3306',
-                    '--user=' . $this->databaseConfiguration['user'],
-                    '-p' . $this->databaseConfiguration['password'],
+                    '--host='.$this->databaseConfiguration['host'],
+                    '--port='.$this->databaseConfiguration['port'] ?? '3306',
+                    '--user='.$this->databaseConfiguration['user'],
+                    '-p'.$this->databaseConfiguration['password'],
                     '--binary-mode', // 'It also disables all mysql commands except charset and delimiter in non-interactive mode (for input piped to mysql or loaded using the source command)'
                     '-t',
                 ];
@@ -66,7 +66,7 @@ 
                     $options[] = $this->databaseConfiguration['dbname'];
                 }
                 if ($action == self::EXECUTE_COMMAND) {
-                    $options[] = '--execute=' . $sqlOrFilename;
+                    $options[] = '--execute='.$sqlOrFilename;
                 }
                // $env = [
                     // problematic when wrapping the process in a call to `time`...
@@ -88,7 +88,7 @@ 
                 // NB: this triggers a different behaviour that piping multiple commands to stdin, namely
                 // it wraps all of the commands in a transaction and allows either sql commands or a single meta-command
                 if ($action == self::EXECUTE_COMMAND) {
-                    $options[] = '--command=' . $sqlOrFilename;
+                    $options[] = '--command='.$sqlOrFilename;
                 }
                 //$env = [
                     // problematic when wrapping the process in a call to `time`...
@@ -99,19 +99,19 @@ 
             case 'sqlcmd':
                 $command = 'sqlcmd';
                 $options = [
-                    '-S' . $this->databaseConfiguration['host'] . ($this->databaseConfiguration['port'] != '' ?  ',' . $this->databaseConfiguration['port'] : ''),
-                    '-U' . $this->databaseConfiguration['user'],
-                    '-P' . $this->databaseConfiguration['password'],
+                    '-S'.$this->databaseConfiguration['host'].($this->databaseConfiguration['port'] != '' ? ','.$this->databaseConfiguration['port'] : ''),
+                    '-U'.$this->databaseConfiguration['user'],
+                    '-P'.$this->databaseConfiguration['password'],
                     '-r1',
                     '-b',
                 ];
                 if (isset($this->databaseConfiguration['dbname'])) {
-                    $options[] = '-d' . $this->databaseConfiguration['dbname'];
+                    $options[] = '-d'.$this->databaseConfiguration['dbname'];
                 }
                 if ($action == self::EXECUTE_FILE) {
-                    $options[] = '-i' . $sqlOrFilename;
+                    $options[] = '-i'.$sqlOrFilename;
                 } elseif ($action == self::EXECUTE_COMMAND) {
-                    $options[] = '-Q' . $sqlOrFilename;
+                    $options[] = '-Q'.$sqlOrFilename;
                 }
                 break;
 
@@ -120,7 +120,7 @@ 
                 // 'path' is the full path to the 'master' db (for Doctrine compatibility).
                 //  non-master dbs are supposed to reside in the same directory
                 if (isset($this->databaseConfiguration['dbname'])) {
-                    $options[] = dirname($this->databaseConfiguration['path']) . '/' . $this->databaseConfiguration['dbname'] . '.sqlite';
+                    $options[] = dirname($this->databaseConfiguration['path']).'/'.$this->databaseConfiguration['dbname'].'.sqlite';
                 } else {
                     $options[] = $this->databaseConfiguration['path'];
                 }
@@ -143,7 +143,7 @@ 
 
         /// @todo investigate: for psql is this better done via --file ?
         if ($action == self::EXECUTE_FILE && $clientType != 'sqlsrv') {
-            $commandLine .= ' < ' . escapeshellarg($sqlOrFilename);
+            $commandLine .= ' < '.escapeshellarg($sqlOrFilename);
         }
 
         return new Process($commandLine, null, $env);
@@ -181,7 +181,7 @@ 
                 array_shift($output); // headers
                 array_shift($output); // '+--+'
                 array_pop($output); // '+--+'
-                foreach($output as &$line) {
+                foreach ($output as &$line) {
                     $line = trim($line, '|');
                     $line = trim($line);
                 }
@@ -192,7 +192,7 @@ 
                 array_shift($output); // headers
                 array_shift($output); // '---'
                 //array_pop($output); // '(N rows)'
-                foreach($output as &$line) {
+                foreach ($output as &$line) {
                     $line = trim($line);
                 }
                 return $output;
@@ -205,7 +205,7 @@ 
                 array_shift($output); // '---'
                 array_pop($output); // blank line
                 array_pop($output); // '(N rows affected)'
-                foreach($output as &$line) {
+                foreach ($output as &$line) {
                     $line = trim($line);
                 }
                 return $output;

app/src/Core/SqlExecutor/Forked/TimedExecutor.php

Spacing +3 added lines, -3 removed lines

@@ -29,7 +29,7 @@ 
         // wrap in a `time` call
         $this->timingFile = tempnam(sys_get_temp_dir(), 'db3v4l_');
         $process->setCommandLine(
-            $this->timeCmd . ' ' . escapeshellarg('--output=' . $this->timingFile) . ' ' . escapeshellarg('--format=%M %e') . ' '
+            $this->timeCmd.' '.escapeshellarg('--output='.$this->timingFile).' '.escapeshellarg('--format=%M %e').' '
             . $process->getCommandLine());
         return $process;
     }
@@ -41,7 +41,7 @@ 
         // wrap in a `time` call
         $this->timingFile = tempnam(sys_get_temp_dir(), 'db3v4l_');
         $process->setCommandLine(
-            $this->timeCmd . ' ' . escapeshellarg('--output=' . $this->timingFile) . ' ' . escapeshellarg('--format=%M %e') . ' '
+            $this->timeCmd.' '.escapeshellarg('--output='.$this->timingFile).' '.escapeshellarg('--format=%M %e').' '
             . $process->getCommandLine());
 
         return $process;
@@ -70,7 +70,7 @@ 
         }
 
         if ($onceIsEnough) {
-            unlink ($this->timingFile);
+            unlink($this->timingFile);
         }
 
         return $results;

app/src/Core/DatabaseSchemaManager.php

Spacing +26 added lines, -26 removed lines

@@ -47,7 +47,7 @@ 
             case 'mariadb':
             case 'mysql':
                 $statements = [
-                    "CREATE DATABASE `$dbName`" . ($collation !== null ? " CHARACTER SET $collation" : '') . ';'
+                    "CREATE DATABASE `$dbName`".($collation !== null ? " CHARACTER SET $collation" : '').';'
                 ];
                 if ($userName != '') {
                     $statements[] = "CREATE USER '$userName'@'%' IDENTIFIED BY '$password';";
@@ -62,7 +62,7 @@ 
                     // Also, by default connections are in autocommit mode...
                     // And yet, we need a GO to commit the db creation...
                     "SET QUOTED_IDENTIFIER ON;",
-                    "CREATE DATABASE \"$dbName\"" . ($collation !== null ? " COLLATE $collation" : '') . ';'
+                    "CREATE DATABASE \"$dbName\"".($collation !== null ? " COLLATE $collation" : '').';'
                 ];
                 if ($userName != '') {
                     $statements[] = "CREATE LOGIN \"$userName\" WITH PASSWORD = '$password', DEFAULT_DATABASE = \"$dbName\", CHECK_POLICY = OFF, CHECK_EXPIRATION = OFF;";
@@ -79,11 +79,11 @@ 
                 $statements = [
                     // q: do we need to add 'TEMPLATE template0' ?
                     //    see f.e. https://www.vertabelo.com/blog/collations-in-postgresql/
-                    "CREATE DATABASE \"$dbName\"" . ($collation !== null ? " ENCODING $collation" : '') . ';',
+                    "CREATE DATABASE \"$dbName\"".($collation !== null ? " ENCODING $collation" : '').';',
                 ];
                 if ($userName != '') {
                     $statements[] = "COMMIT;";
-                    $statements[] = "CREATE USER \"$userName\" WITH PASSWORD '$password'" . ';';
+                    $statements[] = "CREATE USER \"$userName\" WITH PASSWORD '$password'".';';
                     $statements[] = "GRANT ALL ON DATABASE \"$dbName\" TO \"$userName\""; // q: should we avoid granting CREATE?
                 }
                 return new Command($statements);
@@ -91,7 +91,7 @@ 
             case 'sqlite':
                 /// @todo this does not support creation of the new db with a different character encoding...
                 ///       see https://stackoverflow.com/questions/21348459/set-pragma-encoding-utf-16-for-main-database-in-sqlite
-                $filename = dirname($this->databaseConfiguration['path']) . '/' . $dbName . '.sqlite';
+                $filename = dirname($this->databaseConfiguration['path']).'/'.$dbName.'.sqlite';
                 return new Command(
                     "ATTACH '$filename' AS \"$dbName\";"
                 );
@@ -157,7 +157,7 @@ 
                 return new Command($statements);
 
             case 'sqlite':
-                $filename = dirname($this->databaseConfiguration['path']) . '/' . $dbName . '.sqlite';
+                $filename = dirname($this->databaseConfiguration['path']).'/'.$dbName.'.sqlite';
                 return new Command(
                     null,
                     function() use($filename, $dbName, $ifExists) {
@@ -242,13 +242,13 @@ 
             case 'mysql':
                 return new Command(
                     'SHOW COLLATION;',
-                    function ($output, $executor) {
+                    function($output, $executor) {
                         /** @var Executor $executor */
                         $lines = $executor->resultSetToArray($output);
                         $out = [];
-                        foreach($lines as $line) {
+                        foreach ($lines as $line) {
                             $parts = explode("|", $line, 3);
-                            $out[] = trim($parts[0]) . ' (' . trim($parts[1]) .')';
+                            $out[] = trim($parts[0]).' ('.trim($parts[1]).')';
                         }
                         return $out;
                     }
@@ -259,7 +259,7 @@ 
             case 'postgresql':
                 return new Command(
                     'SELECT collname AS Collation FROM pg_collation ORDER BY collname',
-                    function ($output, $executor) {
+                    function($output, $executor) {
                         /** @var Executor $executor */
                         return $executor->resultSetToArray($output);
                     }
@@ -269,7 +269,7 @@ 
                 return new Command(
                     null,
                     /// @todo list the supported utf16 variants as soon as allow using them
-                    function () {
+                    function() {
                         return [];
                     }
                 );
@@ -289,7 +289,7 @@ 
             case 'mssql':
                 return new Command(
                     'SELECT name AS Collation FROM fn_helpcollations();',
-                    function ($output, $executor) {
+                    function($output, $executor) {
                         /** @var Executor $executor */
                         return $executor->resultSetToArray($output);
                     }
@@ -315,7 +315,7 @@ 
                 return new Command(
                     /// @todo use 'SHOW DATABASES' for versions < 5
                     "SELECT SCHEMA_NAME AS 'Database' FROM information_schema.SCHEMATA ORDER BY SCHEMA_NAME;",
-                    function ($output, $executor) {
+                    function($output, $executor) {
                         /** @var Executor $executor */
                         return $executor->resultSetToArray($output);
                     }
@@ -326,7 +326,7 @@ 
                     // the way we create it, the user account is contained in the db
                     // @todo add "WHERE name NOT IN ('master', 'tempdb', 'model', 'msdb')" ?
                     "SELECT name AS 'Database' FROM sys.databases ORDER BY name;",
-                    function ($output, $executor) {
+                    function($output, $executor) {
                         /** @var Executor $executor */
                         return $executor->resultSetToArray($output);
                     }
@@ -337,20 +337,20 @@ 
             case 'postgresql':
                 return new Command(
                     'SELECT datname AS "Database" FROM pg_database ORDER BY datname;',
-                    function ($output, $executor) {
+                    function($output, $executor) {
                         /** @var Executor $executor */
                         return $executor->resultSetToArray($output);
                     }
                 );
 
             case 'sqlite':
-                $fileGlob = dirname($this->databaseConfiguration['path']) . '/*.sqlite';
+                $fileGlob = dirname($this->databaseConfiguration['path']).'/*.sqlite';
                 return new Command(
                     null,
                     function() use ($fileGlob) {
                         $out = [];
                         foreach (glob($fileGlob) as $filename) {
-                            $out[] =  basename($filename);
+                            $out[] = basename($filename);
                         }
                         return $out;
                     }
@@ -374,7 +374,7 @@ 
             case 'mysql':
                 return new Command(
                     'SELECT DISTINCT User FROM mysql.user ORDER BY User;',
-                    function ($output, $executor) {
+                    function($output, $executor) {
                         /** @var Executor $executor */
                         return $executor->resultSetToArray($output);
                     }
@@ -383,7 +383,7 @@ 
             case 'mssql':
                 return new Command(
                     "SELECT name AS 'User' FROM sys.sql_logins ORDER BY name",
-                    function ($output, $executor) {
+                    function($output, $executor) {
                         /** @var Executor $executor */
                         return $executor->resultSetToArray($output);
                     }
@@ -394,7 +394,7 @@ 
             case 'postgresql':
                 return new Command(
                     'SELECT usename AS "User" FROM pg_catalog.pg_user ORDER BY usename;',
-                    function ($output, $executor) {
+                    function($output, $executor) {
                         /** @var Executor $executor */
                         return $executor->resultSetToArray($output);
                     }
@@ -403,7 +403,7 @@ 
             case 'sqlite':
                 return new Command(
                     null,
-                    function () {
+                    function() {
                         // since sqlite does not support users, null seems more appropriate than an empty array...
                         return null;
                     }
@@ -426,7 +426,7 @@ 
             case 'mysql':
                 return new Command(
                     'SHOW VARIABLES LIKE "version";',
-                    function ($output, $executor) {
+                    function($output, $executor) {
                         /** @var Executor $executor */
                         $line = $executor->resultSetToArray($output)[0];
                         $parts = explode('|', $line);
@@ -439,7 +439,7 @@ 
             case 'postgresql':
                 return new Command(
                     'SHOW server_version;',
-                    function ($output, $executor) {
+                    function($output, $executor) {
                         /** @var Executor $executor */
                         return $executor->resultSetToArray($output)[0];
                     }
@@ -448,7 +448,7 @@ 
             case 'sqlite':
                 return new Command(
                     "select sqlite_version();",
-                    function ($output, $executor) {
+                    function($output, $executor) {
                         /** @var Executor $executor */
                         return $executor->resultSetToArray($output)[0];
                     }
@@ -457,12 +457,12 @@ 
             case 'mssql':
                 return new Command(
                     "SELECT @@version",
-                    function ($output, $executor) {
+                    function($output, $executor) {
                         /** @var Executor $executor */
                         $output = $executor->resultSetToArray($output);
                         $line = $output[0];
                         preg_match('/Microsoft SQL Server +([^ ]+) +([^ ]+) +/', $line, $matches);
-                        return $matches[1] . ' ' . $matches[2];
+                        return $matches[1].' '.$matches[2];
                     }
                 );
 

app/src/Service/ProcessManager.php

Spacing +2 added lines, -2 removed lines

@@ -28,7 +28,7 @@ 
         $currentProcesses = array_splice($processesQueue, 0, $maxParallel);
         // start the initial stack of processes
         foreach ($currentProcesses as $idx => $process) {
-            $process->start(function ($type, $buffer) use ($callback, $idx, $process) {
+            $process->start(function($type, $buffer) use ($callback, $idx, $process) {
                 if ($callback) {
                     $callback($type, $buffer, $idx, $process);
                 }
@@ -44,7 +44,7 @@ 
                     // directly add and start new process after the previous finished
                     if (count($processesQueue) > 0) {
                         $nextProcess = array_shift($processesQueue);
-                        $nextProcess->start(function ($type, $buffer) use ($callback, $nextProcess) {
+                        $nextProcess->start(function($type, $buffer) use ($callback, $nextProcess) {
                             if ($callback) {
                                 $callback($type, $buffer, $nextProcess);
                             }

app/src/Controller/DocController.php

Spacing +3 added lines, -3 removed lines

@@ -18,8 +18,8 @@ 
      */
     public function list()
     {
-        $docs = glob($this->docRoot . '/*.md');
-        array_walk($docs, function(&$path, $key) {$path = basename($path);});
+        $docs = glob($this->docRoot.'/*.md');
+        array_walk($docs, function(&$path, $key) {$path = basename($path); });
         return $this->render('Doc/list.html.twig', ['docs' => $docs]);
     }
 
@@ -34,7 +34,7 @@ 
         // sanitize
         $filename = basename($filename);
 
-        $filename = $this->docRoot . '/' . $filename;
+        $filename = $this->docRoot.'/'.$filename;
 
         if (!is_file($filename)) {
             throw $this->createNotFoundException("The doc file '$filename' does not exist");

app/src/Controller/InstanceController.php

Spacing +1 added lines, -1 removed lines

@@ -17,7 +17,7 @@
     public function list(DatabaseConfigurationManager $configurationManager)
     {
         $instances = [];
-        foreach($configurationManager->listInstances() as $instanceName) {
+        foreach ($configurationManager->listInstances() as $instanceName) {
             $instances[$instanceName] = $configurationManager->getInstanceConfiguration($instanceName);
         }
         return $this->render('Instance/list.html.twig', ['instances' => $instances]);

app/src/Command/DatabaseDrop.php

Spacing +2 added lines, -2 removed lines

@@ -56,7 +56,7 @@ 
         }
 
         $dbToDropSpecs = [];
-        foreach($instanceList as $instanceName => $instanceSpecs) {
+        foreach ($instanceList as $instanceName => $instanceSpecs) {
             $dbToDropSpecs[$instanceName] = [
                 'dbname' => $dbName
             ];
@@ -74,6 +74,6 @@ 
 
         $this->writeResults($results, $time);
 
-        return (int)$results['failed'];
+        return (int) $results['failed'];
     }
 }

app/src/Command/DatabaseCreate.php

Spacing +2 added lines, -2 removed lines

@@ -74,7 +74,7 @@ 
         }
 
         $newDbSpecs = [];
-        foreach($instanceList as $instanceName => $instanceSpecs) {
+        foreach ($instanceList as $instanceName => $instanceSpecs) {
             $newDbSpecs[$instanceName] = [
                 'dbname' => $dbName
             ];
@@ -93,6 +93,6 @@ 
 
         $this->writeResults($results, $time);
 
-        return (int)$results['failed'];
+        return (int) $results['failed'];
     }
 }