From cf809902747d2ca1f055d7d1e57336e183cd2a95 Mon Sep 17 00:00:00 2001 From: umherirrender Date: Sun, 12 Jun 2016 18:08:30 +0200 Subject: [PATCH] findHooks.php: Work also on .inc and .php5 Also fix the use of RecursiveDirectoryIterator::SKIP_DOTS, which was passed to the wrong constructor. Follows I29280dfe629126c71adfb65ac1a59394bc459dc4 Follows I6c01b8768f9f70152e320d254f8025a0ffde8c62 Change-Id: Ib35ca10b809afd5f6da80cd5edd1a71479c917a7 --- maintenance/findHooks.php | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/maintenance/findHooks.php b/maintenance/findHooks.php index 89e0311f76..bc36141892 100644 --- a/maintenance/findHooks.php +++ b/maintenance/findHooks.php @@ -305,17 +305,16 @@ class FindHooks extends Maintenance { if ( $recurse === self::FIND_RECURSIVE ) { $iterator = new RecursiveIteratorIterator( - new RecursiveDirectoryIterator( $dir ), - RecursiveIteratorIterator::SELF_FIRST | RecursiveDirectoryIterator::SKIP_DOTS + new RecursiveDirectoryIterator( $dir, RecursiveDirectoryIterator::SKIP_DOTS ), + RecursiveIteratorIterator::SELF_FIRST ); } else { $iterator = new DirectoryIterator( $dir ); } foreach ( $iterator as $info ) { - // Ignore directories, ignore json (installer and api i18n), - // ignore extension-less files like HISTORY - if ( $info->isFile() && $info->getExtension() === 'php' + // Ignore directories, work only on php files, + if ( $info->isFile() && in_array( $info->getExtension(), [ 'php', 'php5', 'inc' ] ) // Skip this file as it contains text that looks like a bad wfRunHooks() call && $info->getRealPath() !== __FILE__ ) { -- 2.20.1