X-Git-Url: https://git.cyclocoop.org/%28%28?a=blobdiff_plain;f=maintenance%2FfindHooks.php;h=fd36db1dd2bc0bbefb1fc57b1bb01eb380ae8154;hb=f428f95ac49e71bde47bc982e31ff60b3ef41706;hp=f6e65f94525c326316ade23b150389165d1f353e;hpb=41f1ce0d35b929d480ce87605a3234c187e44fd2;p=lhc%2Fweb%2Fwiklou.git

diff --git a/maintenance/findHooks.php b/maintenance/findHooks.php
index f6e65f9452..fd36db1dd2 100644
--- a/maintenance/findHooks.php
+++ b/maintenance/findHooks.php
@@ -48,7 +48,7 @@ class FindHooks extends Maintenance {
 	/*
 	 * Hooks that are ignored
 	 */
-	protected static $ignore = [ 'testRunLegacyHooks', 'Test' ];
+	protected static $ignore = [ 'Test' ];
 
 	public function __construct() {
 		parent::__construct();
@@ -79,6 +79,9 @@ class FindHooks extends Maintenance {
 		$nonRecurseDirs = [
 			"$IP/",
 		];
+		$extraFiles = [
+			"$IP/tests/phpunit/MediaWikiTestCase.php",
+		];
 
 		foreach ( $recurseDirs as $dir ) {
 			$ret = $this->getHooksFromDir( $dir, self::FIND_RECURSIVE );
@@ -90,6 +93,10 @@ class FindHooks extends Maintenance {
 			$potentialHooks = array_merge( $potentialHooks, $ret['good'] );
 			$badHooks = array_merge( $badHooks, $ret['bad'] );
 		}
+		foreach ( $extraFiles as $file ) {
+			$potentialHooks = array_merge( $potentialHooks, $this->getHooksFromFile( $file ) );
+			$badHooks = array_merge( $badHooks, $this->getBadHooksFromFile( $file ) );
+		}
 
 		$documented = array_keys( $documentedHooks );
 		$potential = array_keys( $potentialHooks );
@@ -238,7 +245,7 @@ class FindHooks extends Maintenance {
 		$m = [];
 		preg_match_all(
 			// All functions which runs hooks
-			'/(?:wfRunHooks|Hooks\:\:run|ContentHandler\:\:runLegacyHooks)\s*\(\s*' .
+			'/(?:wfRunHooks|Hooks\:\:run)\s*\(\s*' .
 				// First argument is the hook name as string
 				'([\'"])(.*?)\1' .
 				// Comma for second argument
@@ -262,6 +269,8 @@ class FindHooks extends Maintenance {
 				$n = [];
 				if ( preg_match_all( '/((?:[^,\(\)]|\([^\(\)]*\))+)/', $match[4], $n ) ) {
 					$args = array_map( 'trim', $n[1] );
+					// remove empty entries from trailing spaces
+					$args = array_filter( $args );
 				}
 			} elseif ( isset( $match[3] ) ) {
 				// Found a parameter for Hooks::run,