From 469d961bb74931ef10c9b6d1edc3590c0f214b5d Mon Sep 17 00:00:00 2001 From: Timo Tijhof Date: Wed, 19 Jun 2019 15:38:32 +0100 Subject: [PATCH] resourceloader: Switch Xml::encodeJsCall call in getDeprecationInformation Also rename one of the test classes to have a more descriptive name. Bug: T32956 Change-Id: I1a970c198300b7ef0d99c15609f1fb7fa8783b98 --- includes/resourceloader/ResourceLoaderModule.php | 5 +---- tests/common/TestsAutoLoader.php | 2 +- tests/phpunit/ResourceLoaderTestCase.php | 2 +- .../includes/resourceloader/ResourceLoaderModuleTest.php | 2 +- 4 files changed, 4 insertions(+), 7 deletions(-) diff --git a/includes/resourceloader/ResourceLoaderModule.php b/includes/resourceloader/ResourceLoaderModule.php index dd7857ee8a..0baed65fce 100644 --- a/includes/resourceloader/ResourceLoaderModule.php +++ b/includes/resourceloader/ResourceLoaderModule.php @@ -146,10 +146,7 @@ abstract class ResourceLoaderModule implements LoggerAwareInterface { if ( is_string( $deprecationInfo ) ) { $warning .= "\n" . $deprecationInfo; } - return Xml::encodeJsCall( - 'mw.log.warn', - [ $warning ] - ); + return 'mw.log.warn(' . ResourceLoader::encodeJsonForScript( $warning ) . ');'; } else { return ''; } diff --git a/tests/common/TestsAutoLoader.php b/tests/common/TestsAutoLoader.php index 3b643a5d97..b60577cd9a 100644 --- a/tests/common/TestsAutoLoader.php +++ b/tests/common/TestsAutoLoader.php @@ -64,7 +64,7 @@ $wgAutoloadClasses += [ 'MediaWikiTestResult' => "$testDir/phpunit/MediaWikiTestResult.php", 'MediaWikiTestRunner' => "$testDir/phpunit/MediaWikiTestRunner.php", 'PHPUnit4And6Compat' => "$testDir/phpunit/PHPUnit4And6Compat.php", - 'ResourceLoaderFileModuleTestModule' => "$testDir/phpunit/ResourceLoaderTestCase.php", + 'ResourceLoaderFileModuleTestingSubclass' => "$testDir/phpunit/ResourceLoaderTestCase.php", 'ResourceLoaderFileTestModule' => "$testDir/phpunit/ResourceLoaderTestCase.php", 'ResourceLoaderTestCase' => "$testDir/phpunit/ResourceLoaderTestCase.php", 'ResourceLoaderTestModule' => "$testDir/phpunit/ResourceLoaderTestCase.php", diff --git a/tests/phpunit/ResourceLoaderTestCase.php b/tests/phpunit/ResourceLoaderTestCase.php index 3e4531cd5c..e5c0cbc41d 100644 --- a/tests/phpunit/ResourceLoaderTestCase.php +++ b/tests/phpunit/ResourceLoaderTestCase.php @@ -174,7 +174,7 @@ class ResourceLoaderFileTestModule extends ResourceLoaderFileModule { } } -class ResourceLoaderFileModuleTestModule extends ResourceLoaderFileModule { +class ResourceLoaderFileModuleTestingSubclass extends ResourceLoaderFileModule { } class EmptyResourceLoader extends ResourceLoader { diff --git a/tests/phpunit/includes/resourceloader/ResourceLoaderModuleTest.php b/tests/phpunit/includes/resourceloader/ResourceLoaderModuleTest.php index 0c707d5537..3f6e9b00e4 100644 --- a/tests/phpunit/includes/resourceloader/ResourceLoaderModuleTest.php +++ b/tests/phpunit/includes/resourceloader/ResourceLoaderModuleTest.php @@ -56,7 +56,7 @@ class ResourceLoaderModuleTest extends ResourceLoaderTestCase { ); // Subclass - $module = new ResourceLoaderFileModuleTestModule( $baseParams ); + $module = new ResourceLoaderFileModuleTestingSubclass( $baseParams ); $this->assertNotEquals( $version, json_encode( $module->getVersionHash( $context ) ), -- 2.20.1