Merge "resourceloader: Remove addModuleScripts, and deprecate getModuleScripts."

diff --combined includes/OutputPage.php
index 0695443,c663855..9b7d9a0
--- 1/includes/OutputPage.php
--- 2/includes/OutputPage.php
+++ b/includes/OutputPage.php
@@@ -152,9 -152,6 +152,6 @@@ class OutputPage extends ContextSource 
        /** @var array */
        protected $mModules = [];
  
-       /** @var array */
-       protected $mModuleScripts = [];
- 
        /** @var array */
        protected $mModuleStyles = [];
  
@@@ -552,30 -549,12 +549,12 @@@
        }
  
        /**
-        * Get the list of script-only modules to load on this page.
-        *
-        * @param bool $filter
-        * @param string|null $position Unused
-        * @return array Array of module names
-        */
-       public function getModuleScripts( $filter = false, $position = null ) {
-               return $this->getModules( $filter, null, 'mModuleScripts',
-                       ResourceLoaderModule::TYPE_SCRIPTS
-               );
-       }
- 
-       /**
-        * Load the scripts of one or more ResourceLoader modules, on this page.
-        *
-        * This method exists purely to provide the legacy behaviour of loading
-        * a module's scripts in the global scope, and without dependency resolution.
-        * See <https://phabricator.wikimedia.org/T188689>.
-        *
-        * @deprecated since 1.31 Use addModules() instead.
-        * @param string|array $modules Module name (string) or array of module names
+        * @deprecated since 1.33 Use getModules() instead.
+        * @return array
         */
-       public function addModuleScripts( $modules ) {
-               $this->mModuleScripts = array_merge( $this->mModuleScripts, (array)$modules );
+       public function getModuleScripts() {
+               wfDeprecated( __METHOD__, '1.33' );
+               return [];
        }
  
        /**
@@@ -953,8 -932,6 +932,8 @@@
         * good tags like \<i\> will be dropped entirely.
         *
         * @param string|Message $name
 +       * @param-taint $name tainted
 +       * Phan-taint-check gets very confused by $name being either a string or a Message
         */
        public function setPageTitle( $name ) {
                if ( $name instanceof Message ) {
@@@ -968,7 -945,7 +947,7 @@@
  
                # change "<i>foo&amp;bar</i>" to "foo&bar"
                $this->setHTMLTitle(
 -                      $this->msg( 'pagetitle' )->rawParams( Sanitizer::stripAllTags( $nameWithTags ) )
 +                      $this->msg( 'pagetitle' )->plaintextParams( Sanitizer::stripAllTags( $nameWithTags ) )
                                ->inContentLanguage()
                );
        }
@@@ -1972,7 -1949,6 +1951,6 @@@
                $this->mNoGallery = $parserOutput->getNoGallery();
                $this->mHeadItems = array_merge( $this->mHeadItems, $parserOutput->getHeadItems() );
                $this->addModules( $parserOutput->getModules() );
-               $this->addModuleScripts( $parserOutput->getModuleScripts() );
                $this->addModuleStyles( $parserOutput->getModuleStyles() );
                $this->addJsConfigVars( $parserOutput->getJsConfigVars() );
                $this->mPreventClickjacking = $this->mPreventClickjacking
@@@ -2039,7 -2015,6 +2017,6 @@@
                $this->addParserOutputText( $parserOutput, $poOptions );
  
                $this->addModules( $parserOutput->getModules() );
-               $this->addModuleScripts( $parserOutput->getModuleScripts() );
                $this->addModuleStyles( $parserOutput->getModuleStyles() );
  
                $this->addJsConfigVars( $parserOutput->getJsConfigVars() );
@@@ -3185,7 -3160,6 +3162,6 @@@
                        $rlClient->setConfig( $this->getJSVars() );
                        $rlClient->setModules( $this->getModules( /*filter*/ true ) );
                        $rlClient->setModuleStyles( $moduleStyles );
-                       $rlClient->setModuleScripts( $this->getModuleScripts( /*filter*/ true ) );
                        $rlClient->setExemptStates( $exemptStates );
                        $this->rlClient = $rlClient;
                }