Merge "resourceloader: Replace some Xml::encodeJs calls with RL's own encodeJson"

diff --combined includes/resourceloader/ResourceLoader.php
index 1937ecf,f8e76ac..671fe86
--- 1/includes/resourceloader/ResourceLoader.php
--- 2/includes/resourceloader/ResourceLoader.php
+++ b/includes/resourceloader/ResourceLoader.php
@@@ -297,13 -297,13 +297,13 @@@ class ResourceLoader implements LoggerA
        /**
         * Register a module with the ResourceLoader system.
         *
 -       * @param mixed $name Name of module as a string or List of name/object pairs as an array
 -       * @param array|null $info Module info array. For backwards compatibility with 1.17alpha,
 -       *   this may also be a ResourceLoaderModule object. Optional when using
 -       *   multiple-registration calling style.
 +       * @param string|array[] $name Module name as a string or, array of module info arrays
 +       *  keyed by name.
 +       * @param array|null $info Module info array. When using the first parameter to register
 +       *  multiple modules at once, this parameter is optional.
         * @throws MWException If a duplicate module registration is attempted
         * @throws MWException If a module name contains illegal characters (pipes or commas)
 -       * @throws MWException If something other than a ResourceLoaderModule is being registered
 +       * @throws InvalidArgumentException If the module info is not an array
         */
        public function register( $name, $info = null ) {
                $moduleSkinStyles = $this->config->get( 'ResourceModuleSkinStyles' );
@@@ -320,21 -320,29 +320,21 @@@
                                );
                        }
  
 -                      // Check $name for validity
 +                      // Check validity
                        if ( !self::isValidModuleName( $name ) ) {
                                throw new MWException( "ResourceLoader module name '$name' is invalid, "
                                        . "see ResourceLoader::isValidModuleName()" );
                        }
 -
 -                      // Attach module
 -                      if ( $info instanceof ResourceLoaderModule ) {
 -                              $this->moduleInfos[$name] = [ 'object' => $info ];
 -                              $info->setName( $name );
 -                              $this->modules[$name] = $info;
 -                      } elseif ( is_array( $info ) ) {
 -                              // New calling convention
 -                              $this->moduleInfos[$name] = $info;
 -                      } else {
 -                              throw new MWException(
 -                                      'ResourceLoader module info type error for module \'' . $name .
 -                                      '\': expected ResourceLoaderModule or array (got: ' . gettype( $info ) . ')'
 +                      if ( !is_array( $info ) ) {
 +                              throw new InvalidArgumentException(
 +                                      'Invalid module info for "' . $name . '": expected array, got ' . gettype( $info )
                                );
                        }
  
 -                      // Last-minute changes
 +                      // Attach module
 +                      $this->moduleInfos[$name] = $info;
  
 +                      // Last-minute changes
                        // Apply custom skin-defined styles to existing modules.
                        if ( $this->isFileModule( $name ) ) {
                                foreach ( $moduleSkinStyles as $skinName => $skinStyles ) {
@@@ -520,18 -528,23 +520,18 @@@
                                // No such module
                                return null;
                        }
 -                      // Construct the requested object
 +                      // Construct the requested module object
                        $info = $this->moduleInfos[$name];
 -                      /** @var ResourceLoaderModule $object */
 -                      if ( isset( $info['object'] ) ) {
 -                              // Object given in info array
 -                              $object = $info['object'];
 -                      } elseif ( isset( $info['factory'] ) ) {
 +                      if ( isset( $info['factory'] ) ) {
 +                              /** @var ResourceLoaderModule $object */
                                $object = call_user_func( $info['factory'], $info );
 -                              $object->setConfig( $this->getConfig() );
 -                              $object->setLogger( $this->logger );
                        } else {
                                $class = $info['class'] ?? ResourceLoaderFileModule::class;
                                /** @var ResourceLoaderModule $object */
                                $object = new $class( $info );
 -                              $object->setConfig( $this->getConfig() );
 -                              $object->setLogger( $this->logger );
                        }
 +                      $object->setConfig( $this->getConfig() );
 +                      $object->setLogger( $this->logger );
                        $object->setName( $name );
                        $this->modules[$name] = $object;
                }
@@@ -550,6 -563,9 +550,6 @@@
                        return false;
                }
                $info = $this->moduleInfos[$name];
 -              if ( isset( $info['object'] ) ) {
 -                      return false;
 -              }
                return !isset( $info['factory'] ) && (
                        // The implied default for 'class' is ResourceLoaderFileModule
                        !isset( $info['class'] ) ||
@@@ -1243,11 -1259,9 +1243,9 @@@ MESSAGE
         * @return string JavaScript code
         */
        public static function makeMessageSetScript( $messages ) {
-               return Xml::encodeJsCall(
-                       'mw.messages.set',
-                       [ (object)$messages ],
-                       self::inDebugMode()
-               );
+               return 'mw.messages.set('
+                       . self::encodeJsonForScript( (object)$messages )
+                       . ');';
        }
  
        /**
@@@ -1331,11 -1345,9 +1329,9 @@@
                if ( !is_array( $states ) ) {
                        $states = [ $states => $state ];
                }
-               return Xml::encodeJsCall(
-                       'mw.loader.state',
-                       [ $states ],
-                       self::inDebugMode()
-               );
+               return 'mw.loader.state('
+                       . self::encodeJsonForScript( $states )
+                       . ');';
        }
  
        private static function isEmptyObject( stdClass $obj ) {
@@@ -1419,11 -1431,9 +1415,9 @@@
  
                array_walk( $modules, [ self::class, 'trimArray' ] );
  
-               return Xml::encodeJsCall(
-                       'mw.loader.register',
-                       [ $modules ],
-                       self::inDebugMode()
-               );
+               return 'mw.loader.register('
+                       . self::encodeJsonForScript( $modules )
+                       . ');';
        }
  
        /**
@@@ -1444,11 -1454,9 +1438,9 @@@
                if ( !is_array( $sources ) ) {
                        $sources = [ $sources => $loadUrl ];
                }
-               return Xml::encodeJsCall(
-                       'mw.loader.addSource',
-                       [ $sources ],
-                       self::inDebugMode()
-               );
+               return 'mw.loader.addSource('
+                       . self::encodeJsonForScript( $sources )
+                       . ');';
        }
  
        /**

diff --combined tests/phpunit/includes/resourceloader/ResourceLoaderTest.php
index 44a1ac0,412272d..86c2e9f
--- 1/tests/phpunit/includes/resourceloader/ResourceLoaderTest.php
--- 2/tests/phpunit/includes/resourceloader/ResourceLoaderTest.php
+++ b/tests/phpunit/includes/resourceloader/ResourceLoaderTest.php
@@@ -113,7 -113,7 +113,7 @@@ class ResourceLoaderTest extends Resour
         */
        public function testRegisterInvalidType() {
                $resourceLoader = new EmptyResourceLoader();
 -              $this->setExpectedException( MWException::class, 'ResourceLoader module info type error' );
 +              $this->setExpectedException( InvalidArgumentException::class, 'Invalid module info' );
                $resourceLoader->register( 'test', new stdClass() );
        }
  
@@@ -560,12 -560,12 +560,12 @@@ EN
         */
        public function testMakeLoaderRegisterScript() {
                $this->assertEquals(
-                       'mw.loader.register( [
+                       'mw.loader.register([
      [
          "test.name",
          "1234567"
      ]
- ] );',
+ ]);',
                        ResourceLoader::makeLoaderRegisterScript( [
                                [ 'test.name', '1234567' ],
                        ] ),
@@@ -573,7 -573,7 +573,7 @@@
                );
  
                $this->assertEquals(
-                       'mw.loader.register( [
+                       'mw.loader.register([
      [
          "test.foo",
          "100"
@@@ -601,7 -601,7 +601,7 @@@
          null,
          "return true;"
      ]
- ] );',
+ ]);',
                        ResourceLoader::makeLoaderRegisterScript( [
                                [ 'test.foo', '100' , [], null, null ],
                                [ 'test.bar', '200', [ 'test.unknown' ], null ],
@@@ -617,29 -617,29 +617,29 @@@
         */
        public function testMakeLoaderSourcesScript() {
                $this->assertEquals(
-                       'mw.loader.addSource( {
+                       'mw.loader.addSource({
      "local": "/w/load.php"
- } );',
+ });',
                        ResourceLoader::makeLoaderSourcesScript( 'local', '/w/load.php' )
                );
                $this->assertEquals(
-                       'mw.loader.addSource( {
+                       'mw.loader.addSource({
      "local": "/w/load.php"
- } );',
+ });',
                        ResourceLoader::makeLoaderSourcesScript( [ 'local' => '/w/load.php' ] )
                );
                $this->assertEquals(
-                       'mw.loader.addSource( {
+                       'mw.loader.addSource({
      "local": "/w/load.php",
      "example": "https://example.org/w/load.php"
- } );',
+ });',
                        ResourceLoader::makeLoaderSourcesScript( [
                                'local' => '/w/load.php',
                                'example' => 'https://example.org/w/load.php'
                        ] )
                );
                $this->assertEquals(
-                       'mw.loader.addSource( [] );',
+                       'mw.loader.addSource([]);',
                        ResourceLoader::makeLoaderSourcesScript( [] )
                );
        }
@@@ -747,9 -747,9 +747,9 @@@
                                'modules' => [
                                        'foo' => 'foo()',
                                ],
-                               'expected' => "foo()\n" . 'mw.loader.state( {
+                               'expected' => "foo()\n" . 'mw.loader.state({
      "foo": "ready"
- } );',
+ });',
                                'minified' => "foo()\n" . 'mw.loader.state({"foo":"ready"});',
                                'message' => 'Script without semi-colon',
                        ],
@@@ -758,10 -758,10 +758,10 @@@
                                        'foo' => 'foo()',
                                        'bar' => 'bar()',
                                ],
-                               'expected' => "foo()\nbar()\n" . 'mw.loader.state( {
+                               'expected' => "foo()\nbar()\n" . 'mw.loader.state({
      "foo": "ready",
      "bar": "ready"
- } );',
+ });',
                                'minified' => "foo()\nbar()\n" . 'mw.loader.state({"foo":"ready","bar":"ready"});',
                                'message' => 'Two scripts without semi-colon',
                        ],
@@@ -769,9 -769,9 +769,9 @@@
                                'modules' => [
                                        'foo' => "foo()\n// bar();"
                                ],
-                               'expected' => "foo()\n// bar();\n" . 'mw.loader.state( {
+                               'expected' => "foo()\n// bar();\n" . 'mw.loader.state({
      "foo": "ready"
- } );',
+ });',
                                'minified' => "foo()\n" . 'mw.loader.state({"foo":"ready"});',
                                'message' => 'Script with semi-colon in comment (T162719)',
                        ],
@@@ -866,11 -866,11 +866,11 @@@
                $this->assertCount( 1, $errors );
                $this->assertRegExp( '/Ferry not found/', $errors[0] );
                $this->assertEquals(
-                       "foo();\nbar();\n" . 'mw.loader.state( {
+                       "foo();\nbar();\n" . 'mw.loader.state({
      "ferry": "error",
      "foo": "ready",
      "bar": "ready"
- } );',
+ });',
                        $response
                );
        }