Merge "ApiParse: Deprecate prop=headitems"

diff --git a/includes/api/ApiOpenSearch.php b/includes/api/ApiOpenSearch.php
index b13ba58..ace776c 100644 (file)
--- a/includes/api/ApiOpenSearch.php
+++ b/includes/api/ApiOpenSearch.php
@@ -294,7 +294,7 @@ class ApiOpenSearch extends ApiBase {
 
        public function getSearchProfileParams() {
                return [
-                       'qiprofile' => [
+                       'profile' => [
                                'profile-type' => SearchEngine::COMPLETION_PROFILE_TYPE,
                                'help-message' => 'apihelp-query+prefixsearch-param-profile'
                        ],

diff --git a/tests/phpunit/includes/api/ApiOpenSearchTest.php b/tests/phpunit/includes/api/ApiOpenSearchTest.php
index fd5b3a9..39e90c2 100644 (file)
--- a/tests/phpunit/includes/api/ApiOpenSearchTest.php
+++ b/tests/phpunit/includes/api/ApiOpenSearchTest.php
@@ -30,8 +30,8 @@ class ApiOpenSearchTest extends MediaWikiTestCase {
                $params = $api->getAllowedParams();
 
                $this->assertArrayNotHasKey( 'offset', $params );
-               $this->assertArrayHasKey( 'qiprofile', $params, print_r( $params, true ) );
-               $this->assertEquals( 'normal', $params['qiprofile'][ApiBase::PARAM_DFLT] );
+               $this->assertArrayHasKey( 'profile', $params, print_r( $params, true ) );
+               $this->assertEquals( 'normal', $params['profile'][ApiBase::PARAM_DFLT] );
        }
 
        private function replaceSearchEngineConfig() {