diff --git a/RELEASE-NOTES-1.37 b/RELEASE-NOTES-1.37 index 5f0b90841bc..947890390b3 100644 --- a/RELEASE-NOTES-1.37 +++ b/RELEASE-NOTES-1.37 @@ -306,6 +306,8 @@ because of Phabricator reports. runner. It had been broken for at least three years already. The original use case was speeding up tests on Oracle, but Oracle support was dropped several releases ago. +* The MediaWikiPHPUnitTest__endTestHook and MediaWikiPHPUnitTest__startTestHook + PHPUnit hooks were removed. MediaWikiHooksPHPUnitExtension was also removed. * EntryPoint::getTextFormatters() was made private without a deprecation period; it had no known external callers. * DatabaseBlock::chooseBlock, deprecated since 1.35, was removed. diff --git a/includes/Hook/MediaWikiPHPUnitTest__endTestHook.php b/includes/Hook/MediaWikiPHPUnitTest__endTestHook.php deleted file mode 100644 index 8fd1e7ffb10..00000000000 --- a/includes/Hook/MediaWikiPHPUnitTest__endTestHook.php +++ /dev/null @@ -1,26 +0,0 @@ -container->run( - 'MediaWikiPHPUnitTest::endTest', - [ $test, $time ] - ); - } - - public function onMediaWikiPHPUnitTest__startTest( $test ) { - return $this->container->run( - 'MediaWikiPHPUnitTest::startTest', - [ $test ] - ); - } - public function onMediaWikiServices( $services ) { return $this->container->run( 'MediaWikiServices', diff --git a/tests/common/TestsAutoLoader.php b/tests/common/TestsAutoLoader.php index eb6eb9d32fe..aa0358bed2b 100644 --- a/tests/common/TestsAutoLoader.php +++ b/tests/common/TestsAutoLoader.php @@ -59,7 +59,6 @@ $wgAutoloadClasses += [ 'MediaWikiCliOptions' => "$testDir/phpunit/MediaWikiCliOptions.php", 'MediaWikiCoversValidator' => "$testDir/phpunit/MediaWikiCoversValidator.php", 'MediaWikiGroupValidator' => "$testDir/phpunit/MediaWikiGroupValidator.php", - 'MediaWikiHooksPHPUnitExtension' => "$testDir/phpunit/MediaWikiHooksPHPUnitExtension.php", 'MediaWikiLangTestCase' => "$testDir/phpunit/MediaWikiLangTestCase.php", 'MediaWikiLoggerPHPUnitExtension' => "$testDir/phpunit/MediaWikiLoggerPHPUnitExtension.php", 'MediaWikiPHPUnitCommand' => "$testDir/phpunit/MediaWikiPHPUnitCommand.php", diff --git a/tests/phpunit/MediaWikiHooksPHPUnitExtension.php b/tests/phpunit/MediaWikiHooksPHPUnitExtension.php deleted file mode 100644 index e3f99915d75..00000000000 --- a/tests/phpunit/MediaWikiHooksPHPUnitExtension.php +++ /dev/null @@ -1,20 +0,0 @@ -onMediaWikiPHPUnitTest__startTest( $test ); - } - - /** @inheritDoc */ - public function executeAfterTest( string $test, float $time ): void { - Hooks::runner()->onMediaWikiPHPUnitTest__endTest( $test, $time ); - } - -} diff --git a/tests/phpunit/suite.xml b/tests/phpunit/suite.xml index cc117d1341d..e599278237d 100644 --- a/tests/phpunit/suite.xml +++ b/tests/phpunit/suite.xml @@ -90,6 +90,5 @@ -