Removed php_check_syntax() function, it never worked properly. For now

use shell_exec("php -l script_name") or similar.

diff --git a/NEWS b/NEWS
index 49e2a0a62f3416be4f974618ced7fe1d750834de..2158d34d9fb113df2e94a1bd69c580a825e1ce93 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -8,6 +8,7 @@ PHP                                                                        NEWS
   . ext/mnogosearch (Jani, Derick)
   . ext/w32api      (Jani, Derick)
   . ext/yp          (Jani, Derick)
+- Removed php_check_syntax() function, never worked properly.
 - Changed stream_filter_(ap|pre)pend() to return resource. (Sara)
 - Changed mysqli_exception and sqlite_exception to use RuntimeException as base 
   if SPL extension is present. (Georg, Marcus)

diff --git a/ext/standard/basic_functions.c b/ext/standard/basic_functions.c
index e302202bdc0ff0139182d126405a368f6ba19fa4..7a19a6406393b0fc0fd4cbb5436ad0afd90b680d 100644 (file)
--- a/ext/standard/basic_functions.c
+++ b/ext/standard/basic_functions.c
@@ -480,7 +480,6 @@ function_entry basic_functions[] = {
        PHP_FALIAS(show_source,                 highlight_file,                                                 NULL)
        PHP_FE(highlight_string,                                                                                                NULL)
        PHP_FE(php_strip_whitespace,                                                                                            NULL)
-       PHP_FE(php_check_syntax,                                                                                                second_arg_force_ref)
 
        PHP_FE(ini_get,                                                                                                                 NULL)
        PHP_FE(ini_get_all,                                                                                                             NULL)
@@ -2429,49 +2428,6 @@ PHP_FUNCTION(php_strip_whitespace)
 }
 /* }}} */
 
-/* {{{ proto bool php_check_syntax(string file_name [, &$error_message])
-   Check the syntax of the specified file. */
-PHP_FUNCTION(php_check_syntax)
-{
-       char *filename;
-       int filename_len;
-       zval *errm=NULL;
-       zend_file_handle file_handle = {0};
-
-       int old_errors = PG(display_errors);
-       int log_errors = PG(log_errors);
-
-       if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|z", &filename, &filename_len, &errm) == FAILURE) {
-               RETURN_FALSE;
-       }
-
-       file_handle.type = ZEND_HANDLE_FILENAME;
-       file_handle.filename = filename;
-       file_handle.free_filename = 0;
-       file_handle.opened_path = NULL; 
-
-       PG(log_errors) = PG(display_errors) = 0;
-
-       if (php_lint_script(&file_handle TSRMLS_CC) != SUCCESS) {
-               if (errm) {
-                       char *error_str;
-
-                       zval_dtor(errm);
-                       spprintf(&error_str, 0, "%s in %s on line %d", PG(last_error_message), PG(last_error_file), PG(last_error_lineno));
-                       ZVAL_STRING(errm, error_str, 0);
-               }
-               RETVAL_FALSE;
-       } else {
-               RETVAL_TRUE;
-       }
-
-       PG(display_errors) = old_errors;
-       PG(log_errors) = log_errors;
-
-       return;
-}
-/* }}} */
-
 /* {{{ proto bool highlight_string(string string [, bool return] )
    Syntax highlight a string or optionally return it */
 PHP_FUNCTION(highlight_string)

diff --git a/ext/standard/basic_functions.h b/ext/standard/basic_functions.h
index a41ae5099f30f4eddc32e542164c4de9ba2c0080..c24ad491f479ba3f70526083a0c98cd12a97f825 100644 (file)
--- a/ext/standard/basic_functions.h
+++ b/ext/standard/basic_functions.h
@@ -88,7 +88,6 @@ PHP_FUNCTION(register_shutdown_function);
 PHP_FUNCTION(highlight_file);
 PHP_FUNCTION(highlight_string);
 PHP_FUNCTION(php_strip_whitespace);
-PHP_FUNCTION(php_check_syntax);
 ZEND_API void php_get_highlight_struct(zend_syntax_highlighter_ini *syntax_highlighter_ini);
 
 PHP_FUNCTION(ini_get);