Remove wgPasswordSenderName from DefaultSettings.php

[lhc/web/wiklou.git] / tests / phpunit / MediaWikiTestCase.php

diff --git a/tests/phpunit/MediaWikiTestCase.php b/tests/phpunit/MediaWikiTestCase.php
index a8cc252..6972165 100644 (file)
--- a/tests/phpunit/MediaWikiTestCase.php
+++ b/tests/phpunit/MediaWikiTestCase.php
@@ -947,7 +947,9 @@ abstract class MediaWikiTestCase extends PHPUnit\Framework\TestCase {
         * @return MediaWikiServices
         * @throws MWException
         */
-       protected function overrideMwServices( Config $configOverrides = null, array $services = [] ) {
+       protected static function overrideMwServices(
+               Config $configOverrides = null, array $services = []
+       ) {
                if ( !$configOverrides ) {
                        $configOverrides = new HashConfig();
                }
@@ -1246,7 +1248,7 @@ abstract class MediaWikiTestCase extends PHPUnit\Framework\TestCase {
                                $user
                        );
                        // an edit always attempt to purge backlink links such as history
-                       // pages. That is unneccessary.
+                       // pages. That is unnecessary.
                        JobQueueGroup::singleton()->get( 'htmlCacheUpdate' )->delete();
                        // WikiPages::doEditUpdates randomly adds RC purges
                        JobQueueGroup::singleton()->get( 'recentChangesUpdate' )->delete();
@@ -1784,7 +1786,7 @@ abstract class MediaWikiTestCase extends PHPUnit\Framework\TestCase {
                                        }
                                        $db->insert(
                                                'interwiki',
-                                               array_map( 'get_object_vars', iterator_to_array( $this->interwikiTable ) ),
+                                               array_values( array_map( 'get_object_vars', iterator_to_array( $this->interwikiTable ) ) ),
                                                __METHOD__
                                        );
                                }