Merge "Revert "Log the reason why revision->getContent() returns null""

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

diff --git a/tests/phpunit/includes/CommentStoreTest.php b/tests/phpunit/includes/CommentStoreTest.php
index 84e1f32..a510897 100644 (file)
--- a/tests/phpunit/includes/CommentStoreTest.php
+++ b/tests/phpunit/includes/CommentStoreTest.php
@@ -542,7 +542,6 @@ class CommentStoreTest extends MediaWikiLangTestCase {
                $ipbfields = [
                        'ipb_range_start' => '',
                        'ipb_range_end' => '',
-                       'ipb_by' => 0,
                        'ipb_timestamp' => $db->timestamp(),
                        'ipb_expiry' => $db->getInfinity(),
                ];
@@ -550,8 +549,6 @@ class CommentStoreTest extends MediaWikiLangTestCase {
                        'rev_page' => 42,
                        'rev_text_id' => 42,
                        'rev_len' => 0,
-                       'rev_user' => 0,
-                       'rev_user_text' => '',
                        'rev_timestamp' => $db->timestamp(),
                ];
                $comStoreComment = new CommentStoreComment(
@@ -648,8 +645,8 @@ class CommentStoreTest extends MediaWikiLangTestCase {
        }
 
        public function testGetCommentErrors() {
-               MediaWiki\suppressWarnings();
-               $reset = new ScopedCallback( 'MediaWiki\restoreWarnings' );
+               Wikimedia\suppressWarnings();
+               $reset = new ScopedCallback( 'Wikimedia\restoreWarnings' );
 
                $store = $this->makeStore( MIGRATION_OLD );
                $res = $store->getComment( 'dummy', [ 'dummy' => 'comment' ] );