gggeek / db-3v4l

app/src/Core/DatabaseManager/SQLite.php

Spacing +7 added lines, -7 removed lines

@@ -15,13 +15,13 @@ 
      */
     public function getListDatabasesSqlAction()
     {
-        $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;
             }
@@ -45,7 +45,7 @@ 
 
         /// @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\";"
         );
@@ -61,7 +61,7 @@ 
      */
     public function getDropDatabaseSqlAction($dbName, $userName, $ifExists = false)
     {
-        $filename = dirname($this->databaseConfiguration['path']) . '/' . $dbName . '.sqlite';
+        $filename = dirname($this->databaseConfiguration['path']).'/'.$dbName.'.sqlite';
         return new Command(
             null,
             function() use($filename, $dbName, $ifExists) {
@@ -84,7 +84,7 @@ 
     {
         return new Command(
             null,
-            function () {
+            function() {
                 // since sqlite does not support users, null seems more appropriate than an empty array...
                 return null;
             }
@@ -116,7 +116,7 @@ 
         return new Command(
             null,
             /// @todo list the supported utf16 variants as soon as allow using them
-            function () {
+            function() {
                 return [];
             }
         );
@@ -142,7 +142,7 @@ 
     {
         return new Command(
             "select sqlite_version();",
-            function ($output, $executor) {
+            function($output, $executor) {
                 /** @var Executor $executor */
                 return $executor->resultSetToArray($output)[0];
             }

app/src/Core/DatabaseManager/OraclePDB.php

Spacing +4 added lines, -4 removed lines

@@ -21,7 +21,7 @@ 
     {
         return new Command(
             "SELECT pdb_name AS Database FROM dba_pdbs ORDER BY pdb_name;",
-            function ($output, $executor) {
+            function($output, $executor) {
                 /** @var Executor $executor */
                 return $executor->resultSetToArray($output);
             }
@@ -91,7 +91,7 @@ 
         return new Command(
             // NB: we filter out 'system' users, as there are many...
             "SELECT username FROM cdb_users WHERE oracle_maintained != 'Y' ORDER BY username;",
-            function ($output, $executor) {
+            function($output, $executor) {
                 /** @var Executor $executor */
                 return $executor->resultSetToArray($output);
             }
@@ -122,7 +122,7 @@ 
     {
         return new Command(
             "SELECT value AS Collation FROM v\$nls_valid_values WHERE parameter = 'CHARACTERSET' ORDER BY value;",
-            function ($output, $executor) {
+            function($output, $executor) {
                 /** @var Executor $executor */
                 return $executor->resultSetToArray($output);
             }
@@ -137,7 +137,7 @@ 
     {
         return new Command(
             "SELECT version_full || ' (' || banner || ')' AS version FROM  v\$version, v\$instance;",
-            function ($output, $executor) {
+            function($output, $executor) {
                 /** @var Executor $executor */
                 return $executor->resultSetToArray($output)[0];
             }

app/src/Core/DatabaseManager/Oracle.php

Spacing +4 added lines, -4 removed lines

@@ -22,7 +22,7 @@ 
     {
         return new Command(
             "SELECT username AS Database FROM all_users WHERE oracle_maintained != 'Y' ORDER BY username;",
-            function ($output, $executor) {
+            function($output, $executor) {
                 /** @var Executor $executor */
                 return $executor->resultSetToArray($output);
             }
@@ -92,7 +92,7 @@ 
         return new Command(
             // NB: we filter out 'system' users, as there are many...
             "SELECT username FROM sys.all_users WHERE oracle_maintained != 'Y' ORDER BY username;",
-            function ($output, $executor) {
+            function($output, $executor) {
                 /** @var Executor $executor */
                 return $executor->resultSetToArray($output);
             }
@@ -124,7 +124,7 @@ 
     {
         return new Command(
             "SELECT value AS Collation FROM v\$nls_valid_values WHERE parameter = 'CHARACTERSET' ORDER BY value;",
-            function ($output, $executor) {
+            function($output, $executor) {
                 /** @var Executor $executor */
                 return $executor->resultSetToArray($output);
             }
@@ -139,7 +139,7 @@ 
     {
         return new Command(
             "SELECT version_full || ' (' || banner || ')' AS version FROM  v\$version, v\$instance;",
-            function ($output, $executor) {
+            function($output, $executor) {
                 /** @var Executor $executor */
                 return $executor->resultSetToArray($output)[0];
             }

app/src/Command/SQLExecutingCommand.php

Spacing +13 added lines, -13 removed lines

@@ -55,8 +55,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)
@@ -83,7 +83,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);
         }
 
@@ -127,7 +127,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();
 
@@ -138,7 +138,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;
                     }
@@ -161,7 +161,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);
@@ -187,7 +187,7 @@ 
                         'stderr' => $t->getMessage(),
                     ];
                     $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);
                 }
             }
 
@@ -212,7 +212,7 @@ 
                                 ];
                                 $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;
@@ -229,19 +229,19 @@ 
                         ];
 
                         $failed++;
-                        $this->writeErrorln("\n<error>$actionName in instance '$instanceName' failed! Reason: " . $err . "</error>\n", OutputInterface::VERBOSITY_NORMAL);
+                        $this->writeErrorln("\n<error>$actionName in instance '$instanceName' failed! Reason: ".$err."</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]);
@@ -300,11 +300,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/DatabaseManagingCommand.php

Spacing +3 added lines, -3 removed lines

@@ -22,7 +22,7 @@ 
         $results = $this->executeSqlAction(
             $instanceList,
             'Creating new database & user',
-            function ($schemaManager, $instanceName) use ($dbSpecList) {
+            function($schemaManager, $instanceName) use ($dbSpecList) {
                 $dbConnectionSpec = $dbSpecList[$instanceName];
                 /** @var DatabaseSchemaManager $schemaManager */
                 return $schemaManager->getCreateDatabaseSqlAction(
@@ -38,7 +38,7 @@ 
         ///       f.e. connection specs for Oracle to be different when using PDBs vs when using schemas
         ///       (this could be achieved by copying the 'dbname' member over the 'servicename' one, or unsetting 'servicename'...)
         $finalData = [];
-        foreach($results['data'] as $instanceName => $data) {
+        foreach ($results['data'] as $instanceName => $data) {
             // check for failure in creation of temp db
             // @todo how can we tell apart correctly errors that actually prevented the db from being created from other errors?
             if (is_array($data) && isset($data['exitcode']) && $data['exitcode'] != 0) {
@@ -75,7 +75,7 @@ 
         return $this->executeSqlAction(
             $instanceList,
             'Dropping of database & user',
-            function ($schemaManager, $instanceName) use ($dbSpecList, $ifExists) {
+            function($schemaManager, $instanceName) use ($dbSpecList, $ifExists) {
                 $dbConnectionSpec = $dbSpecList[$instanceName];
                 /** @var DatabaseSchemaManager $schemaManager */
                 return $schemaManager->getDropDatabaseSqlAction(

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(15)); // some oracle versions have a limit of 30 chars on passwords
             //$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);
             }
         }
@@ -144,7 +144,7 @@ 
             if ($createDB) {
                 $results['failed'] += $creationResults['failed'];
 
-                foreach($instanceList as $instanceName  => $instanceSpecs) {
+                foreach ($instanceList as $instanceName  => $instanceSpecs) {
                     if (!isset($dbConnectionSpecs[$instanceName])) {
                         /// @todo retrieve the actual temp db creation error instead of doing this...
                         $results['data'][$instanceName] = [
@@ -161,14 +161,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'];
     }
 
     /**
@@ -186,11 +186,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());
                         }
@@ -203,7 +203,7 @@ 
                     }
                     return new File(
                         $realFileName,
-                        function ($output, $executor) {
+                        function($output, $executor) {
                             /** @var TimedExecutor $executor */
                             return array_merge(['stdout' => $output], $executor->getTimingData());
                         }
@@ -238,13 +238,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
                     );
@@ -287,7 +287,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);

adminer/public/index.php

Spacing +6 added lines, -7 removed lines

@@ -6,12 +6,12 @@ 
 {
     // Avoid bootstrapping Symfony for something so trivial...
 
-    $configDir = dirname(dirname(__DIR__)) . '/vendors';
+    $configDir = dirname(dirname(__DIR__)).'/vendors';
 
-    include_once($configDir . '/secrets.php');
+    include_once($configDir.'/secrets.php');
 
-    $files = glob($configDir . '/*.yml');
-    foreach($files as $fileName) {
+    $files = glob($configDir.'/*.yml');
+    foreach ($files as $fileName) {
         $vendorConfig = \Symfony\Component\Yaml\Yaml::parseFile($fileName);
         if (isset($vendorConfig['db3v4l']['database_instances'])) {
             foreach ($vendorConfig['db3v4l']['database_instances'] as $name => &$instanceConfig) {
@@ -28,12 +28,11 @@ 
     ksort($config);
 
     $servers = [];
-    foreach($config as $instance => $def) {
+    foreach ($config 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(

adminer/adminer/plugins/login-servers-enhanced.php

Spacing +1 added lines, -1 removed lines

@@ -89,7 +89,7 @@
         }
         $html .= '</select>';
 
-        $html .= '<script type="text/javascript" ' . nonce() . '>';
+        $html .= '<script type="text/javascript" '.nonce().'>';
         $html .= 'function switchServer() { ';
         $html .= 'var selectServer = document.getElementsByName("auth[server]")[0]; ';
         $html .= 'var driver = selectServer.options[selectServer.selectedIndex].getAttribute("driver"); ';