Merge "RCFilters: Add missing jQueryMsg dependency"

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

diff --git a/tests/phpunit/includes/RevisionDbTestBase.php b/tests/phpunit/includes/RevisionDbTestBase.php
index 511b109..b05a742 100644 (file)
--- a/tests/phpunit/includes/RevisionDbTestBase.php
+++ b/tests/phpunit/includes/RevisionDbTestBase.php
@@ -396,7 +396,8 @@ abstract class RevisionDbTestBase extends MediaWikiTestCase {
                $store = new RevisionStore(
                        $services->getDBLoadBalancer(),
                        $services->getService( '_SqlBlobStore' ),
-                       $services->getMainWANObjectCache()
+                       $services->getMainWANObjectCache(),
+                       $services->getCommentStore()
                );
 
                $store->setContentHandlerUseDB( $this->getContentHandlerUseDB() );
@@ -902,7 +903,7 @@ abstract class RevisionDbTestBase extends MediaWikiTestCase {
                        'text_id' => 123456789, // not in the test DB
                ] );
 
-               MediaWiki\suppressWarnings(); // bad text_id will trigger a warning.
+               Wikimedia\suppressWarnings(); // bad text_id will trigger a warning.
 
                $this->assertNull( $rev->getContent(),
                        "getContent() should return null if the revision's text blob could not be loaded." );
@@ -911,7 +912,7 @@ abstract class RevisionDbTestBase extends MediaWikiTestCase {
                $this->assertNull( $rev->getContent(),
                        "getContent() should return null if the revision's text blob could not be loaded." );
 
-               MediaWiki\suppressWarnings( 'end' );
+               Wikimedia\restoreWarnings();
        }
 
        public function provideGetSize() {