private static $loggedDeprecations = [];
/**
- * TODO Make this a const when HHVM support is dropped (T192166)
- *
* @var array
* @since 1.34
*/
- public static $applyDefaultConfigOptions = [
+ public const APPLY_DEFAULT_CONFIG_OPTIONS = [
'DBcompress',
'DBDefaultGroup',
'DBmwschema',
BagOStuff $mainStash,
WANObjectCache $wanCache
) {
- $options->assertRequiredOptions( self::$applyDefaultConfigOptions );
+ $options->assertRequiredOptions( self::APPLY_DEFAULT_CONFIG_OPTIONS );
global $wgCommandLineMode;
$server += [ 'schema' => $options->get( 'DBmwschema' ) ];
}
- $flags = DBO_DEFAULT;
- $flags |= $options->get( 'DebugDumpSql' ) ? DBO_DEBUG : 0;
- $flags |= $options->get( 'DebugLogFile' ) ? DBO_DEBUG : 0;
+ $flags = $server['flags'] ?? DBO_DEFAULT;
+ if ( $options->get( 'DebugDumpSql' ) || $options->get( 'DebugLogFile' ) ) {
+ $flags |= DBO_DEBUG;
+ }
+ $server['flags'] = $flags;
$server += [
'tablePrefix' => $options->get( 'DBprefix' ),
- 'flags' => $flags,
'sqlMode' => $options->get( 'SQLMode' ),
];