@@ -90,7 +90,7 @@ |
||
| 90 | 90 | { |
| 91 | 91 | $content = file_get_contents($this->configFileName); |
| 92 | 92 | |
| 93 | - $this->config = (array)json_decode($content, true); |
|
| 93 | + $this->config = (array) json_decode($content, true); |
|
| 94 | 94 | if (json_last_error()!=JSON_ERROR_NONE) |
| 95 | 95 | { |
| 96 | 96 | throw new RuntimeException("Error decoding JSON: '%s'.", json_last_error_msg()); |
@@ -58,9 +58,9 @@ discard block |
||
| 58 | 58 | * @throws RuntimeException |
| 59 | 59 | */ |
| 60 | 60 | protected static function getSetting(array $settings, |
| 61 | - bool $mandatory, |
|
| 62 | - string $sectionName, |
|
| 63 | - string $settingName): ?string |
|
| 61 | + bool $mandatory, |
|
| 62 | + string $sectionName, |
|
| 63 | + string $settingName): ?string |
|
| 64 | 64 | { |
| 65 | 65 | // Test if the section exists. |
| 66 | 66 | if (!array_key_exists($sectionName, $settings)) |
@@ -81,8 +81,8 @@ discard block |
||
| 81 | 81 | if ($mandatory) |
| 82 | 82 | { |
| 83 | 83 | throw new RuntimeException("Setting '%s' not found in section '%s' configuration file.", |
| 84 | - $settingName, |
|
| 85 | - $sectionName); |
|
| 84 | + $settingName, |
|
| 85 | + $sectionName); |
|
| 86 | 86 | } |
| 87 | 87 | else |
| 88 | 88 | { |
@@ -62,7 +62,7 @@ discard block |
||
| 62 | 62 | |
| 63 | 63 | $this->additionalAuditColumns = |
| 64 | 64 | AuditDataLayer::resolveCanonicalAdditionalAuditColumns($this->config['database']['audit_schema'], |
| 65 | - $this->config['audit_columns']); |
|
| 65 | + $this->config['audit_columns']); |
|
| 66 | 66 | } |
| 67 | 67 | |
| 68 | 68 | //-------------------------------------------------------------------------------------------------------------------- |
@@ -135,8 +135,8 @@ discard block |
||
| 135 | 135 | { |
| 136 | 136 | $this->io->writeln(sprintf('<info>Found new table %s</info>', $table['table_name'])); |
| 137 | 137 | $this->config['tables'][$table['table_name']] = ['audit' => null, |
| 138 | - 'alias' => null, |
|
| 139 | - 'skip' => null]; |
|
| 138 | + 'alias' => null, |
|
| 139 | + 'skip' => null]; |
|
| 140 | 140 | } |
| 141 | 141 | } |
| 142 | 142 | } |
@@ -152,12 +152,12 @@ discard block |
||
| 152 | 152 | if ($this->config['tables'][$table['table_name']]['audit']) |
| 153 | 153 | { |
| 154 | 154 | $currentTable = new AuditTable($this->io, |
| 155 | - $this->config['database']['data_schema'], |
|
| 156 | - $this->config['database']['audit_schema'], |
|
| 157 | - $table['table_name'], |
|
| 158 | - $this->additionalAuditColumns, |
|
| 159 | - $this->config['tables'][$table['table_name']]['alias'], |
|
| 160 | - $this->config['tables'][$table['table_name']]['skip']); |
|
| 155 | + $this->config['database']['data_schema'], |
|
| 156 | + $this->config['database']['audit_schema'], |
|
| 157 | + $table['table_name'], |
|
| 158 | + $this->additionalAuditColumns, |
|
| 159 | + $this->config['tables'][$table['table_name']]['alias'], |
|
| 160 | + $this->config['tables'][$table['table_name']]['skip']); |
|
| 161 | 161 | |
| 162 | 162 | // Ensure the audit table exists. |
| 163 | 163 | if (AuditDataLayer::searchInRowSet('table_name', $table['table_name'], $this->auditSchemaTables)===null) |
@@ -70,7 +70,7 @@ |
||
| 70 | 70 | |
| 71 | 71 | $this->additionalAuditColumns = |
| 72 | 72 | AuditDataLayer::resolveCanonicalAdditionalAuditColumns($this->config['database']['audit_schema'], |
| 73 | - $this->config['audit_columns']); |
|
| 73 | + $this->config['audit_columns']); |
|
| 74 | 74 | } |
| 75 | 75 | |
| 76 | 76 | //-------------------------------------------------------------------------------------------------------------------- |
@@ -123,7 +123,7 @@ |
||
| 123 | 123 | $dataTableColumns = TableColumnsMetadata::combine($this->additionalAuditColumns, $dataTableColumns); |
| 124 | 124 | |
| 125 | 125 | // In the audit table columns coming from the data table don't have defaults. |
| 126 | - foreach($auditTableColumns->getColumns() as $column) |
|
| 126 | + foreach ($auditTableColumns->getColumns() as $column) |
|
| 127 | 127 | { |
| 128 | 128 | if (!in_array($column->getName(), $this->additionalAuditColumns->getColumnNames())) |
| 129 | 129 | { |
@@ -48,7 +48,7 @@ discard block |
||
| 48 | 48 | |
| 49 | 49 | $this->additionalAuditColumns = |
| 50 | 50 | AuditDataLayer::resolveCanonicalAdditionalAuditColumns($this->config['database']['audit_schema'], |
| 51 | - $this->config['audit_columns']); |
|
| 51 | + $this->config['audit_columns']); |
|
| 52 | 52 | } |
| 53 | 53 | |
| 54 | 54 | //-------------------------------------------------------------------------------------------------------------------- |
@@ -103,8 +103,8 @@ discard block |
||
| 103 | 103 | $maxLength = $diff->getLongestColumnNameLength(); |
| 104 | 104 | |
| 105 | 105 | $this->codeStore->append(sprintf('alter table `%s`.`%s`', |
| 106 | - $this->config['database']['audit_schema'], |
|
| 107 | - $auditTable->getTableName())); |
|
| 106 | + $this->config['database']['audit_schema'], |
|
| 107 | + $auditTable->getTableName())); |
|
| 108 | 108 | |
| 109 | 109 | $first = true; |
| 110 | 110 | foreach ($diff->getColumns() as $column) |
@@ -115,11 +115,11 @@ discard block |
||
| 115 | 115 | if (!$first) $this->codeStore->appendToLastLine(','); |
| 116 | 116 | |
| 117 | 117 | $this->codeStore->append(sprintf('change column `%s`%s`%s`%s%s', |
| 118 | - $name, |
|
| 119 | - $filler, |
|
| 120 | - $name, |
|
| 121 | - $filler, |
|
| 122 | - $column->getColumnAuditDefinition())); |
|
| 118 | + $name, |
|
| 119 | + $filler, |
|
| 120 | + $name, |
|
| 121 | + $filler, |
|
| 122 | + $column->getColumnAuditDefinition())); |
|
| 123 | 123 | |
| 124 | 124 | $first = false; |
| 125 | 125 | } |
@@ -165,9 +165,9 @@ discard block |
||
| 165 | 165 | } |
| 166 | 166 | |
| 167 | 167 | $this->codeStore->append(sprintf('alter table `%s`.`%s` %s;', |
| 168 | - $this->config['database']['audit_schema'], |
|
| 169 | - $auditTable->getTableName(), |
|
| 170 | - implode(' ', $parts))); |
|
| 168 | + $this->config['database']['audit_schema'], |
|
| 169 | + $auditTable->getTableName(), |
|
| 170 | + implode(' ', $parts))); |
|
| 171 | 171 | $this->codeStore->append(''); |
| 172 | 172 | } |
| 173 | 173 | } |
@@ -229,20 +229,20 @@ discard block |
||
| 229 | 229 | if (in_array($column, $auditColumns)) |
| 230 | 230 | { |
| 231 | 231 | $this->rows[] = ['name' => $column, |
| 232 | - 'audit' => $this->auditTable->getColumns()->getColumn($column), |
|
| 233 | - 'data' => $this->dataTable->getColumns()->getColumn($column), |
|
| 234 | - 'type' => 'column', |
|
| 235 | - 'new' => false, |
|
| 236 | - 'obsolete' => false]; |
|
| 232 | + 'audit' => $this->auditTable->getColumns()->getColumn($column), |
|
| 233 | + 'data' => $this->dataTable->getColumns()->getColumn($column), |
|
| 234 | + 'type' => 'column', |
|
| 235 | + 'new' => false, |
|
| 236 | + 'obsolete' => false]; |
|
| 237 | 237 | } |
| 238 | 238 | else |
| 239 | 239 | { |
| 240 | 240 | $this->rows[] = ['name' => $column, |
| 241 | - 'audit' => null, |
|
| 242 | - 'data' => $this->dataTable->getColumns()->getColumn($column), |
|
| 243 | - 'type' => 'column', |
|
| 244 | - 'new' => true, |
|
| 245 | - 'obsolete' => false]; |
|
| 241 | + 'audit' => null, |
|
| 242 | + 'data' => $this->dataTable->getColumns()->getColumn($column), |
|
| 243 | + 'type' => 'column', |
|
| 244 | + 'new' => true, |
|
| 245 | + 'obsolete' => false]; |
|
| 246 | 246 | } |
| 247 | 247 | } |
| 248 | 248 | |
@@ -251,11 +251,11 @@ discard block |
||
| 251 | 251 | if (!in_array($column, $dataColumns)) |
| 252 | 252 | { |
| 253 | 253 | $this->rows[] = ['name' => $column, |
| 254 | - 'audit' => $this->auditTable->getColumns()->getColumn($column), |
|
| 255 | - 'data' => null, |
|
| 256 | - 'type' => 'column', |
|
| 257 | - 'new' => false, |
|
| 258 | - 'obsolete' => true]; |
|
| 254 | + 'audit' => $this->auditTable->getColumns()->getColumn($column), |
|
| 255 | + 'data' => null, |
|
| 256 | + 'type' => 'column', |
|
| 257 | + 'new' => false, |
|
| 258 | + 'obsolete' => true]; |
|
| 259 | 259 | } |
| 260 | 260 | } |
| 261 | 261 | } |
@@ -272,10 +272,10 @@ discard block |
||
| 272 | 272 | foreach ($dataOptions as $option) |
| 273 | 273 | { |
| 274 | 274 | $this->rows[] = ['name' => $option, |
| 275 | - 'audit1' => $this->auditTable->getProperty($option), |
|
| 276 | - 'data1' => $this->dataTable->getProperty($option), |
|
| 277 | - 'type' => 'option', |
|
| 278 | - 'rowspan' => 1]; |
|
| 275 | + 'audit1' => $this->auditTable->getProperty($option), |
|
| 276 | + 'data1' => $this->dataTable->getProperty($option), |
|
| 277 | + 'type' => 'option', |
|
| 278 | + 'rowspan' => 1]; |
|
| 279 | 279 | } |
| 280 | 280 | |
| 281 | 281 | foreach ($auditOptions as $option) |
@@ -283,10 +283,10 @@ discard block |
||
| 283 | 283 | if (!in_array($option, $dataOptions)) |
| 284 | 284 | { |
| 285 | 285 | $this->rows[] = ['name' => $option, |
| 286 | - 'audit1' => $this->auditTable->getProperty($option), |
|
| 287 | - 'data2' => null, |
|
| 288 | - 'type' => 'option', |
|
| 289 | - 'rowspan' => 1]; |
|
| 286 | + 'audit1' => $this->auditTable->getProperty($option), |
|
| 287 | + 'data2' => null, |
|
| 288 | + 'type' => 'option', |
|
| 289 | + 'rowspan' => 1]; |
|
| 290 | 290 | } |
| 291 | 291 | } |
| 292 | 292 | } |
@@ -32,9 +32,9 @@ |
||
| 32 | 32 | protected function configure() |
| 33 | 33 | { |
| 34 | 34 | $this->setName('diff') |
| 35 | - ->setDescription('Compares data tables and audit tables') |
|
| 36 | - ->addArgument('config file', InputArgument::REQUIRED, 'The audit configuration file') |
|
| 37 | - ->addOption('full', 'f', InputOption::VALUE_NONE, 'Show all columns'); |
|
| 35 | + ->setDescription('Compares data tables and audit tables') |
|
| 36 | + ->addArgument('config file', InputArgument::REQUIRED, 'The audit configuration file') |
|
| 37 | + ->addOption('full', 'f', InputOption::VALUE_NONE, 'Show all columns'); |
|
| 38 | 38 | } |
| 39 | 39 | |
| 40 | 40 | //-------------------------------------------------------------------------------------------------------------------- |
@@ -21,10 +21,10 @@ discard block |
||
| 21 | 21 | protected function configure() |
| 22 | 22 | { |
| 23 | 23 | $this->setName('drop-triggers') |
| 24 | - ->setDescription('Drops all triggers') |
|
| 25 | - ->setHelp('Drops all triggers (including triggers not created by audit) from all tables (including tables '. |
|
| 26 | - 'excluded for auditing) in the data schema.') |
|
| 27 | - ->addArgument('config file', InputArgument::REQUIRED, 'The audit configuration file'); |
|
| 24 | + ->setDescription('Drops all triggers') |
|
| 25 | + ->setHelp('Drops all triggers (including triggers not created by audit) from all tables (including tables '. |
|
| 26 | + 'excluded for auditing) in the data schema.') |
|
| 27 | + ->addArgument('config file', InputArgument::REQUIRED, 'The audit configuration file'); |
|
| 28 | 28 | } |
| 29 | 29 | |
| 30 | 30 | //-------------------------------------------------------------------------------------------------------------------- |
@@ -60,8 +60,8 @@ discard block |
||
| 60 | 60 | foreach ($triggers as $trigger) |
| 61 | 61 | { |
| 62 | 62 | $this->io->logInfo('Dropping trigger <dbo>%s</dbo> from table <dbo>%s</dbo>', |
| 63 | - $trigger['trigger_name'], |
|
| 64 | - $trigger['table_name']); |
|
| 63 | + $trigger['trigger_name'], |
|
| 64 | + $trigger['table_name']); |
|
| 65 | 65 | |
| 66 | 66 | AuditDataLayer::dropTrigger($data_schema, $trigger['trigger_name']); |
| 67 | 67 | } |
@@ -31,9 +31,9 @@ |
||
| 31 | 31 | protected function configure() |
| 32 | 32 | { |
| 33 | 33 | $this->setName('alter-audit-table') |
| 34 | - ->setDescription('Creates alter SQL statements for audit tables') |
|
| 35 | - ->addArgument('config file', InputArgument::REQUIRED, 'The audit configuration file') |
|
| 36 | - ->addArgument('sql file', InputArgument::OPTIONAL, 'The destination file for the SQL statements'); |
|
| 34 | + ->setDescription('Creates alter SQL statements for audit tables') |
|
| 35 | + ->addArgument('config file', InputArgument::REQUIRED, 'The audit configuration file') |
|
| 36 | + ->addArgument('sql file', InputArgument::OPTIONAL, 'The destination file for the SQL statements'); |
|
| 37 | 37 | |
| 38 | 38 | $this->setHelp(<<<EOL |
| 39 | 39 | Generates alter table SQL statements for aligning the audit tables with the |
@@ -49,7 +49,7 @@ |
||
| 49 | 49 | No SQL statements will be generated for missing or obsolete columns in the |
| 50 | 50 | audit tables. Use the command 'audit' for creating missing columns in audit |
| 51 | 51 | tables. |
| 52 | -EOL |
|
| 52 | +eol |
|
| 53 | 53 | ); |
| 54 | 54 | } |
| 55 | 55 | |
@@ -22,12 +22,12 @@ |
||
| 22 | 22 | protected function configure() |
| 23 | 23 | { |
| 24 | 24 | $this->setName('audit') |
| 25 | - ->setDescription('Maintains audit tables and audit triggers') |
|
| 26 | - ->setHelp("Maintains audit tables and audit triggers:\n". |
|
| 27 | - "- creates new audit tables\n". |
|
| 28 | - "- adds new columns to exiting audit tables\n". |
|
| 29 | - "- creates new and recreates existing audit triggers\n") |
|
| 30 | - ->addArgument('config file', InputArgument::REQUIRED, 'The audit configuration file'); |
|
| 25 | + ->setDescription('Maintains audit tables and audit triggers') |
|
| 26 | + ->setHelp("Maintains audit tables and audit triggers:\n". |
|
| 27 | + "- creates new audit tables\n". |
|
| 28 | + "- adds new columns to exiting audit tables\n". |
|
| 29 | + "- creates new and recreates existing audit triggers\n") |
|
| 30 | + ->addArgument('config file', InputArgument::REQUIRED, 'The audit configuration file'); |
|
| 31 | 31 | } |
| 32 | 32 | |
| 33 | 33 | //-------------------------------------------------------------------------------------------------------------------- |