Merge "Chrome Origin Trial support"

[lhc/web/wiklou.git] / tests / common / TestsAutoLoader.php

diff --git a/tests/common/TestsAutoLoader.php b/tests/common/TestsAutoLoader.php
index f843123..f742a1b 100644 (file)
--- a/tests/common/TestsAutoLoader.php
+++ b/tests/common/TestsAutoLoader.php
@@ -48,7 +48,6 @@ $wgAutoloadClasses += [
        'TestFileEditor' => "$testDir/parser/TestFileEditor.php",
        'TestFileReader' => "$testDir/parser/TestFileReader.php",
        'TestRecorder' => "$testDir/parser/TestRecorder.php",
-       'TidySupport' => "$testDir/parser/TidySupport.php",
 
        # tests/phpunit
        'EmptyResourceLoader' => "$testDir/phpunit/ResourceLoaderTestCase.php",
@@ -56,7 +55,9 @@ $wgAutoloadClasses += [
        'LessFileCompilationTest' => "$testDir/phpunit/LessFileCompilationTest.php",
        'MediaWikiCoversValidator' => "$testDir/phpunit/MediaWikiCoversValidator.php",
        'MediaWikiLangTestCase' => "$testDir/phpunit/MediaWikiLangTestCase.php",
+       'MediaWikiLoggerPHPUnitTestListener' => "$testDir/phpunit/MediaWikiLoggerPHPUnitTestListener.php",
        'MediaWikiPHPUnitCommand' => "$testDir/phpunit/MediaWikiPHPUnitCommand.php",
+       'MediaWikiPHPUnitResultPrinter' => "$testDir/phpunit/MediaWikiPHPUnitResultPrinter.php",
        'MediaWikiPHPUnitTestListener' => "$testDir/phpunit/MediaWikiPHPUnitTestListener.php",
        'MediaWikiTestCase' => "$testDir/phpunit/MediaWikiTestCase.php",
        'MediaWikiTestResult' => "$testDir/phpunit/MediaWikiTestResult.php",
@@ -230,11 +231,7 @@ spl_autoload_register( function ( $class ) {
                'PHPUnit_Framework_Error' => 'PHPUnit\Framework\Error\Error',
        ];
 
-       if ( isset( $map[$class] ) ) {
-               $newForm = $map[$class];
-       } else {
-               $newForm = str_replace( '_', '\\', $class );
-       }
+       $newForm = $map[$class] ?? str_replace( '_', '\\', $class );
 
        if ( class_exists( $newForm ) || interface_exists( $newForm ) ) {
                // If the new class name exists, alias