diff options
| author | Nikita Popov <nikita.ppv@gmail.com> | 2019-08-30 11:02:40 +0200 |
|---|---|---|
| committer | Nikita Popov <nikita.ppv@gmail.com> | 2019-08-30 11:02:40 +0200 |
| commit | be8247101deee46685ef5f80b40051a7c96535ec (patch) | |
| tree | 2b2cfc22f0bb6b851798d968c930c5f9b3768b73 | |
| parent | 1bbdb6a67483246a539c09aa7e5fad78d6cf2b75 (diff) | |
| parent | b4088ba509426dd854dae7fabf968114a8ecc071 (diff) | |
| download | php-git-be8247101deee46685ef5f80b40051a7c96535ec.tar.gz | |
Merge branch 'PHP-7.4'
| -rw-r--r-- | sapi/cli/php_cli.c | 3 | ||||
| -rw-r--r-- | sapi/cli/tests/bug66606_1.phpt | 6 |
2 files changed, 5 insertions, 4 deletions
diff --git a/sapi/cli/php_cli.c b/sapi/cli/php_cli.c index 834a9a0161..a426220ed6 100644 --- a/sapi/cli/php_cli.c +++ b/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); diff --git a/sapi/cli/tests/bug66606_1.phpt b/sapi/cli/tests/bug66606_1.phpt index b58db6cfdd..cd278dad42 100644 --- a/sapi/cli/tests/bug66606_1.phpt +++ b/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) |