Merge "Skin: Make skins aware of their registered skin name"

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

diff --git a/tests/phpunit/includes/content/ContentHandlerTest.php b/tests/phpunit/includes/content/ContentHandlerTest.php
index 403bee1..2422e79 100644 (file)
--- a/tests/phpunit/includes/content/ContentHandlerTest.php
+++ b/tests/phpunit/includes/content/ContentHandlerTest.php
@@ -28,14 +28,14 @@ class ContentHandlerTest extends MediaWikiTestCase {
                                CONTENT_MODEL_CSS => 'CssContentHandler',
                                CONTENT_MODEL_TEXT => 'TextContentHandler',
                                'testing' => 'DummyContentHandlerForTesting',
-                               'testing-callbacks' => function( $modelId ) {
+                               'testing-callbacks' => function ( $modelId ) {
                                        return new DummyContentHandlerForTesting( $modelId );
                                }
                        ],
                ] );
 
                // Reset namespace cache
-               MWNamespace::getCanonicalNamespaces( true );
+               MWNamespace::clearCaches();
                $wgContLang->resetNamespaces();
                // And LinkCache
                MediaWikiServices::getInstance()->resetServiceForTesting( 'LinkCache' );
@@ -45,7 +45,7 @@ class ContentHandlerTest extends MediaWikiTestCase {
                global $wgContLang;
 
                // Reset namespace cache
-               MWNamespace::getCanonicalNamespaces( true );
+               MWNamespace::clearCaches();
                $wgContLang->resetNamespaces();
                // And LinkCache
                MediaWikiServices::getInstance()->resetServiceForTesting( 'LinkCache' );
@@ -418,7 +418,7 @@ class ContentHandlerTest extends MediaWikiTestCase {
 
                $searchEngine->expects( $this->any() )
                        ->method( 'makeSearchFieldMapping' )
-                       ->will( $this->returnCallback( function( $name, $type ) {
+                       ->will( $this->returnCallback( function ( $name, $type ) {
                                        return new DummySearchIndexFieldDefinition( $name, $type );
                        } ) );