Merge branch 'PHP-7.4'

Author: nikic

sapi/cli/php_cli.c

@@ -1084,7 +1084,8 @@ static int do_cli(int argc, char **argv) /* {{{ */
 						zval_ptr_dtor(&tmp);
 						EG(exception) = NULL;
 					} else {
-						zend_call_method_with_1_params(NULL, reflection_ptr, NULL, "export", NULL, &ref);
+						zend_print_zval(&ref, 0);
+						zend_write("\n", 1);
 					}
 					zval_ptr_dtor(&ref);
 					zval_ptr_dtor(&arg);

sapi/cli/tests/bug66606_1.phpt

@@ -9,9 +9,9 @@ include "skipif.inc";
 --FILE--
 <?php
 include "php_cli_server.inc";
-php_cli_server_start('var_dump($_SERVER["CONTENT_TYPE"], $_SERVER["CONTENT_LENGTH"])');
+php_cli_server_start('var_dump(isset($_SERVER["CONTENT_TYPE"]), isset($_SERVER["CONTENT_LENGTH"]))');
 echo file_get_contents("http://" . PHP_CLI_SERVER_ADDRESS);
 ?>
 --EXPECT--
-NULL
-NULL
+bool(false)
+bool(false)