gggeek / db-3v4l

app/src/Command/SqlExecute.php

Spacing +13 added lines, -13 removed lines

@@ -82,13 +82,13 @@ 
 
             /// @todo inject more randomness in the username, by allowing more chars than bin2hex produces
 
-            $userName = 'db3v4l_' . substr(bin2hex(random_bytes(5)), 0, 9); // some mysql versions have a limitation of 16 chars for usernames
+            $userName = 'db3v4l_'.substr(bin2hex(random_bytes(5)), 0, 9); // some mysql versions have a limitation of 16 chars for usernames
             $password = bin2hex(random_bytes(16));
             //$dbName = bin2hex(random_bytes(31));
             $dbName = $userName; // $userName will be used as db name
 
             $tempDbSpecs = [];
-            foreach($instanceList as $instanceName => $instanceSpecs) {
+            foreach ($instanceList as $instanceName => $instanceSpecs) {
                 $tempDbSpecs[$instanceName] = [
                     'dbname' => $dbName,
                     'user' => $userName,
@@ -97,7 +97,7 @@ 
             }
 
             if (($charset = $input->getOption('charset')) != '') {
-                foreach($instanceList as $instanceName) {
+                foreach ($instanceList as $instanceName) {
                     $tempDbSpecs[$instanceName]['charset'] = $charset;
                 }
             }
@@ -124,7 +124,7 @@ 
             ];
 
             $dbConnectionSpecs = [];
-            foreach($instanceList as $instanceName => $instanceSpecs) {
+            foreach ($instanceList as $instanceName => $instanceSpecs) {
                 $dbConnectionSpecs[$instanceName] = array_merge($instanceSpecs, $dbConfig);
             }
         }
@@ -139,7 +139,7 @@ 
             if ($createDB) {
                 $results['failed'] += $creationResults['failed'];
 
-                foreach($instanceList as $instanceName  => $instanceSpecs) {
+                foreach ($instanceList as $instanceName  => $instanceSpecs) {
                     if (!isset($dbConnectionSpecs[$instanceName])) {
                         unset($instanceList[$instanceName]);
                     }
@@ -151,14 +151,14 @@ 
                 $this->executionStrategy = $previousStrategy;
             }
         } else {
-            $results = ['succeeded' => 0,  'failed' => 0, 'data' => null];
+            $results = ['succeeded' => 0, 'failed' => 0, 'data' => null];
         }
 
         $time = microtime(true) - $start;
 
         $this->writeResults($results, $time);
 
-        return (int)$results['failed'];
+        return (int) $results['failed'];
     }
 
     /**
@@ -176,11 +176,11 @@ 
         return $this->executeSqlAction(
             $dbConnectionSpecs,
             'Execution of SQL',
-            function ($schemaManager, $instanceName) use ($sql, $filename) {
+            function($schemaManager, $instanceName) use ($sql, $filename) {
                 if ($sql != null) {
                     return new Command(
                         $sql,
-                        function ($output, $executor) {
+                        function($output, $executor) {
                             /** @var TimedExecutor $executor */
                             return array_merge(['stdout' => $output], $executor->getTimingData());
                         }
@@ -193,7 +193,7 @@ 
                     }
                     return new File(
                         $realFileName,
-                        function ($output, $executor) {
+                        function($output, $executor) {
                             /** @var TimedExecutor $executor */
                             return array_merge(['stdout' => $output], $executor->getTimingData());
                         }
@@ -228,13 +228,13 @@ 
             if (trim($line) !== '') {
                 if ($type === 'err') {
                     $this->writeErrorln(
-                        '[' . $processIndex . '][' . $pid . '] ' . trim($line),
+                        '['.$processIndex.']['.$pid.'] '.trim($line),
                         OutputInterface::VERBOSITY_VERBOSE,
                         OutputInterface::OUTPUT_RAW
                     );
                 } else {
                     $this->writeln(
-                        '[' . $processIndex . '][' . $pid . '] ' . trim($line),
+                        '['.$processIndex.']['.$pid.'] '.trim($line),
                         OutputInterface::VERBOSITY_VERBOSE,
                         OutputInterface::OUTPUT_RAW
                     );
@@ -277,7 +277,7 @@ 
             return;
         }
 
-        foreach($results['data'] as $instanceName => $data) {
+        foreach ($results['data'] as $instanceName => $data) {
             $formattedData = $this->formatResults(array('data' => $data));
             $outputFile = $this->replaceDBSpecTokens($this->outputFile, $instanceName, $this->dbConfigurationManager->getInstanceConfiguration($instanceName));
             file_put_contents($outputFile, $formattedData);

app/src/Core/DatabaseSchemaManager.php

Spacing +26 added lines, -26 removed lines

@@ -49,7 +49,7 @@ 
             case 'percona':
                 /// @todo if mysql version is bigger than 8.0, add `WITH mysql_native_password`
                 $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';";
@@ -64,7 +64,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;";
@@ -81,11 +81,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);
@@ -93,7 +93,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\";"
                 );
@@ -160,7 +160,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) {
@@ -247,13 +247,13 @@ 
             case 'percona':
                 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;
                     }
@@ -264,7 +264,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);
                     }
@@ -274,7 +274,7 @@ 
                 return new Command(
                     null,
                     /// @todo list the supported utf16 variants as soon as allow using them
-                    function () {
+                    function() {
                         return [];
                     }
                 );
@@ -294,7 +294,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);
                     }
@@ -321,7 +321,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);
                     }
@@ -332,7 +332,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);
                     }
@@ -343,20 +343,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;
                     }
@@ -381,7 +381,7 @@ 
             case 'percona':
                 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);
                     }
@@ -390,7 +390,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);
                     }
@@ -401,7 +401,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);
                     }
@@ -410,7 +410,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;
                     }
@@ -434,7 +434,7 @@ 
             case 'percona':
                 return new Command(
                     'SHOW VARIABLES LIKE "version";',
-                    function ($output, $executor) {
+                    function($output, $executor) {
                         /** @var Executor $executor */
                         $line = $executor->resultSetToArray($output)[0];
                         $parts = explode('|', $line);
@@ -447,7 +447,7 @@ 
             case 'postgresql':
                 return new Command(
                     'SHOW server_version;',
-                    function ($output, $executor) {
+                    function($output, $executor) {
                         /** @var Executor $executor */
                         return $executor->resultSetToArray($output)[0];
                     }
@@ -456,7 +456,7 @@ 
             case 'sqlite':
                 return new Command(
                     "select sqlite_version();",
-                    function ($output, $executor) {
+                    function($output, $executor) {
                         /** @var Executor $executor */
                         return $executor->resultSetToArray($output)[0];
                     }
@@ -465,12 +465,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];
                     }
                 );