Merge "Make label on Special:Undelete search reflect whether search is full-text...

[lhc/web/wiklou.git] / tests / phpunit / maintenance / MaintenanceTest.php

diff --git a/tests/phpunit/maintenance/MaintenanceTest.php b/tests/phpunit/maintenance/MaintenanceTest.php
index cbf94d6..e21e726 100644 (file)
--- a/tests/phpunit/maintenance/MaintenanceTest.php
+++ b/tests/phpunit/maintenance/MaintenanceTest.php
@@ -24,7 +24,6 @@ use MediaWiki\MediaWikiServices;
  * Due to a hack in Maintenance.php using register_shutdown_function, be sure to
  * finally call simulateShutdown on MaintenanceFixup instance before a test
  * ends.
- *
  */
 class MaintenanceFixup extends Maintenance {
 
@@ -53,7 +52,6 @@ class MaintenanceFixup extends Maintenance {
         * Simulates what Maintenance wants to happen at script's end.
         */
        public function simulateShutdown() {
-
                if ( $this->shutdownSimulated ) {
                        $this->testCase->fail( __METHOD__ . " called more than once" );
                }
@@ -176,7 +174,6 @@ class MaintenanceTest extends MediaWikiTestCase {
         *   after shutdown simulation.
         */
        private function assertOutputPrePostShutdown( $preShutdownOutput, $expectNLAppending ) {
-
                $this->assertEquals( $preShutdownOutput, $this->getActualOutput(),
                        "Output before shutdown simulation" );
 
@@ -836,7 +833,7 @@ class MaintenanceTest extends MediaWikiTestCase {
         * @covers Maintenance::setConfig
         */
        public function testSetConfig() {
-               $conf = $this->getMock( 'Config' );
+               $conf = $this->createMock( 'Config' );
                $this->m->setConfig( $conf );
                $this->assertSame( $conf, $this->m->getConfig() );
        }