Merge "rdbms: make Database::query() more readable and consistent"

[lhc/web/wiklou.git] / tests / phpunit / includes / db / DatabaseTestHelper.php

diff --git a/tests/phpunit/includes/db/DatabaseTestHelper.php b/tests/phpunit/includes/db/DatabaseTestHelper.php
index 936bee0..9679c6c 100644 (file)
--- a/tests/phpunit/includes/db/DatabaseTestHelper.php
+++ b/tests/phpunit/includes/db/DatabaseTestHelper.php
@@ -45,7 +45,7 @@ class DatabaseTestHelper extends Database {
        public function __construct( $testName, array $opts = [] ) {
                $this->testName = $testName;
 
-               $this->profiler = new ProfilerStub( [] );
+               $this->profiler = null;
                $this->trxProfiler = new TransactionProfiler();
                $this->cliMode = $opts['cliMode'] ?? true;
                $this->connLogger = new \Psr\Log\NullLogger();
@@ -108,7 +108,11 @@ class DatabaseTestHelper extends Database {
 
                // Handle some internal calls from the Database class
                $check = $fname;
-               if ( preg_match( '/^Wikimedia\\\\Rdbms\\\\Database::query \((.+)\)$/', $fname, $m ) ) {
+               if ( preg_match(
+                       '/^Wikimedia\\\\Rdbms\\\\Database::(?:query|beginIfImplied) \((.+)\)$/',
+                       $fname,
+                       $m
+               ) ) {
                        $check = $m[1];
                }
 
@@ -148,7 +152,7 @@ class DatabaseTestHelper extends Database {
 
        // Redeclare parent method to make it public
        public function nativeReplace( $table, $rows, $fname ) {
-               return parent::nativeReplace( $table, $rows, $fname );
+               parent::nativeReplace( $table, $rows, $fname );
        }
 
        function getType() {