Remove hard deprecation of PasswordPolicyChecks::checkPopularPasswordBlacklist

[lhc/web/wiklou.git] / tests / phpunit / includes / api / ApiOpenSearchTest.php

diff --git a/tests/phpunit/includes/api/ApiOpenSearchTest.php b/tests/phpunit/includes/api/ApiOpenSearchTest.php
index 39e90c2..209ca07 100644 (file)
--- a/tests/phpunit/includes/api/ApiOpenSearchTest.php
+++ b/tests/phpunit/includes/api/ApiOpenSearchTest.php
@@ -1,7 +1,8 @@
 <?php
 
-use MediaWiki\MediaWikiServices;
-
+/**
+ * @covers ApiOpenSearch
+ */
 class ApiOpenSearchTest extends MediaWikiTestCase {
        public function testGetAllowedParams() {
                $config = $this->replaceSearchEngineConfig();
@@ -9,11 +10,12 @@ class ApiOpenSearchTest extends MediaWikiTestCase {
                        ->method( 'getSearchTypes' )
                        ->will( $this->returnValue( [ 'the one ring' ] ) );
 
+               $api = $this->createApi();
                $engine = $this->replaceSearchEngine();
                $engine->expects( $this->any() )
                        ->method( 'getProfiles' )
                        ->will( $this->returnValueMap( [
-                               [ SearchEngine::COMPLETION_PROFILE_TYPE, [
+                               [ SearchEngine::COMPLETION_PROFILE_TYPE, $api->getUser(), [
                                        [
                                                'name' => 'normal',
                                                'desc-message' => 'normal-message',
@@ -26,7 +28,6 @@ class ApiOpenSearchTest extends MediaWikiTestCase {
                                ] ],
                        ] ) );
 
-               $api = $this->createApi();
                $params = $api->getAllowedParams();
 
                $this->assertArrayNotHasKey( 'offset', $params );
@@ -35,7 +36,7 @@ class ApiOpenSearchTest extends MediaWikiTestCase {
        }
 
        private function replaceSearchEngineConfig() {
-               $config = $this->getMockBuilder( 'SearchEngineConfig' )
+               $config = $this->getMockBuilder( SearchEngineConfig::class )
                        ->disableOriginalConstructor()
                        ->getMock();
                $this->setService( 'SearchEngineConfig', $config );
@@ -44,10 +45,10 @@ class ApiOpenSearchTest extends MediaWikiTestCase {
        }
 
        private function replaceSearchEngine() {
-               $engine = $this->getMockBuilder( 'SearchEngine' )
+               $engine = $this->getMockBuilder( SearchEngine::class )
                        ->disableOriginalConstructor()
                        ->getMock();
-               $engineFactory = $this->getMockBuilder( 'SearchEngineFactory' )
+               $engineFactory = $this->getMockBuilder( SearchEngineFactory::class )
                        ->disableOriginalConstructor()
                        ->getMock();
                $engineFactory->expects( $this->any() )