Merge "Use our fork of less.php" into REL1_31

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

diff --git a/tests/common/TestsAutoLoader.php b/tests/common/TestsAutoLoader.php
index b626063..abf718d 100644 (file)
--- a/tests/common/TestsAutoLoader.php
+++ b/tests/common/TestsAutoLoader.php
@@ -64,6 +64,7 @@ $wgAutoloadClasses += [
        'LessFileCompilationTest' => "$testDir/phpunit/LessFileCompilationTest.php",
        'MediaWikiCoversValidator' => "$testDir/phpunit/MediaWikiCoversValidator.php",
        'PHPUnit4And6Compat' => "$testDir/phpunit/PHPUnit4And6Compat.php",
+       'HamcrestPHPUnitIntegration' => "$testDir/phpunit/HamcrestPHPUnitIntegration.php",
 
        # tests/phpunit/includes
        'RevisionDbTestBase' => "$testDir/phpunit/includes/RevisionDbTestBase.php",
@@ -149,6 +150,7 @@ $wgAutoloadClasses += [
 
        # tests/phpunit/includes/Storage
        'MediaWiki\Tests\Storage\RevisionSlotsTest' => "$testDir/phpunit/includes/Storage/RevisionSlotsTest.php",
+       'MediaWiki\Tests\Storage\RevisionRecordTests' => "$testDir/phpunit/includes/Storage/RevisionRecordTests.php",
 
        # tests/phpunit/languages
        'LanguageClassesTestCase' => "$testDir/phpunit/languages/LanguageClassesTestCase.php",
@@ -202,7 +204,8 @@ spl_autoload_register( function ( $class ) {
 
        // Classes that don't map 100%
        $map = [
-               'PHPUnit_Framework_TestSuite_DataProvider' => 'PHPUnit\Framework\DataProviderTestSuite'
+               'PHPUnit_Framework_TestSuite_DataProvider' => 'PHPUnit\Framework\DataProviderTestSuite',
+               'PHPUnit_Framework_Error' => 'PHPUnit\Framework\Error\Error',
        ];
 
        if ( isset( $map[$class] ) ) {
@@ -211,7 +214,7 @@ spl_autoload_register( function ( $class ) {
                $newForm = str_replace( '_', '\\', $class );
        }
 
-       if ( class_exists( $newForm ) ) {
+       if ( class_exists( $newForm ) || interface_exists( $newForm ) ) {
                // If the new class name exists, alias
                // the old name to it.
                class_alias( $newForm, $class );