gggeek / db-3v4l

app/src/Command/UserDrop.php

Spacing +3 added lines, -3 removed lines

@@ -50,7 +50,7 @@ 
         }
 
         $userToDropSpecs = [];
-        foreach($instanceList as $instanceName => $instanceSpecs) {
+        foreach ($instanceList as $instanceName => $instanceSpecs) {
             $userToDropSpecs[$instanceName] = [
                 'user' => $userName
             ];
@@ -64,7 +64,7 @@ 
 
         $this->writeResults($results, $time);
 
-        return (int)$results['failed'];
+        return (int) $results['failed'];
     }
 
     /**
@@ -79,7 +79,7 @@ 
         return $this->executeSqlAction(
             $instanceList,
             'Dropping of user',
-            function ($schemaManager, $instanceName) use ($userToDropSpecs, $ifExists) {
+            function($schemaManager, $instanceName) use ($userToDropSpecs, $ifExists) {
                 $dbConnectionSpec = $userToDropSpecs[$instanceName];
                 /** @var DatabaseSchemaManager $schemaManager */
                 return $schemaManager->getDropUserSqlAction(

app/src/Command/InstanceList.php

Spacing +4 added lines, -4 removed lines

@@ -37,7 +37,7 @@ 
         $result = $this->listInstances($instanceList);
 
         $extraResults = $this->listDatabasesVersion($instanceList)['data'];
-        foreach($result as $instanceName => $instanceDesc) {
+        foreach ($result as $instanceName => $instanceDesc) {
             if (isset($extraResults[$instanceName])) {
                 $result[$instanceName]['version'] = $extraResults[$instanceName];
             }
@@ -56,7 +56,7 @@ 
     protected function listInstances($instanceList)
     {
         $out = [];
-        foreach($instanceList as $instanceName => $connectionSpec) {
+        foreach ($instanceList as $instanceName => $connectionSpec) {
             //$connectionSpec = $this->dbConfigurationManager->getInstanceConfiguration($instanceName);
             $out[$instanceName] = [
                 'vendor' => $connectionSpec['vendor'],
@@ -71,7 +71,7 @@ 
         return $this->executeSqlAction(
             $instanceList,
             'Getting database version information',
-            function ($schemaManager, $instanceName) {
+            function($schemaManager, $instanceName) {
                 /** @var DatabaseSchemaManager $schemaManager */
                 return $schemaManager->getRetrieveVersionInfoSqlAction();
             }
@@ -101,7 +101,7 @@ 
             file_put_contents($this->outputFile, $data);
             $this->writeln("Results saved to file {$this->outputFile}");
         } else {
-            $this->writeln($data, OutputInterface::VERBOSITY_QUIET,  OutputInterface::OUTPUT_RAW);
+            $this->writeln($data, OutputInterface::VERBOSITY_QUIET, OutputInterface::OUTPUT_RAW);
         }
 
     }

app/src/Service/DatabaseConfigurationManager.php

Spacing +4 added lines, -4 removed lines

@@ -29,13 +29,13 @@ 
         }
 
         $names = [];
-        foreach(array_keys($this->instanceList) as $name) {
+        foreach (array_keys($this->instanceList) as $name) {
 
             if (empty($includeFilter)) {
                 $include = true;
             } else {
                 $include = false;
-                foreach($includeFilter as $filter) {
+                foreach ($includeFilter as $filter) {
                     if (fnmatch($filter, $name)) {
                         $include = true;
                         break;
@@ -44,7 +44,7 @@ 
             }
 
             if ($include && !empty($excludeFilter)) {
-                foreach($excludeFilter as $filter) {
+                foreach ($excludeFilter as $filter) {
                     if (fnmatch($filter, $name)) {
                         $include = false;
                         break;
@@ -81,7 +81,7 @@ 
     public function getInstancesConfiguration(array $instanceNames)
     {
         $instancesDefinitions = [];
-        foreach($instanceNames as $instanceName)
+        foreach ($instanceNames as $instanceName)
         {
             $instancesDefinitions[$instanceName] = $this->getInstanceConfiguration($instanceName);
         }

app/src/Command/SqlShell.php

Spacing +1 added lines, -1 removed lines

@@ -53,7 +53,7 @@
         }
         $executor = $this->executorFactory->createForkedExecutor($instanceName, $dbConnectionSpec, NativeClient::EXECUTION_STRATEGY, false);
 
-        if (! $executor instanceof ShellExecutor) {
+        if (!$executor instanceof ShellExecutor) {
             throw new \Exception("Can not start an interactive shell for databases of type '{$dbConnectionSpec['vendor']}'");
         }
 

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

Spacing +7 added lines, -7 removed lines

@@ -51,18 +51,18 @@ 
         $options = [
             'bin/dbconsole',
             'sql:execute',
-            '--only-instances=' . $this->instanceName,
+            '--only-instances='.$this->instanceName,
             '--execute-in-process',
-            '--execution-strategy=' . static::EXECUTION_STRATEGY,
+            '--execution-strategy='.static::EXECUTION_STRATEGY,
             '--output-type=json',
         ];
 
         switch ($action) {
             case self::EXECUTE_COMMAND:
-                $options[] = '--sql=' . $sqlOrFilename;
+                $options[] = '--sql='.$sqlOrFilename;
                 break;
             case self::EXECUTE_FILE:
-                $options[] = '--file=' . $sqlOrFilename;
+                $options[] = '--file='.$sqlOrFilename;
                 break;
             default:
                 throw new \OutOfBoundsException('Unsupported action: $action');
@@ -72,13 +72,13 @@ 
 
         if ($instanceConfiguration != $this->databaseConfiguration) {
             if (isset($this->databaseConfiguration['dbname'])) {
-                $options[] = '--database=' . $this->databaseConfiguration['dbname'];
+                $options[] = '--database='.$this->databaseConfiguration['dbname'];
             }
             if (isset($this->databaseConfiguration['user'])) {
-                $options[] = '--user=' . $this->databaseConfiguration['user'];
+                $options[] = '--user='.$this->databaseConfiguration['user'];
             }
             if (isset($this->databaseConfiguration['password'])) {
-                $options[] = '--password=' . $this->databaseConfiguration['password'];
+                $options[] = '--password='.$this->databaseConfiguration['password'];
             }
         }
 

app/admin/public/index.php

Spacing +2 added lines, -3 removed lines

@@ -7,12 +7,11 @@
     // 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['vendor'] == 'oracle' ?
-                ('//'.$def['host'].':'.$def['port'].'/'.$def['servicename']) :
-                ($def['host'].':'.$def['port'])
+                ('//'.$def['host'].':'.$def['port'].'/'.$def['servicename']) : ($def['host'].':'.$def['port'])
             ),
             $def['vendor'].' '.$def['version'],
             str_replace(

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

Spacing +26 added lines, -26 removed lines

@@ -54,10 +54,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',
                 ];
@@ -65,7 +65,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`...
@@ -87,7 +87,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`...
@@ -98,19 +98,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;
 
@@ -119,7 +119,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'];
                 }
@@ -133,22 +133,22 @@ 
                 /// @todo disable execution of dangerous (or all) SQLPLUS commands.
                 ///       See the list at https://docs.oracle.com/en/database/oracle/oracle-database/18/sqpug/SQL-Plus-command-reference.html#GUID-177F24B7-D154-4F8B-A05B-7568079800C6
                 $command = 'sqlplus';
-                $connectionIdentifier = '//' . $this->databaseConfiguration['host'] .
-                    ($this->databaseConfiguration['port'] != '' ?  ':' . $this->databaseConfiguration['port'] : '');
+                $connectionIdentifier = '//'.$this->databaseConfiguration['host'].
+                    ($this->databaseConfiguration['port'] != '' ? ':'.$this->databaseConfiguration['port'] : '');
                 // nb: for oracle, if we use pdbs to map 'databases', they get a new service name
                 /// @todo allow support for _not_ doing that, and using schemas as 'databases'
                 if (isset($this->databaseConfiguration['servicename'])) {
-                    $connectionIdentifier .= '/' . $this->databaseConfiguration['servicename'];
+                    $connectionIdentifier .= '/'.$this->databaseConfiguration['servicename'];
                 } else {
                     if ($this->databaseConfiguration['dbname'] != '') {
-                        $connectionIdentifier .= '/' . $this->databaseConfiguration['dbname'];
+                        $connectionIdentifier .= '/'.$this->databaseConfiguration['dbname'];
                     }
                 }
                 $options = [
                     '-L', // 'attempts to log in just once, instead of reprompting on error'
                     '-NOLOGINTIME',
                     '-S',
-                    $this->databaseConfiguration['user'] . '/' . $this->databaseConfiguration['password'] . '@' . $connectionIdentifier,
+                    $this->databaseConfiguration['user'].'/'.$this->databaseConfiguration['password'].'@'.$connectionIdentifier,
                 ];
                 /// @todo make this optional somehow / allow SYSOPER as alternative
                 if (strtolower($this->databaseConfiguration['user']) === 'sys') {
@@ -158,10 +158,10 @@ 
                 if ($action == self::EXECUTE_FILE) {
                     /// @todo wouldn't it be better to create another temp file with prefixed the sqlplus commands?
                     //$options[] = '@' . $sqlOrFilename;
-                    $sqlOrFilename = "WHENEVER OSERROR EXIT FAILURE;\nWHENEVER SQLERROR EXIT SQL.SQLCODE;\nSET PAGESIZE 50000;\nSET FEEDBACK OFF;\n" . file_get_contents($sqlOrFilename);
+                    $sqlOrFilename = "WHENEVER OSERROR EXIT FAILURE;\nWHENEVER SQLERROR EXIT SQL.SQLCODE;\nSET PAGESIZE 50000;\nSET FEEDBACK OFF;\n".file_get_contents($sqlOrFilename);
                     $action = self::EXECUTE_COMMAND;
                 } else {
-                    $sqlOrFilename = "WHENEVER OSERROR EXIT FAILURE;\nWHENEVER SQLERROR EXIT SQL.SQLCODE;\nSET PAGESIZE 50000;\nSET FEEDBACK OFF;\n" . $sqlOrFilename;
+                    $sqlOrFilename = "WHENEVER OSERROR EXIT FAILURE;\nWHENEVER SQLERROR EXIT SQL.SQLCODE;\nSET PAGESIZE 50000;\nSET FEEDBACK OFF;\n".$sqlOrFilename;
                 }
 
                 break;
@@ -174,11 +174,11 @@ 
 
         /// @todo investigate: for psql is this better done via --file ?
         if ($action == self::EXECUTE_FILE && $clientType != 'sqlsrv' && $clientType != 'sqlplus') {
-            $commandLine .= ' < ' . escapeshellarg($sqlOrFilename);
+            $commandLine .= ' < '.escapeshellarg($sqlOrFilename);
         }
 
         if ($action == self::EXECUTE_COMMAND && $clientType == 'sqlplus') {
-            $commandLine .= " << 'SQLEOF'\n" . $sqlOrFilename . "\nSQLEOF";
+            $commandLine .= " << 'SQLEOF'\n".$sqlOrFilename."\nSQLEOF";
         }
 
         $process = Process::fromShellCommandline($commandLine, null, $env);
@@ -225,7 +225,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);
                 }
@@ -235,7 +235,7 @@ 
                 array_shift($output); // empty line
                 array_shift($output); // headers
                 array_shift($output); // '---'
-                foreach($output as &$line) {
+                foreach ($output as &$line) {
                     $line = trim($line);
                 }
                 return $output;
@@ -244,7 +244,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;
@@ -257,7 +257,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/DatabaseManager/PostgreSQL.php

Spacing +6 added lines, -6 removed lines

@@ -17,7 +17,7 @@ 
     {
         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);
             }
@@ -40,11 +40,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);
@@ -82,7 +82,7 @@ 
     {
         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);
             }
@@ -115,7 +115,7 @@ 
     {
         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);
             }
@@ -130,7 +130,7 @@ 
     {
         return new Command(
             'SHOW server_version;',
-            function ($output, $executor) {
+            function($output, $executor) {
                 /** @var Executor $executor */
                 return $executor->resultSetToArray($output)[0];
             }

app/src/Core/DatabaseManager/SQLServer.php

Spacing +6 added lines, -6 removed lines

@@ -19,7 +19,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);
             }
@@ -45,7 +45,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;";
@@ -95,7 +95,7 @@ 
     {
         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);
             }
@@ -132,7 +132,7 @@ 
     {
         return new Command(
             'SELECT name AS Collation FROM fn_helpcollations();',
-            function ($output, $executor) {
+            function($output, $executor) {
                 /** @var Executor $executor */
                 return $executor->resultSetToArray($output);
             }
@@ -147,12 +147,12 @@ 
     {
         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];
             }
         );
     }