diff options
Diffstat (limited to 'sapi/cli')
| -rw-r--r-- | sapi/cli/php_cli.c | 2 | ||||
| -rw-r--r-- | sapi/cli/tests/cli_get_process_title_basic.phpt | 5 | ||||
| -rw-r--r-- | sapi/cli/tests/cli_get_process_title_error.phpt | 5 | ||||
| -rw-r--r-- | sapi/cli/tests/cli_set_process_title_basic.phpt | 5 | ||||
| -rw-r--r-- | sapi/cli/tests/cli_set_process_title_error.phpt | 5 |
5 files changed, 1 insertions, 21 deletions
diff --git a/sapi/cli/php_cli.c b/sapi/cli/php_cli.c index 4333487a0b..1aa5d83dd9 100644 --- a/sapi/cli/php_cli.c +++ b/sapi/cli/php_cli.c @@ -1104,7 +1104,7 @@ static int do_cli(int argc, char **argv) /* {{{ */ memset(&execute_data, 0, sizeof(zend_execute_data)); EG(current_execute_data) = &execute_data; - zend_call_method_with_1_params(&ref, pce, &pce->constructor, "__construct", NULL, &arg); + zend_call_method_with_1_params(Z_OBJ(ref), pce, &pce->constructor, "__construct", NULL, &arg); if (EG(exception)) { zval tmp, *msg, rv; diff --git a/sapi/cli/tests/cli_get_process_title_basic.phpt b/sapi/cli/tests/cli_get_process_title_basic.phpt index 66d1d4f3a7..791f75b234 100644 --- a/sapi/cli/tests/cli_get_process_title_basic.phpt +++ b/sapi/cli/tests/cli_get_process_title_basic.phpt @@ -3,11 +3,6 @@ cli_get_process_title() function : basic functionality --CREDITS-- Patrick Allaert patrickallaert@php.net @nephp #nephp17 ---SKIPIF-- -<?php -if (PHP_SAPI !== "cli") - die("skip"); -?> --FILE-- <?php if (cli_set_process_title("title") && cli_get_process_title() === "title") diff --git a/sapi/cli/tests/cli_get_process_title_error.phpt b/sapi/cli/tests/cli_get_process_title_error.phpt index 67274db26c..bbfdfc2369 100644 --- a/sapi/cli/tests/cli_get_process_title_error.phpt +++ b/sapi/cli/tests/cli_get_process_title_error.phpt @@ -3,11 +3,6 @@ cli_get_process_title() function : error conditions --CREDITS-- Patrick Allaert patrickallaert@php.net @nephp #nephp17 ---SKIPIF-- -<?php -if (PHP_SAPI !== "cli") - die("skip"); -?> --FILE-- <?php cli_get_process_title("foo"); diff --git a/sapi/cli/tests/cli_set_process_title_basic.phpt b/sapi/cli/tests/cli_set_process_title_basic.phpt index 9899f3456b..208abd44ff 100644 --- a/sapi/cli/tests/cli_set_process_title_basic.phpt +++ b/sapi/cli/tests/cli_set_process_title_basic.phpt @@ -3,11 +3,6 @@ cli_set_process_title() function : basic functionality --CREDITS-- Patrick Allaert patrickallaert@php.net @nephp #nephp17 ---SKIPIF-- -<?php -if (PHP_SAPI !== "cli") - die("skip"); -?> --FILE-- <?php if (cli_set_process_title("title") === true && diff --git a/sapi/cli/tests/cli_set_process_title_error.phpt b/sapi/cli/tests/cli_set_process_title_error.phpt index 025c73015b..e55f86a259 100644 --- a/sapi/cli/tests/cli_set_process_title_error.phpt +++ b/sapi/cli/tests/cli_set_process_title_error.phpt @@ -3,11 +3,6 @@ cli_set_process_title() function : error conditions --CREDITS-- Patrick Allaert patrickallaert@php.net @nephp #nephp17 ---SKIPIF-- -<?php -if (PHP_SAPI !== "cli") - die("skip"); -?> --FILE-- <?php cli_set_process_title(); |