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

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

diff --git a/tests/phpunit/includes/exception/ErrorPageErrorTest.php b/tests/phpunit/includes/exception/ErrorPageErrorTest.php
index 71398e3..49d454e 100644 (file)
--- a/tests/phpunit/includes/exception/ErrorPageErrorTest.php
+++ b/tests/phpunit/includes/exception/ErrorPageErrorTest.php
@@ -7,7 +7,7 @@
 class ErrorPageErrorTest extends MediaWikiTestCase {
 
        private function getMockMessage() {
-               $mockMessage = $this->getMockBuilder( 'Message' )
+               $mockMessage = $this->getMockBuilder( Message::class )
                        ->disableOriginalConstructor()
                        ->getMock();
                $mockMessage->expects( $this->once() )
@@ -34,7 +34,7 @@ class ErrorPageErrorTest extends MediaWikiTestCase {
                $title = 'Foo';
                $params = [ 'Baz' ];
 
-               $mock = $this->getMockBuilder( 'OutputPage' )
+               $mock = $this->getMockBuilder( OutputPage::class )
                        ->disableOriginalConstructor()
                        ->getMock();
                $mock->expects( $this->once() )
@@ -43,6 +43,7 @@ class ErrorPageErrorTest extends MediaWikiTestCase {
                $mock->expects( $this->once() )
                        ->method( 'output' );
                $this->setMwGlobals( 'wgOut', $mock );
+               $this->setMwGlobals( 'wgCommandLineMode', false );
 
                $e = new ErrorPageError( $title, $mockMessage, $params );
                $e->report();