@@ -74,7 +74,7 @@ discard block |
||
| 74 | 74 | } |
| 75 | 75 | |
| 76 | 76 | $newDbSpecs = []; |
| 77 | - foreach($instanceList as $instanceName => $instanceSpecs) { |
|
| 77 | + foreach ($instanceList as $instanceName => $instanceSpecs) { |
|
| 78 | 78 | $newDbSpecs[$instanceName] = [ |
| 79 | 79 | 'dbname' => $dbName |
| 80 | 80 | ]; |
@@ -93,6 +93,6 @@ discard block |
||
| 93 | 93 | |
| 94 | 94 | $this->writeResults($results, $time); |
| 95 | 95 | |
| 96 | - return (int)$results['failed']; |
|
| 96 | + return (int) $results['failed']; |
|
| 97 | 97 | } |
| 98 | 98 | } |
@@ -47,7 +47,7 @@ discard block |
||
| 47 | 47 | |
| 48 | 48 | $this->writeResults($results, $time); |
| 49 | 49 | |
| 50 | - return (int)$results['failed']; |
|
| 50 | + return (int) $results['failed']; |
|
| 51 | 51 | } |
| 52 | 52 | |
| 53 | 53 | /** |
@@ -60,7 +60,7 @@ discard block |
||
| 60 | 60 | return $this->executeSqlAction( |
| 61 | 61 | $instanceList, |
| 62 | 62 | 'Listing of users', |
| 63 | - function ($schemaManager, $instanceName) { |
|
| 63 | + function($schemaManager, $instanceName) { |
|
| 64 | 64 | /** @var DatabaseSchemaManager $schemaManager */ |
| 65 | 65 | return $schemaManager->getListUsersSqlAction(); |
| 66 | 66 | } |
@@ -81,13 +81,13 @@ discard block |
||
| 81 | 81 | |
| 82 | 82 | /// @todo inject more randomness in the username, by allowing more chars than bin2hex produces |
| 83 | 83 | |
| 84 | - $userName = 'db3v4l_' . substr(bin2hex(random_bytes(5)), 0, 9); // some mysql versions have a limitation of 16 chars for usernames |
|
| 84 | + $userName = 'db3v4l_'.substr(bin2hex(random_bytes(5)), 0, 9); // some mysql versions have a limitation of 16 chars for usernames |
|
| 85 | 85 | $password = bin2hex(random_bytes(16)); |
| 86 | 86 | //$dbName = bin2hex(random_bytes(31)); |
| 87 | 87 | $dbName = $userName; // $userName will be used as db name |
| 88 | 88 | |
| 89 | 89 | $tempDbSpecs = []; |
| 90 | - foreach($instanceList as $instanceName => $instanceSpecs) { |
|
| 90 | + foreach ($instanceList as $instanceName => $instanceSpecs) { |
|
| 91 | 91 | $tempDbSpecs[$instanceName] = [ |
| 92 | 92 | 'dbname' => $dbName, |
| 93 | 93 | 'user' => $userName, |
@@ -96,7 +96,7 @@ discard block |
||
| 96 | 96 | } |
| 97 | 97 | |
| 98 | 98 | if (($charset = $input->getOption('charset')) != '') { |
| 99 | - foreach($instanceList as $instanceName) { |
|
| 99 | + foreach ($instanceList as $instanceName) { |
|
| 100 | 100 | $tempDbSpecs[$instanceName]['charset'] = $charset; |
| 101 | 101 | } |
| 102 | 102 | } |
@@ -118,7 +118,7 @@ discard block |
||
| 118 | 118 | ]; |
| 119 | 119 | |
| 120 | 120 | $dbConnectionSpecs = []; |
| 121 | - foreach($instanceList as $instanceName => $instanceSpecs) { |
|
| 121 | + foreach ($instanceList as $instanceName => $instanceSpecs) { |
|
| 122 | 122 | $dbConnectionSpecs[$instanceName] = array_merge($instanceSpecs, $dbConfig); |
| 123 | 123 | } |
| 124 | 124 | } |
@@ -133,7 +133,7 @@ discard block |
||
| 133 | 133 | if ($createDB) { |
| 134 | 134 | $results['failed'] += $creationResults['failed']; |
| 135 | 135 | |
| 136 | - foreach($instanceList as $instanceName => $instanceSpecs) { |
|
| 136 | + foreach ($instanceList as $instanceName => $instanceSpecs) { |
|
| 137 | 137 | if (!isset($dbConnectionSpecs[$instanceName])) { |
| 138 | 138 | unset($instanceList[$instanceName]); |
| 139 | 139 | } |
@@ -141,14 +141,14 @@ discard block |
||
| 141 | 141 | $this->dropDatabases($instanceList, $dbConnectionSpecs, true); |
| 142 | 142 | } |
| 143 | 143 | } else { |
| 144 | - $results = ['succeeded' => 0, 'failed' => 0, 'data' => null]; |
|
| 144 | + $results = ['succeeded' => 0, 'failed' => 0, 'data' => null]; |
|
| 145 | 145 | } |
| 146 | 146 | |
| 147 | 147 | $time = microtime(true) - $start; |
| 148 | 148 | |
| 149 | 149 | $this->writeResults($results, $time); |
| 150 | 150 | |
| 151 | - return (int)$results['failed']; |
|
| 151 | + return (int) $results['failed']; |
|
| 152 | 152 | } |
| 153 | 153 | |
| 154 | 154 | /** |
@@ -166,11 +166,11 @@ discard block |
||
| 166 | 166 | return $this->executeSqlAction( |
| 167 | 167 | $dbConnectionSpecs, |
| 168 | 168 | 'Execution of SQL', |
| 169 | - function ($schemaManager, $instanceName) use ($sql, $filename) { |
|
| 169 | + function($schemaManager, $instanceName) use ($sql, $filename) { |
|
| 170 | 170 | if ($sql != null) { |
| 171 | 171 | return new Command( |
| 172 | 172 | $sql, |
| 173 | - function ($output, $executor) { |
|
| 173 | + function($output, $executor) { |
|
| 174 | 174 | /** @var TimedExecutor $executor */ |
| 175 | 175 | return array_merge(['stdout' => $output], $executor->getTimingData()); |
| 176 | 176 | } |
@@ -183,7 +183,7 @@ discard block |
||
| 183 | 183 | } |
| 184 | 184 | return new File( |
| 185 | 185 | $realFileName, |
| 186 | - function ($output, $executor) { |
|
| 186 | + function($output, $executor) { |
|
| 187 | 187 | /** @var TimedExecutor $executor */ |
| 188 | 188 | return array_merge(['stdout' => $output], $executor->getTimingData()); |
| 189 | 189 | } |
@@ -218,13 +218,13 @@ discard block |
||
| 218 | 218 | if (trim($line) !== '') { |
| 219 | 219 | if ($type === 'err') { |
| 220 | 220 | $this->writeErrorln( |
| 221 | - '[' . $processIndex . '][' . $pid . '] ' . trim($line), |
|
| 221 | + '['.$processIndex.']['.$pid.'] '.trim($line), |
|
| 222 | 222 | OutputInterface::VERBOSITY_VERBOSE, |
| 223 | 223 | OutputInterface::OUTPUT_RAW |
| 224 | 224 | ); |
| 225 | 225 | } else { |
| 226 | 226 | $this->writeln( |
| 227 | - '[' . $processIndex . '][' . $pid . '] ' . trim($line), |
|
| 227 | + '['.$processIndex.']['.$pid.'] '.trim($line), |
|
| 228 | 228 | OutputInterface::VERBOSITY_VERBOSE, |
| 229 | 229 | OutputInterface::OUTPUT_RAW |
| 230 | 230 | ); |
@@ -47,7 +47,7 @@ discard block |
||
| 47 | 47 | |
| 48 | 48 | $this->writeResults($results, $time); |
| 49 | 49 | |
| 50 | - return (int)$results['failed']; |
|
| 50 | + return (int) $results['failed']; |
|
| 51 | 51 | } |
| 52 | 52 | |
| 53 | 53 | /** |
@@ -60,7 +60,7 @@ discard block |
||
| 60 | 60 | return $this->executeSqlAction( |
| 61 | 61 | $instanceList, |
| 62 | 62 | 'Listing of collations', |
| 63 | - function ($schemaManager, $instanceName) { |
|
| 63 | + function($schemaManager, $instanceName) { |
|
| 64 | 64 | /** @var DatabaseSchemaManager $schemaManager */ |
| 65 | 65 | return $schemaManager->getListCollationsSqlAction(); |
| 66 | 66 | } |
@@ -47,7 +47,7 @@ discard block |
||
| 47 | 47 | |
| 48 | 48 | $this->writeResults($results, $time); |
| 49 | 49 | |
| 50 | - return (int)$results['failed']; |
|
| 50 | + return (int) $results['failed']; |
|
| 51 | 51 | } |
| 52 | 52 | |
| 53 | 53 | /** |
@@ -60,7 +60,7 @@ discard block |
||
| 60 | 60 | return $this->executeSqlAction( |
| 61 | 61 | $instanceList, |
| 62 | 62 | 'Listing of databases', |
| 63 | - function ($schemaManager, $instanceName) { |
|
| 63 | + function($schemaManager, $instanceName) { |
|
| 64 | 64 | /** @var DatabaseSchemaManager $schemaManager */ |
| 65 | 65 | return $schemaManager->getListDatabasesSqlAction(); |
| 66 | 66 | } |
@@ -50,7 +50,7 @@ discard block |
||
| 50 | 50 | } |
| 51 | 51 | |
| 52 | 52 | $userToDropSpecs = []; |
| 53 | - foreach($instanceList as $instanceName => $instanceSpecs) { |
|
| 53 | + foreach ($instanceList as $instanceName => $instanceSpecs) { |
|
| 54 | 54 | $userToDropSpecs[$instanceName] = [ |
| 55 | 55 | 'user' => $userName |
| 56 | 56 | ]; |
@@ -64,7 +64,7 @@ discard block |
||
| 64 | 64 | |
| 65 | 65 | $this->writeResults($results, $time); |
| 66 | 66 | |
| 67 | - return (int)$results['failed']; |
|
| 67 | + return (int) $results['failed']; |
|
| 68 | 68 | } |
| 69 | 69 | |
| 70 | 70 | /** |
@@ -79,7 +79,7 @@ discard block |
||
| 79 | 79 | return $this->executeSqlAction( |
| 80 | 80 | $instanceList, |
| 81 | 81 | 'Dropping of user', |
| 82 | - function ($schemaManager, $instanceName) use ($userToDropSpecs, $ifExists) { |
|
| 82 | + function($schemaManager, $instanceName) use ($userToDropSpecs, $ifExists) { |
|
| 83 | 83 | $dbConnectionSpec = $userToDropSpecs[$instanceName]; |
| 84 | 84 | /** @var DatabaseSchemaManager $schemaManager */ |
| 85 | 85 | return $schemaManager->getDropUserSqlAction( |
@@ -20,7 +20,7 @@ discard block |
||
| 20 | 20 | $results = $this->executeSqlAction( |
| 21 | 21 | $instanceList, |
| 22 | 22 | 'Creating new database & user', |
| 23 | - function ($schemaManager, $instanceName) use ($dbSpecList) { |
|
| 23 | + function($schemaManager, $instanceName) use ($dbSpecList) { |
|
| 24 | 24 | $dbConnectionSpec = $dbSpecList[$instanceName]; |
| 25 | 25 | /** @var DatabaseSchemaManager $schemaManager */ |
| 26 | 26 | return $schemaManager->getCreateDatabaseSqlAction( |
@@ -33,7 +33,7 @@ discard block |
||
| 33 | 33 | ); |
| 34 | 34 | |
| 35 | 35 | $finalData = []; |
| 36 | - foreach($results['data'] as $instanceName => $data) { |
|
| 36 | + foreach ($results['data'] as $instanceName => $data) { |
|
| 37 | 37 | $dbConnectionSpec = $dbSpecList[$instanceName]; |
| 38 | 38 | $finalData[$instanceName] = $instanceList[$instanceName]; |
| 39 | 39 | $finalData[$instanceName]['dbname'] = $dbConnectionSpec['dbname']; |
@@ -64,7 +64,7 @@ discard block |
||
| 64 | 64 | return $this->executeSqlAction( |
| 65 | 65 | $instanceList, |
| 66 | 66 | 'Dropping of database & user', |
| 67 | - function ($schemaManager, $instanceName) use ($dbSpecList, $ifExists) { |
|
| 67 | + function($schemaManager, $instanceName) use ($dbSpecList, $ifExists) { |
|
| 68 | 68 | $dbConnectionSpec = $dbSpecList[$instanceName]; |
| 69 | 69 | /** @var DatabaseSchemaManager $schemaManager */ |
| 70 | 70 | return $schemaManager->getDropDatabaseSqlAction( |
@@ -52,7 +52,7 @@ |
||
| 52 | 52 | } |
| 53 | 53 | $executor = $this->executorFactory->createForkedExecutor($dbConnectionSpec, 'NativeClient', false); |
| 54 | 54 | |
| 55 | - if (! $executor instanceof ShellExecutor) { |
|
| 55 | + if (!$executor instanceof ShellExecutor) { |
|
| 56 | 56 | throw new \Exception("Can not start an interactive shell for databases of type '{$dbConnectionSpec['vendor']}'"); |
| 57 | 57 | } |
| 58 | 58 | |
@@ -37,7 +37,7 @@ discard block |
||
| 37 | 37 | $result = $this->listInstances($instanceList); |
| 38 | 38 | |
| 39 | 39 | $extraResults = $this->listDatabasesVersion($instanceList)['data']; |
| 40 | - foreach($result as $instanceName => $instanceDesc) { |
|
| 40 | + foreach ($result as $instanceName => $instanceDesc) { |
|
| 41 | 41 | if (isset($extraResults[$instanceName])) { |
| 42 | 42 | $result[$instanceName]['version'] = $extraResults[$instanceName]; |
| 43 | 43 | } |
@@ -56,7 +56,7 @@ discard block |
||
| 56 | 56 | protected function listInstances($instanceList) |
| 57 | 57 | { |
| 58 | 58 | $out = []; |
| 59 | - foreach($instanceList as $instanceName => $connectionSpec) { |
|
| 59 | + foreach ($instanceList as $instanceName => $connectionSpec) { |
|
| 60 | 60 | //$connectionSpec = $this->dbConfigurationManager->getInstanceConfiguration($instanceName); |
| 61 | 61 | $out[$instanceName] = [ |
| 62 | 62 | 'vendor' => $connectionSpec['vendor'], |
@@ -71,7 +71,7 @@ discard block |
||
| 71 | 71 | return $this->executeSqlAction( |
| 72 | 72 | $instanceList, |
| 73 | 73 | 'Getting database version information', |
| 74 | - function ($schemaManager, $instanceName) { |
|
| 74 | + function($schemaManager, $instanceName) { |
|
| 75 | 75 | /** @var DatabaseSchemaManager $schemaManager */ |
| 76 | 76 | return $schemaManager->getRetrieveVersionInfoSqlAction(); |
| 77 | 77 | } |
@@ -101,7 +101,7 @@ discard block |
||
| 101 | 101 | file_put_contents($this->outputFile, $data); |
| 102 | 102 | $this->writeln("Results saved to file {$this->outputFile}"); |
| 103 | 103 | } else { |
| 104 | - $this->writeln($data, OutputInterface::VERBOSITY_QUIET, OutputInterface::OUTPUT_RAW); |
|
| 104 | + $this->writeln($data, OutputInterface::VERBOSITY_QUIET, OutputInterface::OUTPUT_RAW); |
|
| 105 | 105 | } |
| 106 | 106 | |
| 107 | 107 | } |