Followup r76220: locateExecutableInDefaultPaths() was made static, so use static...
[lhc/web/wiklou.git] / includes / installer / Installer.php
index a4be97a..c1cc4f5 100644 (file)
@@ -1,4 +1,10 @@
 <?php
+/**
+ * Base code for MediaWiki installer.
+ *
+ * @file
+ * @ingroup Deployment
+ */
 
 /**
  * This documentation group collects source code files with deployment functionality.
@@ -61,11 +67,11 @@ abstract class Installer {
         *
         * @var array
         */
-       protected $dbTypes = array(
+       protected static $dbTypes = array(
                'mysql',
                'postgres',
+               'oracle',
                'sqlite',
-               'oracle'
        );
 
        /**
@@ -76,9 +82,10 @@ abstract class Installer {
         * @var array
         */
        protected $envChecks = array(
-               'envLatestVersion',
                'envCheckDB',
                'envCheckRegisterGlobals',
+               'envCheckBrokenXML',
+               'envCheckPHP531',
                'envCheckMagicQuotes',
                'envCheckMagicSybase',
                'envCheckMbstring',
@@ -91,7 +98,6 @@ abstract class Installer {
                'envCheckDiff3',
                'envCheckGraphics',
                'envCheckPath',
-               'envCheckWriteableDir',
                'envCheckExtension',
                'envCheckShellLocale',
                'envCheckUploadsDirectory',
@@ -118,8 +124,8 @@ abstract class Installer {
        /**
         * Get a list of known DB types.
         */
-       public function getDBTypes() {
-               return $this->dbTypes;
+       public static function getDBTypes() {
+               return self::$dbTypes;
        }
 
        /**
@@ -136,8 +142,6 @@ abstract class Installer {
         * @return boolean
         */
        public function doEnvironmentChecks() {
-               $this->showMessage( 'config-env-php', phpversion() );
-
                $good = true;
 
                foreach ( $this->envChecks as $check ) {
@@ -209,30 +213,29 @@ abstract class Installer {
        }
 
        /**
-        * Determine if LocalSettings exists. If it does, return an appropriate
-        * status for whether we should can upgrade or not.
+        * Determine if LocalSettings.php exists. If it does, return its variables, 
+        * merged with those from AdminSettings.php, as an array.
         *
-        * @return Status
+        * @return Array
         */
-       public function getLocalSettingsStatus() {
+       public function getExistingLocalSettings() {
                global $IP;
 
-               $status = Status::newGood();
-
                wfSuppressWarnings();
-               $ls = file_exists( "$IP/LocalSettings.php" );
+               $_lsExists = file_exists( "$IP/LocalSettings.php" );
                wfRestoreWarnings();
 
-               if( $ls ) {
-                       if( $this->getDBInstaller()->needsUpgrade() ) {
-                               $status->warning( 'config-localsettings-upgrade' );
-                       }
-                       else {
-                               $status->fatal( 'config-localsettings-noupgrade' );
-                       }
+               if( !$_lsExists ) {
+                       return false;
                }
+               unset($_lsExists);
 
-               return $status;
+               require( "$IP/includes/DefaultSettings.php" );
+               require( "$IP/LocalSettings.php" );
+               if ( file_exists( "$IP/AdminSettings.php" ) ) {
+                       require( "$IP/AdminSettings.php" );
+               }
+               return get_defined_vars();
        }
 
        /**
@@ -296,7 +299,7 @@ abstract class Installer {
         * external links work just fine.
         *
         * But in case a translator decides to throw in a #ifexist or internal link or
-        * whatever, this function is guarded to catch attempted DB access and to present
+        * whatever, this function is guarded to catch the attempted DB access and to present
         * some fallback text.
         *
         * @param $text String
@@ -320,28 +323,23 @@ abstract class Installer {
                return $html;
        }
 
-       /**
-        * TODO: document
-        *
-        * @param DatabaseInstaller $installer
-        *
-        * @return Status
-        */
-       public function installDatabase( DatabaseInstaller &$installer ) {
-               if( !$installer ) {
-                       $type = $this->getVar( 'wgDBtype' );
-                       $status = Status::newFatal( "config-no-db", $type );
-               } else {
-                       $status = $installer->setupDatabase();
-               }
+       public function getParserOptions() {
+               return $this->parserOptions;
+       }
 
-               return $status;
+       public function disableLinkPopups() {
+               $this->parserOptions->setExternalLinkTarget( false );
        }
 
+       public function restoreLinkPopups() {
+               global $wgExternalLinkTarget;
+               $this->parserOptions->setExternalLinkTarget( $wgExternalLinkTarget );
+       }       
+
        /**
         * TODO: document
         *
-        * @param DatabaseInstaller $installer
+        * @param $installer DatabaseInstaller
         *
         * @return Status
         */
@@ -351,21 +349,10 @@ abstract class Installer {
                if( $status->isOK() ) {
                        LBFactory::enableBackend();
                }
-
+               
                return $status;
        }
 
-       /**
-        * TODO: document
-        *
-        * @param DatabaseInstaller $installer
-        *
-        * @return Status
-        */
-       public function installInterwiki( DatabaseInstaller &$installer ) {
-               return $installer->populateInterwikiTable();
-       }
-
        /**
         * Exports all wg* variables stored by the installer into global scope.
         */
@@ -377,57 +364,17 @@ abstract class Installer {
                }
        }
 
-       /**
-        * Check if we're installing the latest version.
-        */
-       public function envLatestVersion() {
-               global $wgVersion;
-
-               $latestInfoUrl = 'http://www.mediawiki.org/w/api.php?action=mwreleases&format=json';
-               $latestInfo = Http::get( $latestInfoUrl );
-
-               if( !$latestInfo ) {
-                       $this->showMessage( 'config-env-latest-can-not-check', $latestInfoUrl );
-                       return;
-               }
-
-               $this->setVar( '_ExternalHTTP', true );
-               $latestInfo = FormatJson::decode($latestInfo);
-
-               if ($latestInfo === false || !isset( $latestInfo->mwreleases ) ) {
-                       # For when the request is successful but there's e.g. some silly man in
-                       # the middle firewall blocking us, e.g. one of those annoying airport ones
-                       $this->showMessage( 'config-env-latest-data-invalid', $latestInfoUrl );
-                       return;
-               }
-
-               foreach( $latestInfo->mwreleases as $rel ) {
-                       if( isset( $rel->current ) ) {
-                               $currentVersion = $rel->version;
-                       }
-               }
-
-               if( version_compare( $wgVersion, $currentVersion, '<' ) ) {
-                       $this->showMessage( 'config-env-latest-old' );
-                       $this->showHelpBox( 'config-env-latest-help', $wgVersion, $currentVersion );
-               } elseif( version_compare( $wgVersion, $currentVersion, '>' ) ) {
-                       $this->showMessage( 'config-env-latest-new' );
-               }
-
-               $this->showMessage( 'config-env-latest-ok' );
-       }
-
        /**
         * Environment check for DB types.
         */
-       public function envCheckDB() {
+       protected function envCheckDB() {
                global $wgLang;
 
                $compiledDBs = array();
                $goodNames = array();
                $allNames = array();
 
-               foreach ( $this->dbTypes as $name ) {
+               foreach ( self::getDBTypes() as $name ) {
                        $db = $this->getDBInstaller( $name );
                        $readableName = wfMsg( 'config-type-' . $name );
 
@@ -443,26 +390,58 @@ abstract class Installer {
 
                if ( !$compiledDBs ) {
                        $this->showMessage( 'config-no-db' );
+                       // FIXME: this only works for the web installer!
                        $this->showHelpBox( 'config-no-db-help', $wgLang->commaList( $allNames ) );
                        return false;
                }
 
-               $this->showMessage( 'config-have-db', $wgLang->commaList( $goodNames ) );
+               // Check for FTS3 full-text search module
+               $sqlite = $this->getDBInstaller( 'sqlite' );
+               if ( $sqlite->isCompiled() ) {
+                       $db = new DatabaseSqliteStandalone( ':memory:' );
+                       if( $db->getFulltextSearchModule() != 'FTS3' ) {
+                               $this->showMessage( 'config-no-fts3' );
+                       }
+               }
        }
 
        /**
         * Environment check for register_globals.
         */
-       public function envCheckRegisterGlobals() {
+       protected function envCheckRegisterGlobals() {
                if( wfIniGetBool( "magic_quotes_runtime" ) ) {
                        $this->showMessage( 'config-register-globals' );
                }
        }
 
+       /**
+        * Some versions of libxml+PHP break < and > encoding horribly
+        */
+       protected function envCheckBrokenXML() {
+               $test = new PhpXmlBugTester();
+               if ( !$test->ok ) {
+                       $this->showMessage( 'config-brokenlibxml' );
+                       return false;
+               }
+       }
+
+       /**
+        * Test PHP (probably 5.3.1, but it could regress again) to make sure that
+        * reference parameters to __call() are not converted to null
+        */
+       protected function envCheckPHP531() {
+               $test = new PhpRefCallBugTester;
+               $test->execute();
+               if ( !$test->ok ) {
+                       $this->showMessage( 'config-using531' );
+                       return false;
+               }
+       }
+
        /**
         * Environment check for magic_quotes_runtime.
         */
-       public function envCheckMagicQuotes() {
+       protected function envCheckMagicQuotes() {
                if( wfIniGetBool( "magic_quotes_runtime" ) ) {
                        $this->showMessage( 'config-magic-quotes-runtime' );
                        return false;
@@ -472,7 +451,7 @@ abstract class Installer {
        /**
         * Environment check for magic_quotes_sybase.
         */
-       public function envCheckMagicSybase() {
+       protected function envCheckMagicSybase() {
                if ( wfIniGetBool( 'magic_quotes_sybase' ) ) {
                        $this->showMessage( 'config-magic-quotes-sybase' );
                        return false;
@@ -482,7 +461,7 @@ abstract class Installer {
        /**
         * Environment check for mbstring.func_overload.
         */
-       public function envCheckMbstring() {
+       protected function envCheckMbstring() {
                if ( wfIniGetBool( 'mbstring.func_overload' ) ) {
                        $this->showMessage( 'config-mbstring' );
                        return false;
@@ -492,7 +471,7 @@ abstract class Installer {
        /**
         * Environment check for zend.ze1_compatibility_mode.
         */
-       public function envCheckZE1() {
+       protected function envCheckZE1() {
                if ( wfIniGetBool( 'zend.ze1_compatibility_mode' ) ) {
                        $this->showMessage( 'config-ze1' );
                        return false;
@@ -502,7 +481,7 @@ abstract class Installer {
        /**
         * Environment check for safe_mode.
         */
-       public function envCheckSafeMode() {
+       protected function envCheckSafeMode() {
                if ( wfIniGetBool( 'safe_mode' ) ) {
                        $this->setVar( '_SafeMode', true );
                        $this->showMessage( 'config-safe-mode' );
@@ -512,32 +491,37 @@ abstract class Installer {
        /**
         * Environment check for the XML module.
         */
-       public function envCheckXML() {
+       protected function envCheckXML() {
                if ( !function_exists( "utf8_encode" ) ) {
                        $this->showMessage( 'config-xml-bad' );
                        return false;
                }
-               $this->showMessage( 'config-xml-good' );
        }
 
        /**
         * Environment check for the PCRE module.
         */
-       public function envCheckPCRE() {
+       protected function envCheckPCRE() {
                if ( !function_exists( 'preg_match' ) ) {
                        $this->showMessage( 'config-pcre' );
                        return false;
                }
+               wfSuppressWarnings();
+               $regexd = preg_replace( '/[\x{0400}-\x{04FF}]/u', '', '-АБВГД-' );
+               wfRestoreWarnings();
+               if ( $regexd != '--' ) {
+                       $this->showMessage( 'config-pcre-no-utf8' );
+                       return false;
+               }
        }
 
        /**
         * Environment check for available memory.
         */
-       public function envCheckMemory() {
+       protected function envCheckMemory() {
                $limit = ini_get( 'memory_limit' );
 
                if ( !$limit || $limit == -1 ) {
-                       $this->showMessage( 'config-memory-none' );
                        return true;
                }
 
@@ -557,20 +541,18 @@ abstract class Installer {
                                $this->setVar( '_RaiseMemory', true );
                        }
                } else {
-                       $this->showMessage( 'config-memory-ok', $limit );
+                       return true;
                }
        }
 
        /**
         * Environment check for compiled object cache types.
         */
-       public function envCheckCache() {
+       protected function envCheckCache() {
                $caches = array();
-
                foreach ( $this->objectCaches as $name => $function ) {
                        if ( function_exists( $function ) ) {
                                $caches[$name] = true;
-                               $this->showMessage( 'config-' . $name );
                        }
                }
 
@@ -584,35 +566,14 @@ abstract class Installer {
        /**
         * Search for GNU diff3.
         */
-       public function envCheckDiff3() {
-               $paths = array_merge(
-                       array(
-                               "/usr/bin",
-                               "/usr/local/bin",
-                               "/opt/csw/bin",
-                               "/usr/gnu/bin",
-                               "/usr/sfw/bin"
-                       ),
-                       explode( PATH_SEPARATOR, getenv( "PATH" ) )
-               );
-
+       protected function envCheckDiff3() {
                $names = array( "gdiff3", "diff3", "diff3.exe" );
-               $versionInfo = array( '$1 --version 2>&1', 'diff3 (GNU diffutils)' );
-
-               $haveDiff3 = false;
+               $versionInfo = array( '$1 --version 2>&1', 'GNU diffutils' );
 
-               foreach ( $paths as $path ) {
-                       $exe = $this->locateExecutable( $path, $names, $versionInfo );
+               $diff3 = self::locateExecutableInDefaultPaths( $names, $versionInfo );
 
-                       if ($exe !== false) {
-                               $this->setVar( 'wgDiff3', $exe );
-                               $haveDiff3 = true;
-                               break;
-                       }
-               }
-
-               if ( $haveDiff3 ) {
-                       $this->showMessage( 'config-diff3-good', $exe );
+               if ( $diff3 ) {
+                       $this->setVar( 'wgDiff3', $diff3 );
                } else {
                        $this->setVar( 'wgDiff3', false );
                        $this->showMessage( 'config-diff3-bad' );
@@ -622,40 +583,30 @@ abstract class Installer {
        /**
         * Environment check for ImageMagick and GD.
         */
-       public function envCheckGraphics() {
-               $imcheck = array( "/usr/bin", "/opt/csw/bin", "/usr/local/bin", "/sw/bin", "/opt/local/bin" );
-
-               foreach( $imcheck as $dir ) {
-                       $im = "$dir/convert";
-
-                       wfSuppressWarnings();
-                       $file_exists = file_exists( $im );
-                       wfRestoreWarnings();
-
-                       if( $file_exists ) {
-                               $this->showMessage( 'config-imagemagick', $im );
-                               $this->setVar( 'wgImageMagickConvertCommand', $im );
-                               return true;
-                       }
-               }
+       protected function envCheckGraphics() {
+               $names = array( wfIsWindows() ? 'convert.exe' : 'convert' );
+               $convert = self::locateExecutableInDefaultPaths( $names, array( '$1 -version', 'ImageMagick' ) );
 
-               if ( function_exists( 'imagejpeg' ) ) {
+               if ( $convert ) {
+                       $this->setVar( 'wgImageMagickConvertCommand', $convert );
+                       $this->showMessage( 'config-imagemagick', $convert );
+                       return true;
+               } elseif ( function_exists( 'imagejpeg' ) ) {
                        $this->showMessage( 'config-gd' );
                        return true;
+               } else {
+                       $this->showMessage( 'no-scaling' );
                }
-
-               $this->showMessage( 'no-scaling' );
        }
 
        /**
         * Environment check for setting $IP and $wgScriptPath.
         */
-       public function envCheckPath() {
+       protected function envCheckPath() {
                global $IP;
                $IP = dirname( dirname( dirname( __FILE__ ) ) );
 
                $this->setVar( 'IP', $IP );
-               $this->showMessage( 'config-dir', $IP );
 
                // PHP_SELF isn't available sometimes, such as when PHP is CGI but
                // cgi.fix_pathinfo is disabled. In that case, fall back to SCRIPT_NAME
@@ -674,70 +625,41 @@ abstract class Installer {
 
                $uri = preg_replace( '{^(.*)/config.*$}', '$1', $path );
                $this->setVar( 'wgScriptPath', $uri );
-               $this->showMessage( 'config-uri', $uri );
-       }
-
-       /**
-        * Environment check for writable config/ directory.
-        */
-       public function envCheckWriteableDir() {
-               $ipDir = $this->getVar( 'IP' );
-               $configDir = $ipDir . '/config';
-
-               if( !is_writeable( $configDir ) ) {
-                       $webserverGroup = self::maybeGetWebserverPrimaryGroup();
-
-                       if ( $webserverGroup !== null ) {
-                               $this->showMessage( 'config-dir-not-writable-group', $ipDir, $webserverGroup );
-                       } else {
-                               $this->showMessage( 'config-dir-not-writable-nogroup', $ipDir, $webserverGroup );
-                       }
-
-                       return false;
-               }
        }
 
        /**
         * Environment check for setting the preferred PHP file extension.
         */
-       public function envCheckExtension() {
+       protected function envCheckExtension() {
                // FIXME: detect this properly
                if ( defined( 'MW_INSTALL_PHP5_EXT' ) ) {
                        $ext = 'php5';
                } else {
                        $ext = 'php';
                }
-
                $this->setVar( 'wgScriptExtension', ".$ext" );
-               $this->showMessage( 'config-file-extension', $ext );
        }
 
        /**
         * TODO: document
         */
-       public function envCheckShellLocale() {
-               # Give up now if we're in safe mode or open_basedir.
-               # It's theoretically possible but tricky to work with.
-               if ( wfIniGetBool( "safe_mode" ) || ini_get( 'open_basedir' ) || !function_exists( 'exec' ) ) {
-                       return true;
-               }
-
+       protected function envCheckShellLocale() {
                $os = php_uname( 's' );
-               $supported = array( 'Linux', 'SunOS', 'HP-UX' ); # Tested these
+               $supported = array( 'Linux', 'SunOS', 'HP-UX', 'Darwin' ); # Tested these
 
                if ( !in_array( $os, $supported ) ) {
                        return true;
                }
 
                # Get a list of available locales.
-               $lines = $ret = false;
-               exec( '/usr/bin/locale -a', $lines, $ret );
+               $ret = false;
+               $lines = wfShellExec( '/usr/bin/locale -a', $ret );
 
                if ( $ret ) {
                        return true;
                }
 
-               $lines = wfArrayMap( 'trim', $lines );
+               $lines = wfArrayMap( 'trim', explode( "\n", $lines ) );
                $candidatesByLocale = array();
                $candidatesByLang = array();
 
@@ -759,7 +681,6 @@ abstract class Installer {
                # Try the current value of LANG.
                if ( isset( $candidatesByLocale[ getenv( 'LANG' ) ] ) ) {
                        $this->setVar( 'wgShellLocale', getenv( 'LANG' ) );
-                       $this->showMessage( 'config-shell-locale', getenv( 'LANG' ) );
                        return true;
                }
 
@@ -768,7 +689,6 @@ abstract class Installer {
                foreach ( $commonLocales as $commonLocale ) {
                        if ( isset( $candidatesByLocale[$commonLocale] ) ) {
                                $this->setVar( 'wgShellLocale', $commonLocale );
-                               $this->showMessage( 'config-shell-locale', $commonLocale );
                                return true;
                        }
                }
@@ -779,7 +699,6 @@ abstract class Installer {
                if ( isset( $candidatesByLang[$wikiLang] ) ) {
                        $m = reset( $candidatesByLang[$wikiLang] );
                        $this->setVar( 'wgShellLocale', $m[0] );
-                       $this->showMessage( 'config-shell-locale', $m[0] );
                        return true;
                }
 
@@ -787,7 +706,6 @@ abstract class Installer {
                if ( count( $candidatesByLocale ) ) {
                        $m = reset( $candidatesByLocale );
                        $this->setVar( 'wgShellLocale', $m[0] );
-                       $this->showMessage( 'config-shell-locale', $m[0] );
                        return true;
                }
 
@@ -798,7 +716,7 @@ abstract class Installer {
        /**
         * TODO: document
         */
-       public function envCheckUploadsDirectory() {
+       protected function envCheckUploadsDirectory() {
                global $IP, $wgServer;
 
                $dir = $IP . '/images/';
@@ -806,7 +724,7 @@ abstract class Installer {
                $safe = !$this->dirIsExecutable( $dir, $url );
 
                if ( $safe ) {
-                       $this->showMessage( 'config-uploads-safe' );
+                       return true;
                } else {
                        $this->showMessage( 'config-uploads-not-safe', $dir );
                }
@@ -814,7 +732,7 @@ abstract class Installer {
 
        /**
         * Convert a hex string representing a Unicode code point to that code point.
-        * @param string $c
+        * @param $c String
         * @return string
         */
        protected function unicodeChar( $c ) {
@@ -839,7 +757,7 @@ abstract class Installer {
        /**
         * Check the libicu version
         */
-       public function envCheckLibicu() {
+       protected function envCheckLibicu() {
                $utf8 = function_exists( 'utf8_normalize' );
                $intl = function_exists( 'normalizer_normalize' );
 
@@ -853,7 +771,7 @@ abstract class Installer {
                $not_normal_c = $this->unicodeChar("FA6C");
                $normal_c = $this->unicodeChar("242EE");
 
-               $useNormalizer = 'config-unicode-php';
+               $useNormalizer = 'php';
                $needsUpdate = false;
 
                /**
@@ -861,24 +779,41 @@ abstract class Installer {
                 * utf8_normalize is more up to date.
                 */
                if( $utf8 ) {
-                       $useNormalizer = 'config-unicode-utf8';
+                       $useNormalizer = 'utf8';
                        $utf8 = utf8_normalize( $not_normal_c, UNORM_NFC );
                        if ( $utf8 !== $normal_c ) $needsUpdate = true;
                }
                if( $intl ) {
-                       $useNormalizer = 'config-unicode-intl';
+                       $useNormalizer = 'intl';
                        $intl = normalizer_normalize( $not_normal_c, Normalizer::FORM_C );
                        if ( $intl !== $normal_c ) $needsUpdate = true;
                }
 
-               $this->showMessage( 'config-unicode-using', wfMsg( $useNormalizer ) );
-               if( $useNormalizer === 'config-unicode-php' ) {
+               // Uses messages 'config-unicode-using-php', 'config-unicode-using-utf8', 'config-unicode-using-intl'
+               if( $useNormalizer === 'php' ) {
                        $this->showMessage( 'config-unicode-pure-php-warning' );
-               } elseif( $needsUpdate ) {
-                       $this->showMessage( 'config-unicode-update-warning' );
+               } else {
+                       $this->showMessage( 'config-unicode-using-' . $useNormalizer );
+                       if( $needsUpdate ) {
+                               $this->showMessage( 'config-unicode-update-warning' );
+                       }
                }
        }
 
+       /**
+        * Get an array of likely places we can find executables. Check a bunch
+        * of known Unix-like defaults, as well as the PATH environment variable
+        * (which should maybe make it work for Windows?)
+        *
+        * @return Array
+        */
+       protected static function getPossibleBinPaths() {
+               return array_merge(
+                       array( '/usr/bin', '/usr/local/bin', '/opt/csw/bin',
+                               '/usr/gnu/bin', '/usr/sfw/bin', '/sw/bin', '/opt/local/bin' ),
+                       explode( PATH_SEPARATOR, getenv( 'PATH' ) )
+               );
+       }
 
        /**
         * Search a path for any of the given executable names. Returns the
@@ -890,19 +825,19 @@ abstract class Installer {
         * @param $path String: path to search
         * @param $names Array of executable names
         * @param $versionInfo Boolean false or array with two members:
-        *               0 => Command to run for version check, with $1 for the path
+        *               0 => Command to run for version check, with $1 for the full executable name
         *               1 => String to compare the output with
         *
         * If $versionInfo is not false, only executables with a version
         * matching $versionInfo[1] will be returned.
         */
-       protected function locateExecutable( $path, $names, $versionInfo = false ) {
+       public static function locateExecutable( $path, $names, $versionInfo = false ) {
                if ( !is_array( $names ) ) {
                        $names = array( $names );
                }
 
                foreach ( $names as $name ) {
-                       $command = "$path/$name";
+                       $command = $path . DIRECTORY_SEPARATOR . $name;
 
                        wfSuppressWarnings();
                        $file_exists = file_exists( $command );
@@ -913,16 +848,26 @@ abstract class Installer {
                                        return $command;
                                }
 
-                               $file = str_replace( '$1', $command, $versionInfo[0] );
-
-                               # Should maybe be wfShellExec( $file), but runs into a ulimit, see
-                               # http://www.mediawiki.org/w/index.php?title=New-installer_issues&diff=prev&oldid=335456
-                               if ( strstr( `$file`, $versionInfo[1]) !== false ) {
+                               $file = str_replace( '$1', wfEscapeShellArg( $command ), $versionInfo[0] );
+                               if ( strstr( wfShellExec( $file ), $versionInfo[1] ) !== false ) {
                                        return $command;
                                }
                        }
                }
+               return false;
+       }
 
+       /**
+        * Same as locateExecutable(), but checks in getPossibleBinPaths() by default
+        * @see locateExecutable()
+        */
+       public static function locateExecutableInDefaultPaths( $names, $versionInfo = false ) {
+               foreach( self::getPossibleBinPaths() as $path ) {
+                       $exe = self::locateExecutable( $path, $names, $versionInfo );
+                       if( $exe !== false ) {
+                               return $exe;
+                       }
+               }
                return false;
        }