gggeek / db-3v4l

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

Spacing +1 added lines, -1 removed lines

@@ -9,6 +9,6 @@
     public function buildCommandLine($command, array $arguments = array())
     {
         $arguments = array_map('escapeshellarg', $arguments);
-        return escapeshellcmd($command) . ' ' . implode(' ', $arguments);
+        return escapeshellcmd($command).' '.implode(' ', $arguments);
     }
 }

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

Indentation +1 added lines, -1 removed lines

@@ -68,7 +68,7 @@
                 if ($action == self::EXECUTE_COMMAND) {
                     $options[] = '--execute=' . $sqlOrFilename;
                 }
-               // $env = [
+                // $env = [
                     // problematic when wrapping the process in a call to `time`...
                     //'MYSQL_PWD' => $this->databaseConfiguration['password'],
                 //];

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

Braces +1 added lines, -2 removed lines

@@ -43,8 +43,7 @@
                 $this->errorOutput->setVerbosity(OutputInterface::VERBOSITY_NORMAL);
                 $this->errorOutput->writeln($message, $type);
                 $this->errorOutput->setVerbosity(OutputInterface::VERBOSITY_QUIET);
-            }
-            else
+            } else
             {
                 $this->errorOutput->writeln($message, $type);
             }

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'];
     }
 }