Skip to content

Add support for phpX.Y bin name format #349

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
MauricioFauth wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Add support for phpX.Y bin name format #349

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 13 additions & 2 deletions configure.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -247,6 +247,18 @@ function find_xml_files($path) // {{{
}
} // }}}

function find_php_bin_name(): string
{
return find_file([
'php' . PHP_MAJOR_VERSION . '.' . PHP_MINOR_VERSION,
'php',
'cli/php',
'php.exe',
'php-cli.exe',
'php-cgi.exe',
]);
}

$srcdir = dirname(__FILE__);
$workdir = $srcdir;
$basedir = $srcdir;
Expand All @@ -265,7 +277,6 @@ function find_xml_files($path) // {{{

// Settings {{{
$cygwin_php_bat = "{$srcdir}/../phpdoc-tools/php.bat";
$php_bin_names = array('php', 'php5', 'cli/php', 'php.exe', 'php5.exe', 'php-cli.exe', 'php-cgi.exe');
// }}}

$acd = array( // {{{
Expand Down Expand Up @@ -483,7 +494,7 @@ function find_xml_files($path) // {{{

checking("for PHP executable");
if ($ac['PHP'] == '' || $ac['PHP'] == 'no') {
$ac['PHP'] = find_file($php_bin_names);
$ac['PHP'] = find_php_bin_name();
} else if (file_exists($cygwin_php_bat)) {
$ac['PHP'] = $cygwin_php_bat;
}
Expand Down
Loading