diff options
| author | Petr Pchelko <ppchelko@wikimedia.org> | 2020-11-05 10:04:37 -0700 |
|---|---|---|
| committer | Petr Pchelko <ppchelko@wikimedia.org> | 2020-11-10 07:09:41 -0700 |
| commit | 017cfcf016bcfab5d0a27d4d2b6e9aed8b6aebac (patch) | |
| tree | 1481eb6215ca9ab5af7fa4f4b422ef6791b8d7b6 /tests/common | |
| parent | 8eafad0cdd4c4f662c42f04c19f435361e248019 (diff) | |
| download | mediawikicore-017cfcf016bcfab5d0a27d4d2b6e9aed8b6aebac.tar.gz mediawikicore-017cfcf016bcfab5d0a27d4d2b6e9aed8b6aebac.zip | |
Forward-compat for merging CacheTime and ParserOutput mOptions
CacheTime::mUsedOptions and ParserOutput::mAccessedOptions
do exactly the same thing and has to be merged into a single property.
This patch adds forward-compatibility and needs to be deployed
at least one train before the patch which actually merges the properties.
Change-Id: Ic9d71a443994e2545ebf2a826b9155c82961cb88
Diffstat (limited to 'tests/common')
| -rw-r--r-- | tests/common/TestsAutoLoader.php | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/tests/common/TestsAutoLoader.php b/tests/common/TestsAutoLoader.php index 556186cfee0e..f776c7fa96fb 100644 --- a/tests/common/TestsAutoLoader.php +++ b/tests/common/TestsAutoLoader.php @@ -140,10 +140,10 @@ $wgAutoloadClasses += [ 'ParserIntegrationTest' => "$testDir/phpunit/suites/ParserIntegrationTest.php", 'MediaWiki\Tests\Parser\ParserCacheSerializationTestCases' => "$testDir/phpunit/includes/parser/ParserCacheSerializationTestCases.php", - 'MediaWiki\Tests\Parser\SerializationTestTrait' => - "$testDir/phpunit/includes/parser/SerializationTestTrait.php", - 'MediaWiki\Tests\Parser\SerializationTestUtils' => - "$testDir/phpunit/includes/parser/SerializationTestUtils.php", + 'Wikimedia\Tests\SerializationTestTrait' => + "$testDir/phpunit/includes/libs/serialization/SerializationTestTrait.php", + 'Wikimedia\Tests\SerializationTestUtils' => + "$testDir/phpunit/includes/libs/serialization/SerializationTestUtils.php", # tests/phpunit/includes/resourceloader 'ResourceLoaderImageModuleTest' => @@ -223,6 +223,7 @@ $wgAutoloadClasses += [ # tests/phpunit/unit/includes 'BadFileLookupTest' => "$testDir/phpunit/unit/includes/BadFileLookupTest.php", + 'Wikimedia\\Reflection\\GhostFieldTestClass' => "$testDir/phpunit/mocks/GhostFieldTestClass.php", # tests/phpunit/unit/includes/editpage/Constraint and tests/phpunit/integration/includes/editpage/Constraint 'EditConstraintTestTrait' => "$testDir/phpunit/unit/includes/editpage/Constraint/EditConstraintTestTrait.php", |