jenkins-bot has submitted this change and it was merged. Change subject: Clean up redundant defaults in Database::__construct() ......................................................................
Clean up redundant defaults in Database::__construct() * This are already (or now) managed by Database::factory(). * Also remove unused "foreign" parameter. Change-Id: I9161b9f158b656fd10b1506ecb82bf42ab94ea43 --- M includes/libs/rdbms/database/Database.php 1 file changed, 22 insertions(+), 29 deletions(-) Approvals: Jforrester: Looks good to me, approved jenkins-bot: Verified diff --git a/includes/libs/rdbms/database/Database.php b/includes/libs/rdbms/database/Database.php index a5b9284..dbf3ad5 100644 --- a/includes/libs/rdbms/database/Database.php +++ b/includes/libs/rdbms/database/Database.php @@ -243,19 +243,15 @@ $user = $params['user']; $password = $params['password']; $dbName = $params['dbname']; - $flags = $params['flags']; $this->mSchema = $params['schema']; $this->mTablePrefix = $params['tablePrefix']; - $this->cliMode = isset( $params['cliMode'] ) - ? $params['cliMode'] - : ( PHP_SAPI === 'cli' ); - $this->agent = isset( $params['agent'] ) - ? str_replace( '/', '-', $params['agent'] ) // escape for comment - : ''; + $this->cliMode = $params['cliMode']; + // Agent name is added to SQL queries in a comment, so make sure it can't break out + $this->agent = str_replace( '/', '-', $params['agent'] ); - $this->mFlags = $flags; + $this->mFlags = $params['flags']; if ( $this->mFlags & DBO_DEFAULT ) { if ( $this->cliMode ) { $this->mFlags &= ~DBO_TRX; @@ -270,16 +266,10 @@ ? $params['srvCache'] : new HashBagOStuff(); - $this->profiler = isset( $params['profiler'] ) ? $params['profiler'] : null; - $this->trxProfiler = isset( $params['trxProfiler'] ) - ? $params['trxProfiler'] - : new TransactionProfiler(); - $this->connLogger = isset( $params['connLogger'] ) - ? $params['connLogger'] - : new \Psr\Log\NullLogger(); - $this->queryLogger = isset( $params['queryLogger'] ) - ? $params['queryLogger'] - : new \Psr\Log\NullLogger(); + $this->profiler = $params['profiler']; + $this->trxProfiler = $params['trxProfiler']; + $this->connLogger = $params['connLogger']; + $this->queryLogger = $params['queryLogger']; if ( $user ) { $this->open( $server, $user, $password, $dbName ); @@ -381,22 +371,25 @@ $p['variables'] = isset( $p['variables'] ) ? $p['variables'] : []; $p['tablePrefix'] = isset( $p['tablePrefix'] ) ? $p['tablePrefix'] : ''; $p['schema'] = isset( $p['schema'] ) ? $p['schema'] : ''; - $p['foreign'] = isset( $p['foreign'] ) ? $p['foreign'] : false; - - $conn = new $class( $p ); - if ( isset( $p['connLogger'] ) ) { - $conn->connLogger = $p['connLogger']; + $p['cliMode'] = isset( $p['cliMode'] ) ? $p['cliMode'] : ( PHP_SAPI === 'cli' ); + $p['agent'] = isset( $p['agent'] ) ? $p['agent'] : ''; + if ( !isset( $p['connLogger'] ) ) { + $p['connLogger'] = new \Psr\Log\NullLogger(); } - if ( isset( $p['queryLogger'] ) ) { - $conn->queryLogger = $p['queryLogger']; + if ( !isset( $p['queryLogger'] ) ) { + $p['queryLogger'] = new \Psr\Log\NullLogger(); } - if ( isset( $p['errorLogger'] ) ) { - $conn->errorLogger = $p['errorLogger']; - } else { - $conn->errorLogger = function ( Exception $e ) { + $p['profiler'] = isset( $p['profiler'] ) ? $p['profiler'] : null; + if ( !isset( $p['trxProfiler'] ) ) { + $p['trxProfiler'] = new TransactionProfiler(); + } + if ( !isset( $p['errorLogger'] ) ) { + $p['errorLogger'] = function ( Exception $e ) { trigger_error( get_class( $e ) . ': ' . $e->getMessage(), E_WARNING ); }; } + + $conn = new $class( $p ); } else { $conn = null; } -- To view, visit https://gerrit.wikimedia.org/r/311756 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I9161b9f158b656fd10b1506ecb82bf42ab94ea43 Gerrit-PatchSet: 3 Gerrit-Project: mediawiki/core Gerrit-Branch: master Gerrit-Owner: Aaron Schulz <asch...@wikimedia.org> Gerrit-Reviewer: Jforrester <jforres...@wikimedia.org> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits