Mercurial > hg > isophonics-drupal-site
diff vendor/symfony/process/PhpExecutableFinder.php @ 14:1fec387a4317
Update Drupal core to 8.5.2 via Composer
author | Chris Cannam |
---|---|
date | Mon, 23 Apr 2018 09:46:53 +0100 |
parents | 4c8ae668cc8c |
children | c2387f117808 |
line wrap: on
line diff
--- a/vendor/symfony/process/PhpExecutableFinder.php Mon Apr 23 09:33:26 2018 +0100 +++ b/vendor/symfony/process/PhpExecutableFinder.php Mon Apr 23 09:46:53 2018 +0100 @@ -44,7 +44,7 @@ } // PHP_BINARY return the current sapi executable - if (PHP_BINARY && in_array(PHP_SAPI, array('cli', 'cli-server', 'phpdbg')) && is_file(PHP_BINARY)) { + if (PHP_BINARY && \in_array(PHP_SAPI, array('cli', 'cli-server', 'phpdbg'), true)) { return PHP_BINARY.$args; } @@ -62,6 +62,10 @@ } } + if (is_executable($php = PHP_BINDIR.('\\' === DIRECTORY_SEPARATOR ? '\\php.exe' : '/php'))) { + return $php; + } + $dirs = array(PHP_BINDIR); if ('\\' === DIRECTORY_SEPARATOR) { $dirs[] = 'C:\xampp\php\\';