Merge branch 'PHP-7.4' into PHP-8.0

* PHP-7.4:
  Fix #80771: phpinfo(INFO_CREDITS) displays nothing in CLI

Author: cmb69

NEWS

@@ -9,6 +9,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)
+
 18 Feb 2021, PHP 8.0.3
 
 - Core:

ext/standard/info.c

@@ -995,7 +995,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);
 	}

ext/standard/tests/general_functions/bug80771.phpt

@@ -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)

sapi/cli/php_cli.c

@@ -627,7 +627,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();
 				EG(exit_status) = (c == '?' && argc > 1 && !strchr(argv[1],  c));
 				goto out;