Fix #80771: phpinfo(INFO_CREDITS) displays nothing in CLI

There is no good reason not to show the credits in text based SAPIs,
except for brevity.  Thus, we suppress the credits from `php -i`.

Closes GH-6710.
This commit is contained in:
Christoph M. Becker 2021-02-22 12:24:15 +01:00
parent d7c98ca1ac
commit 073b6ea818
4 changed files with 21 additions and 2 deletions

3
NEWS
View File

@ -17,6 +17,9 @@ PHP NEWS
- Session:
. Fixed bug #80774 (session_name() problem with backslash). (cmb)
- Standard:
. Fixed bug #80771 (phpinfo(INFO_CREDITS) displays nothing in CLI). (cmb)
04 Mar 2021, php 7.4.16
- Core:

View File

@ -1000,7 +1000,7 @@ PHPAPI ZEND_COLD void php_print_info(int flag)
}
if ((flag & PHP_INFO_CREDITS) && !sapi_module.phpinfo_as_text) {
if (flag & PHP_INFO_CREDITS) {
php_info_print_hr();
php_print_credits(PHP_CREDITS_ALL & ~PHP_CREDITS_FULLPAGE);
}

View File

@ -0,0 +1,16 @@
--TEST--
Bug #80771 (phpinfo(INFO_CREDITS) displays nothing in CLI)
--FILE--
<?php
ob_start();
phpinfo(INFO_CREDITS);
$info = ob_get_clean();
ob_start();
phpcredits();
$credits = ob_get_clean();
var_dump(strpos($info, $credits) !== false);
?>
--EXPECT--
bool(true)

View File

@ -642,7 +642,7 @@ static int do_cli(int argc, char **argv) /* {{{ */
goto err;
}
request_started = 1;
php_print_info(0xFFFFFFFF);
php_print_info(PHP_INFO_ALL & ~PHP_INFO_CREDITS);
php_output_end_all();
exit_status = (c == '?' && argc > 1 && !strchr(argv[1], c));
goto out;