Merge "findHooks.php: Work also on .inc and .php5"

[lhc/web/wiklou.git] / maintenance / findHooks.php

diff --git a/maintenance/findHooks.php b/maintenance/findHooks.php
index a8bed54..bc36141 100644 (file)
--- 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() !== 'json' && $info->getExtension()
+                       // 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__
                        ) {