Merge "phpunit: Fix OutputPage::__construct warning in SkinTemplateTest"

diff --git a/tests/phpunit/includes/skins/SkinTemplateTest.php b/tests/phpunit/includes/skins/SkinTemplateTest.php
index b843d17..e8260ac 100644 (file)
--- a/tests/phpunit/includes/skins/SkinTemplateTest.php
+++ b/tests/phpunit/includes/skins/SkinTemplateTest.php
@@ -44,7 +44,9 @@ class SkinTemplateTest extends MediaWikiTestCase {
         * @return PHPUnit_Framework_MockObject_MockObject|OutputPage
         */
        private function getMockOutputPage( $isSyndicated, $html ) {
-               $mock = $this->getMock( OutputPage::class );
+               $mock = $this->getMockBuilder( OutputPage::class )
+                       ->disableOriginalConstructor()
+                       ->getMock();
                $mock->expects( $this->once() )
                        ->method( 'isSyndicated' )
                        ->will( $this->returnValue( $isSyndicated ) );