better error messages

diff --git a/Zend/tests/bug42859.phpt b/Zend/tests/bug42859.phpt
index 475c58346580e81dc52ca1a238b679ad423c6d88..9998e1b602441bf6c86fb11bf7aa6721f3144e7a 100755 (executable)
--- a/Zend/tests/bug42859.phpt
+++ b/Zend/tests/bug42859.phpt
@@ -9,4 +9,4 @@ use Blah::Exception;
 use Blah::Ex;
 ?>
 --EXPECTF--
-Fatal error: Import name 'Ex' conflicts with defined class in %sbug42859.php on line 6
\ No newline at end of file
+Fatal error: Cannot use Blah::Ex as Ex because the name is already in use in %sbug42859.php on line 6

diff --git a/Zend/tests/ns_029.phpt b/Zend/tests/ns_029.phpt
index 1b82b052e5f75f86d5e427e239854052ab481ef2..d719e9e7cfb359dc72af31c28e34365456acd83c 100755 (executable)
--- a/Zend/tests/ns_029.phpt
+++ b/Zend/tests/ns_029.phpt
@@ -9,4 +9,4 @@ class Foo {
 
 new Foo();
 --EXPECTF--
-Fatal error: Class name 'Foo' conflicts with import name in %sns_029.php on line 4
+Fatal error: Cannot declare class Foo because the name is already in use in %sns_029.php on line 4

diff --git a/Zend/tests/ns_030.phpt b/Zend/tests/ns_030.phpt
index 83a86b1fd1d875ce667c6424a3a649180bea416c..8aa3223f7e6e6aaa7a63d418f0015ad252e5cf3a 100755 (executable)
--- a/Zend/tests/ns_030.phpt
+++ b/Zend/tests/ns_030.phpt
@@ -9,4 +9,4 @@ use A::B as Foo;
 
 new Foo();
 --EXPECTF--
-Fatal error: Import name 'Foo' conflicts with defined class in %sns_030.php on line 5
+Fatal error: Cannot use A::B as Foo because the name is already in use in %sns_030.php on line 5

diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c
index 588159aea4bd069f45eae807e1cf04ef61528462..f674cd4b2511275a47c6841bcd49db5de151f2ea 100644 (file)
--- a/Zend/zend_compile.c
+++ b/Zend/zend_compile.c
@@ -3241,7 +3241,7 @@ void zend_do_begin_class_declaration(znode *class_token, znode *class_name, znod
 
                if (tmp_len != lcname_len ||
                        memcmp(tmp.v, lcname.v, UG(unicode)?UBYTES(lcname_len):lcname_len)) {
-                       zend_error(E_COMPILE_ERROR, "Class name '%R' conflicts with import name", Z_TYPE(class_name->u.constant), Z_UNIVAL(class_name->u.constant));
+                       zend_error(E_COMPILE_ERROR, "Cannot declare class %R because the name is already in use", Z_TYPE(class_name->u.constant), Z_UNIVAL(class_name->u.constant));
                }
                efree(tmp.v);
        }
@@ -5197,7 +5197,7 @@ void zend_do_use(znode *ns_name, znode *new_name TSRMLS_DC) /* {{{ */
           ZEND_U_EQUAL(Z_TYPE_P(name), lcname, lcname_len, "self", sizeof("self")-1)) ||
            ((lcname_len == sizeof("parent")-1) &&
           ZEND_U_EQUAL(Z_TYPE_P(name), lcname, lcname_len, "parent", sizeof("parent")-1))) {
-               zend_error(E_COMPILE_ERROR, "Cannot use '%R' as import name", Z_TYPE_P(name), Z_UNIVAL_P(name));
+               zend_error(E_COMPILE_ERROR, "Cannot use %R as %R because '%R' is a special class name", Z_TYPE_P(ns), Z_UNIVAL_P(ns), Z_TYPE_P(name), Z_UNIVAL_P(name), Z_TYPE_P(name), Z_UNIVAL_P(name));
        }
 
        if (CG(current_namespace)) {
@@ -5222,7 +5222,7 @@ void zend_do_use(znode *ns_name, znode *new_name TSRMLS_DC) /* {{{ */
 
                        if (tmp_len != ns_name_len + 2 + lcname_len ||
                                memcmp(tmp.v, ns_name.v, UG(unicode)?UBYTES(tmp_len):tmp_len)) {
-                               zend_error(E_COMPILE_ERROR, "Import name '%R' conflicts with defined class", Z_TYPE_P(name), Z_STRVAL_P(name));
+                               zend_error(E_COMPILE_ERROR, "Cannot use %R as %R because the name is already in use", Z_TYPE_P(ns), Z_UNIVAL_P(ns), Z_TYPE_P(name), Z_UNIVAL_P(name));
                        }
                        efree(tmp.v);
                }
@@ -5233,13 +5233,13 @@ void zend_do_use(znode *ns_name, znode *new_name TSRMLS_DC) /* {{{ */
 
                if (tmp_len != lcname_len ||
                        memcmp(tmp.v, lcname.v, UG(unicode)?UBYTES(tmp_len):tmp_len)) {
-                       zend_error(E_COMPILE_ERROR, "Import name '%R' conflicts with defined class", Z_TYPE_P(name), Z_UNIVAL_P(name));
+                       zend_error(E_COMPILE_ERROR, "Cannot use %R as %R because the name is already in use", Z_TYPE_P(ns), Z_UNIVAL_P(ns), Z_TYPE_P(name), Z_UNIVAL_P(name));
                }
                efree(tmp.v);
        }
 
        if (zend_u_hash_add(CG(current_import), Z_TYPE_P(name), lcname, lcname_len+1, &ns, sizeof(zval*), NULL) != SUCCESS) {
-               zend_error(E_COMPILE_ERROR, "Cannot reuse import name");
+               zend_error(E_COMPILE_ERROR, "Cannot use %R as %R because the name is already in use", Z_TYPE_P(ns), Z_UNIVAL_P(ns), Z_TYPE_P(name), Z_UNIVAL_P(name));
        }
        if (warn) {
                zend_error(E_WARNING, "The use statement with non-compound name '%R' has no effect", Z_TYPE_P(name), Z_UNIVAL_P(name));