Merge "Parser: Call firstCallInit() in getTags/getFunctionHooks"

diff --git a/includes/api/ApiQuerySiteinfo.php b/includes/api/ApiQuerySiteinfo.php
index c26bb62..eaa3bc1 100644 (file)
--- a/includes/api/ApiQuerySiteinfo.php
+++ b/includes/api/ApiQuerySiteinfo.php
@@ -784,7 +784,6 @@ class ApiQuerySiteinfo extends ApiQueryBase {
 
        public function appendExtensionTags( $property ) {
                global $wgParser;
-               $wgParser->firstCallInit();
                $tags = array_map(
                        function ( $item ) {
                                return "<$item>";
@@ -799,7 +798,6 @@ class ApiQuerySiteinfo extends ApiQueryBase {
 
        public function appendFunctionHooks( $property ) {
                global $wgParser;
-               $wgParser->firstCallInit();
                $hooks = $wgParser->getFunctionHooks();
                ApiResult::setArrayType( $hooks, 'BCarray' );
                ApiResult::setIndexedTagName( $hooks, 'h' );

diff --git a/includes/parser/Parser.php b/includes/parser/Parser.php
index b1e3928..1fc2f92 100644 (file)
--- a/includes/parser/Parser.php
+++ b/includes/parser/Parser.php
@@ -4926,6 +4926,7 @@ class Parser {
         * @return array
         */
        public function getFunctionHooks() {
+               $this->firstCallInit();
                return array_keys( $this->mFunctionHooks );
        }
 
@@ -5482,6 +5483,7 @@ class Parser {
         * @return array
         */
        public function getTags() {
+               $this->firstCallInit();
                return array_merge(
                        array_keys( $this->mTransparentTagHooks ),
                        array_keys( $this->mTagHooks ),

diff --git a/tests/phpunit/includes/api/ApiQuerySiteinfoTest.php b/tests/phpunit/includes/api/ApiQuerySiteinfoTest.php
index 7b93571..fe2058f 100644 (file)
--- a/tests/phpunit/includes/api/ApiQuerySiteinfoTest.php
+++ b/tests/phpunit/includes/api/ApiQuerySiteinfoTest.php
@@ -571,7 +571,6 @@ class ApiQuerySiteinfoTest extends ApiTestCase {
        public function testExtensionTags() {
                global $wgParser;
 
-               $wgParser->firstCallInit();
                $expected = array_map(
                        function ( $tag ) {
                                return "<$tag>";
@@ -585,7 +584,6 @@ class ApiQuerySiteinfoTest extends ApiTestCase {
        public function testFunctionHooks() {
                global $wgParser;
 
-               $wgParser->firstCallInit();
                $this->assertSame( $wgParser->getFunctionHooks(), $this->doQuery( 'functionhooks' ) );
        }