jenkins-bot has submitted this change and it was merged.
Change subject: Remove 'UnitTestList' hook
......................................................................
Remove 'UnitTestList' hook
No longer needed now that extension unittests are autodiscovered.
Bug: T142120
Bug: T142121
Change-Id: I36f4630893603e848f3245b8e819edaa4ac36331
---
D UserMerge.hooks.php
M extension.json
R tests/phpunit/MergeUserTest.php
3 files changed, 1 insertion(+), 30 deletions(-)
Approvals:
Legoktm: Looks good to me, approved
jenkins-bot: Verified
diff --git a/UserMerge.hooks.php b/UserMerge.hooks.php
deleted file mode 100644
index 897a36e..0000000
--- a/UserMerge.hooks.php
+++ /dev/null
@@ -1,23 +0,0 @@
-<?php
-
-class UserMergeHooks {
-
- public static function onUnitTestsList( &$files ) {
- // @codeCoverageIgnoreStart
- $directoryIterator = new RecursiveDirectoryIterator( __DIR__ .
'/tests/' );
-
- /**
- * @var SplFileInfo $fileInfo
- */
- $ourFiles = [];
- foreach ( new RecursiveIteratorIterator( $directoryIterator )
as $fileInfo ) {
- if ( substr( $fileInfo->getFilename(), -8 ) ===
'Test.php' ) {
- $ourFiles[] = $fileInfo->getPathname();
- }
- }
-
- $files = array_merge( $files, $ourFiles );
- return true;
- // @codeCoverageIgnoreEnd
- }
-}
diff --git a/extension.json b/extension.json
index 739d2e2..e0a3364 100644
--- a/extension.json
+++ b/extension.json
@@ -42,13 +42,7 @@
"UserMerge": "SpecialUserMerge.php",
"MergeUser": "MergeUser.php",
"IUserMergeLogger": "IUserMergeLogger.php",
- "UserMergeLogger": "UserMergeLogger.php",
- "UserMergeHooks": "UserMerge.hooks.php"
- },
- "Hooks": {
- "UnitTestsList": [
- "UserMergeHooks::onUnitTestsList"
- ]
+ "UserMergeLogger": "UserMergeLogger.php"
},
"config": {
"UserMergeEnableDelete": true,
diff --git a/tests/MergeUserTest.php b/tests/phpunit/MergeUserTest.php
similarity index 100%
rename from tests/MergeUserTest.php
rename to tests/phpunit/MergeUserTest.php
--
To view, visit https://gerrit.wikimedia.org/r/303188
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I36f4630893603e848f3245b8e819edaa4ac36331
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/UserMerge
Gerrit-Branch: master
Gerrit-Owner: Reedy <[email protected]>
Gerrit-Reviewer: Legoktm <[email protected]>
Gerrit-Reviewer: Reedy <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
