Skip to content

Commit d03be8b

Browse files
committed
Merge branch 'PHP-8.0'
* PHP-8.0: Fix #80771: phpinfo(INFO_CREDITS) displays nothing in CLI
2 parents 59d030c + 1d2bbce commit d03be8b

File tree

3 files changed

+18
-2
lines changed

3 files changed

+18
-2
lines changed

ext/standard/info.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -995,7 +995,7 @@ PHPAPI ZEND_COLD void php_print_info(int flag)
995995
}
996996

997997

998-
if ((flag & PHP_INFO_CREDITS) && !sapi_module.phpinfo_as_text) {
998+
if (flag & PHP_INFO_CREDITS) {
999999
php_info_print_hr();
10001000
php_print_credits(PHP_CREDITS_ALL & ~PHP_CREDITS_FULLPAGE);
10011001
}
Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
--TEST--
2+
Bug #80771 (phpinfo(INFO_CREDITS) displays nothing in CLI)
3+
--FILE--
4+
<?php
5+
ob_start();
6+
phpinfo(INFO_CREDITS);
7+
$info = ob_get_clean();
8+
9+
ob_start();
10+
phpcredits();
11+
$credits = ob_get_clean();
12+
13+
var_dump(strpos($info, $credits) !== false);
14+
?>
15+
--EXPECT--
16+
bool(true)

sapi/cli/php_cli.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -632,7 +632,7 @@ static int do_cli(int argc, char **argv) /* {{{ */
632632
goto err;
633633
}
634634
request_started = 1;
635-
php_print_info(0xFFFFFFFF);
635+
php_print_info(PHP_INFO_ALL & ~PHP_INFO_CREDITS);
636636
php_output_end_all();
637637
EG(exit_status) = (c == '?' && argc > 1 && !strchr(argv[1], c));
638638
goto out;

0 commit comments

Comments
 (0)