From c31a5512732647412d8df03f43c1e0768db281ea Mon Sep 17 00:00:00 2001 From: Sergey Biryukov Date: Wed, 23 Sep 2020 13:52:02 +0000 Subject: Tests: Backport two changes from PHPUnit 9.3: * Replace the `Match` interface with `ParametersMatch`, to avoid parse errors due to `match` being a reserved keyword in PHP 8. * Replace `ReflectionParameter::getClass()` usage, which is deprecated in PHP 8. This allows tests relying on the `getMockForAbstractClass()` and `getMockBuilder()` methods to run again on PHP 8. When the test suite is updated for compatibility with PHPUnit 9.x, these overrides can be removed. Follow-up to [48972]. See #50913, #50902. git-svn-id: https://develop.svn.wordpress.org/trunk@49037 602fd350-edb4-49c9-b593-d223f7449a82 --- composer.json | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) (limited to 'composer.json') diff --git a/composer.json b/composer.json index 58e456582c..41368ef25e 100644 --- a/composer.json +++ b/composer.json @@ -16,7 +16,21 @@ "dealerdirect/phpcodesniffer-composer-installer": "~0.6.0", "wp-coding-standards/wpcs": "~2.3.0", "phpcompatibility/phpcompatibility-wp": "^2.1.0", - "phpunit/phpunit": "^5.7 || ^6.5 || ^7.5" + "phpunit/phpunit": "^7.5" + }, + "autoload-dev": { + "files": [ + "tests/phpunit/includes/phpunit7/MockObject/Builder/NamespaceMatch.php", + "tests/phpunit/includes/phpunit7/MockObject/Builder/ParametersMatch.php", + "tests/phpunit/includes/phpunit7/MockObject/InvocationMocker.php", + "tests/phpunit/includes/phpunit7/MockObject/MockMethod.php" + ], + "exclude-from-classmap": [ + "vendor/phpunit/phpunit/src/Framework/MockObject/Builder/NamespaceMatch.php", + "vendor/phpunit/phpunit/src/Framework/MockObject/Builder/ParametersMatch.php", + "vendor/phpunit/phpunit/src/Framework/MockObject/InvocationMocker.php", + "vendor/phpunit/phpunit/src/Framework/MockObject/MockMethod.php" + ] }, "scripts": { "compat": "@php ./vendor/squizlabs/php_codesniffer/bin/phpcs --standard=phpcompat.xml.dist --report=summary,source", -- cgit v1.2.3