MFH: improve error messages in internal classes

diff --git a/Zend/zend_API.c b/Zend/zend_API.c
index de5b877d3d142e9c605400a10c40e5576081552e..4f4471d0b1b1c32ac78927fe87f32841d494347b 100644 (file)
--- a/Zend/zend_API.c
+++ b/Zend/zend_API.c
@@ -175,7 +175,10 @@ ZEND_API int _zend_get_parameters_array_ex(int param_count, zval ***argument_arr
 
 ZEND_API void zend_wrong_param_count(TSRMLS_D)
 {
-       zend_error(E_WARNING, "Wrong parameter count for %s()", get_active_function_name(TSRMLS_C));
+       char *space;
+       char *class_name = get_active_class_name(&space TSRMLS_CC);
+       
+       zend_error(E_WARNING, "Wrong parameter count for %s%s%s()", class_name, space, get_active_function_name(TSRMLS_C));
 }
 
 
@@ -466,8 +469,10 @@ static int zend_parse_arg(int arg_num, zval **arg, va_list *va, char **spec, int
        expected_type = zend_parse_arg_impl(arg, va, spec TSRMLS_CC);
        if (expected_type) {
                if (!quiet) {
-                       zend_error(E_WARNING, "%s() expects parameter %d to be %s, %s given",
-                                       get_active_function_name(TSRMLS_C), arg_num, expected_type,
+                       char *space;
+                       char *class_name = get_active_class_name(&space TSRMLS_CC);
+                       zend_error(E_WARNING, "%s%s%s() expects parameter %d to be %s, %s given",
+                                       class_name, space, get_active_function_name(TSRMLS_C), arg_num, expected_type,
                                        zend_zval_type_name(*arg));
                }
                return FAILURE;

diff --git a/Zend/zend_list.c b/Zend/zend_list.c
index bd88e44c761ee43ab073a8383a41442c6d71b8d5..398cbb2411531215b0fdcb6d11cc7a279b2f8a77 100644 (file)
--- a/Zend/zend_list.c
+++ b/Zend/zend_list.c
@@ -114,16 +114,20 @@ ZEND_API void *zend_fetch_resource(zval **passed_id TSRMLS_DC, int default_id, c
        void *resource;
        va_list resource_types;
        int i;
-
+       char *space;
+       char *class_name;
+               
        if (default_id==-1) { /* use id */
                if (!passed_id) {
                        if (resource_type_name) {
-                               zend_error(E_WARNING, "%s(): no %s resource supplied", get_active_function_name(TSRMLS_C), resource_type_name);
+                               class_name = get_active_class_name(&space TSRMLS_CC);
+                               zend_error(E_WARNING, "%s%s%s(): no %s resource supplied", class_name, space, get_active_function_name(TSRMLS_C), resource_type_name);
                        }
                        return NULL;
                } else if ((*passed_id)->type != IS_RESOURCE) {
                        if (resource_type_name) {
-                               zend_error(E_WARNING, "%s(): supplied argument is not a valid %s resource", get_active_function_name(TSRMLS_C), resource_type_name);
+                               class_name = get_active_class_name(&space TSRMLS_CC);
+                               zend_error(E_WARNING, "%s%s%s(): supplied argument is not a valid %s resource", class_name, space, get_active_function_name(TSRMLS_C), resource_type_name);
                        }
                        return NULL;
                }
@@ -135,7 +139,8 @@ ZEND_API void *zend_fetch_resource(zval **passed_id TSRMLS_DC, int default_id, c
        resource = zend_list_find(id, &actual_resource_type);
        if (!resource) {
                if (resource_type_name) {
-                       zend_error(E_WARNING, "%s(): %d is not a valid %s resource", get_active_function_name(TSRMLS_C), id, resource_type_name);
+                       class_name = get_active_class_name(&space TSRMLS_CC);
+                       zend_error(E_WARNING, "%s%s%s(): %d is not a valid %s resource", class_name, space, get_active_function_name(TSRMLS_C), id, resource_type_name);
                }
                return NULL;
        }
@@ -153,7 +158,8 @@ ZEND_API void *zend_fetch_resource(zval **passed_id TSRMLS_DC, int default_id, c
        va_end(resource_types);
 
        if (resource_type_name) {
-               zend_error(E_WARNING, "%s(): supplied resource is not a valid %s resource", get_active_function_name(TSRMLS_C), resource_type_name);
+               class_name = get_active_class_name(&space TSRMLS_CC);
+               zend_error(E_WARNING, "%s%s%s(): supplied resource is not a valid %s resource", class_name, space, get_active_function_name(TSRMLS_C), resource_type_name);
        }
 
        return NULL;