gggeek / db-3v4l

app/src/Command/SQLExecutingCommand.php

Spacing +12 added lines, -12 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,14 +210,14 @@ 
                             '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);
             }
         }
@@ -266,11 +266,11 @@ 
         if ($this->outputFile != null) {
             file_put_contents($this->outputFile, $formattedResults);
         } else {
-            $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/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);
         }