gggeek / db-3v4l

app/src/Command/SQLExecutingCommand.php

Spacing +13 added lines, -13 removed lines

@@ -49,8 +49,8 @@ 
     protected function addCommonOptions()
     {
         $this
-            ->addOption('only-instances', 'o', InputOption::VALUE_REQUIRED|InputOption::VALUE_IS_ARRAY, 'Filter the database servers to run this command against. Usage of * and ? wildcards is allowed. To see all instances available, use `instance:list`', null)
-            ->addOption('except-instances', 'x', InputOption::VALUE_REQUIRED|InputOption::VALUE_IS_ARRAY, 'Filter the database servers to run this command against', null)
+            ->addOption('only-instances', 'o', InputOption::VALUE_REQUIRED | InputOption::VALUE_IS_ARRAY, 'Filter the database servers to run this command against. Usage of * and ? wildcards is allowed. To see all instances available, use `instance:list`', null)
+            ->addOption('except-instances', 'x', InputOption::VALUE_REQUIRED | InputOption::VALUE_IS_ARRAY, 'Filter the database servers to run this command against', null)
             ->addOption('output-type', null, InputOption::VALUE_REQUIRED, 'The format for the output: json, php, text or yml', self::DEFAULT_OUTPUT_FORMAT)
             ->addOption('output-file', null, InputOption::VALUE_REQUIRED, 'Save output to a file instead of writing it to stdout. NB: take care that dbconsole runs in a container, which has a different view of the filesystem. A good dir for output is ./shared')
             ->addOption('timeout', null, InputOption::VALUE_REQUIRED, 'The maximum time to wait for subprocess execution (secs)', self::DEFAULT_PROCESS_TIMEOUT)
@@ -77,7 +77,7 @@ 
         // On Debian, which we use by default, SF has troubles understanding that php was compiled with --enable-sigchild
         // We thus force it, but give end users an option to disable this
         // For more details, see comment 12 at https://bugs.launchpad.net/ubuntu/+source/php5/+bug/516061
-        if (! $input->getOption('dont-force-enabled-sigchild')) {
+        if (!$input->getOption('dont-force-enabled-sigchild')) {
             Process::forceSigchildEnabled(true);
         }
 
@@ -121,7 +121,7 @@ 
                     $sql = null;
                 } else {
                     // this is a coding error, not a sql execution error
-                    throw new \Exception("Unsupported action type: " . get_class($sqlAction));
+                    throw new \Exception("Unsupported action type: ".get_class($sqlAction));
                 }
                 $filterCallable = $sqlAction->getResultsFilterCallable();
 
@@ -132,7 +132,7 @@ 
                     $outputFilters[$instanceName] = $filterCallable;
 
                     if ($filename === null && !$sqlAction->isSingleStatement()) {
-                        $filename = tempnam(sys_get_temp_dir(), 'db3v4l_') . '.sql';
+                        $filename = tempnam(sys_get_temp_dir(), 'db3v4l_').'.sql';
                         file_put_contents($filename, $sql);
                         $tempSQLFileNames[] = $filename;
                     }
@@ -155,7 +155,7 @@ 
                         }
 
                         if ($this->outputFormat === 'text') {
-                            $this->writeln('Command line: ' . $process->getCommandLine(), OutputInterface::VERBOSITY_VERY_VERBOSE);
+                            $this->writeln('Command line: '.$process->getCommandLine(), OutputInterface::VERBOSITY_VERY_VERBOSE);
                         }
 
                         $process->setTimeout($this->processTimeout);
@@ -177,7 +177,7 @@ 
                     $succeeded++;
                 } catch (\Throwable $t) {
                     $failed++;
-                    $this->writeErrorln("\n<error>$actionName in instance '$instanceName' failed! Reason: " . $t->getMessage() . "</error>\n", OutputInterface::VERBOSITY_NORMAL);
+                    $this->writeErrorln("\n<error>$actionName in instance '$instanceName' failed! Reason: ".$t->getMessage()."</error>\n", OutputInterface::VERBOSITY_NORMAL);
                 }
             }
 
@@ -199,7 +199,7 @@ 
                                 //$result = null;
                                 $failed++;
                                 $succeeded--;
-                                $this->writeErrorln("\n<error>$actionName in instance '$instanceName' failed! Reason: " . $t->getMessage() . "</error>\n", OutputInterface::VERBOSITY_NORMAL);
+                                $this->writeErrorln("\n<error>$actionName in instance '$instanceName' failed! Reason: ".$t->getMessage()."</error>\n", OutputInterface::VERBOSITY_NORMAL);
                             }
                         }
                         $results[$instanceName] = $output;
@@ -210,19 +210,19 @@ 
                             'exitcode' => $process->getExitCode()
                         ];
                         $failed++;
-                        $this->writeErrorln("\n<error>$actionName in instance '$instanceName' failed! Reason: " . $process->getErrorOutput() . "</error>\n", OutputInterface::VERBOSITY_NORMAL);
+                        $this->writeErrorln("\n<error>$actionName in instance '$instanceName' failed! Reason: ".$process->getErrorOutput()."</error>\n", OutputInterface::VERBOSITY_NORMAL);
                     }
                 }
             }
 
         } finally {
             // make sure that we clean up temp files, as they might contain sensitive data
-            foreach($tempSQLFileNames as $tempSQLFileName) {
+            foreach ($tempSQLFileNames as $tempSQLFileName) {
                 unlink($tempSQLFileName);
             }
         }
 
-        uksort($results, function ($a, $b) {
+        uksort($results, function($a, $b) {
             $aParts = explode('_', $a, 2);
             $bParts = explode('_', $b, 2);
             $cmp = strcasecmp($aParts[0], $bParts[0]);
@@ -281,11 +281,11 @@ 
             $this->writeResultsToFile($results);
         } else {
             $formattedResults = $this->formatResults($results);
-            $this->writeln($formattedResults, OutputInterface::VERBOSITY_QUIET,  OutputInterface::OUTPUT_RAW);
+            $this->writeln($formattedResults, OutputInterface::VERBOSITY_QUIET, OutputInterface::OUTPUT_RAW);
         }
 
         if ($this->outputFormat === 'text' || $this->outputFile != null) {
-            $this->writeln($results['succeeded'] . ' succeeded, ' . $results['failed'] . ' failed');
+            $this->writeln($results['succeeded'].' succeeded, '.$results['failed'].' failed');
             if ($this->outputFile != null) {
                 $this->writeln("Results saved to file {$this->outputFile}");
             }

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