Fixed typo - inconsistent notice for undefined property (introduced by fix for #49348)

diff --git a/Zend/tests/bug52041.phpt b/Zend/tests/bug52041.phpt
index 96ddaa1c6d9d6626672c7236e9b7fd9b5e10f26b..7e1f3423a6ee24215d4e74baec6547242169c792 100644 (file)
--- a/Zend/tests/bug52041.phpt
+++ b/Zend/tests/bug52041.phpt
@@ -35,29 +35,29 @@ Notice: Undefined variable: x in %sbug52041.php on line 3
 
 Warning: Creating default object from empty value in %sbug52041.php on line 8
 
-Notice: Undefined property: a in %sbug52041.php on line 8
+Notice: Undefined property: stdClass::$a in %sbug52041.php on line 8
 
 Notice: Undefined variable: x in %sbug52041.php on line 3
 
-Notice: Undefined property: a in %sbug52041.php on line 9
+Notice: Undefined property: stdClass::$a in %sbug52041.php on line 9
 
 Warning: Creating default object from empty value in %sbug52041.php on line 9
 
-Notice: Undefined property: b in %sbug52041.php on line 9
+Notice: Undefined property: stdClass::$b in %sbug52041.php on line 9
 
 Notice: Undefined variable: x in %sbug52041.php on line 3
 
 Warning: Creating default object from empty value in %sbug52041.php on line 10
 
-Notice: Undefined property: a in %sbug52041.php on line 10
+Notice: Undefined property: stdClass::$a in %sbug52041.php on line 10
 
 Notice: Undefined variable: x in %sbug52041.php on line 3
 
-Notice: Undefined property: a in %sbug52041.php on line 11
+Notice: Undefined property: stdClass::$a in %sbug52041.php on line 11
 
 Warning: Creating default object from empty value in %sbug52041.php on line 11
 
-Notice: Undefined property: b in %sbug52041.php on line 11
+Notice: Undefined property: stdClass::$b in %sbug52041.php on line 11
 
 Notice: Undefined variable: x in %sbug52041.php on line 3
 

diff --git a/Zend/tests/bug60536_001.phpt b/Zend/tests/bug60536_001.phpt
index 418b986fc8d437c035dd819728e37ca4885aa306..a94e21eceed83575beaca34285783f1020ff968e 100644 (file)
--- a/Zend/tests/bug60536_001.phpt
+++ b/Zend/tests/bug60536_001.phpt
@@ -23,5 +23,5 @@ echo "DONE";
 ?>
 --EXPECTF--
 
-Notice: Undefined property: x in %s on line 14
+Notice: Undefined property: Z::$x in %s on line 14
 DONE

diff --git a/Zend/tests/bug62005.phpt b/Zend/tests/bug62005.phpt
index 2f83412b5fb10e10200134b26a924d5e8456c762..83158d5cc236d90635eb3215fbca2441b875bbac 100644 (file)
--- a/Zend/tests/bug62005.phpt
+++ b/Zend/tests/bug62005.phpt
@@ -10,7 +10,7 @@ add_points(NULL, 2);
 --EXPECTF--
 Warning: Creating default object from empty value in %sbug62005.php on line %d
 
-Notice: Undefined property: energy in %sbug62005.php on line 3
+Notice: Undefined property: stdClass::$energy in %sbug62005.php on line 3
 stdClass Object
 (
     [energy] => 2

diff --git a/Zend/zend_object_handlers.c b/Zend/zend_object_handlers.c
index 54140b87c42c2ed7bfba212f625e62f3f8f4a23c..92c67c3436d4a5f8a76473f8cfb489ac12c0a23d 100644 (file)
--- a/Zend/zend_object_handlers.c
+++ b/Zend/zend_object_handlers.c
@@ -755,7 +755,7 @@ static zval **zend_std_get_property_ptr_ptr(zval *object, zval *member, int type
                        new_zval = &EG(uninitialized_zval);
 
                        if(UNEXPECTED(type == BP_VAR_RW || type == BP_VAR_R)) {
-                               zend_error(E_NOTICE, "Undefined property: %s", Z_STRVAL_P(member));
+                               zend_error(E_NOTICE, "Undefined property: %s::$%s", zobj->ce->name, Z_STRVAL_P(member));
                        }
                        Z_ADDREF_P(new_zval);
                        if (EXPECTED((property_info->flags & ZEND_ACC_STATIC) == 0) &&

diff --git a/tests/classes/implicit_instantiation_001.phpt b/tests/classes/implicit_instantiation_001.phpt
index 19ddbe26816539663b1eba828994482f9aae710d..51427df1e84fe2fb6e9d5e24682c9c09b5a9bc41 100644 (file)
--- a/tests/classes/implicit_instantiation_001.phpt
+++ b/tests/classes/implicit_instantiation_001.phpt
@@ -41,7 +41,7 @@ var_dump($c);
 
 Warning: Creating default object from empty value in %s on line 18
 
-Notice: Undefined property: prop in %s on line 18
+Notice: Undefined property: stdClass::$prop in %s on line 18
 
   --> Attempting implicit conversion to object using assignment...
 
@@ -51,7 +51,7 @@ Warning: Creating default object from empty value in %s on line 22
 
 Warning: Creating default object from empty value in %s on line 26
 
-Notice: Undefined property: prop in %s on line 26
+Notice: Undefined property: stdClass::$prop in %s on line 26
 
 
 ---( $c->emptyString )---
@@ -59,7 +59,7 @@ Notice: Undefined property: prop in %s on line 26
 
 Warning: Creating default object from empty value in %s on line 18
 
-Notice: Undefined property: prop in %s on line 18
+Notice: Undefined property: stdClass::$prop in %s on line 18
 
   --> Attempting implicit conversion to object using assignment...
 
@@ -69,7 +69,7 @@ Warning: Creating default object from empty value in %s on line 22
 
 Warning: Creating default object from empty value in %s on line 26
 
-Notice: Undefined property: prop in %s on line 26
+Notice: Undefined property: stdClass::$prop in %s on line 26
 
 
 ---( $c->null )---
@@ -77,7 +77,7 @@ Notice: Undefined property: prop in %s on line 26
 
 Warning: Creating default object from empty value in %s on line 18
 
-Notice: Undefined property: prop in %s on line 18
+Notice: Undefined property: stdClass::$prop in %s on line 18
 
   --> Attempting implicit conversion to object using assignment...
 
@@ -87,7 +87,7 @@ Warning: Creating default object from empty value in %s on line 22
 
 Warning: Creating default object from empty value in %s on line 26
 
-Notice: Undefined property: prop in %s on line 26
+Notice: Undefined property: stdClass::$prop in %s on line 26
 
 
 ---( $c->boolTrue )---
@@ -155,4 +155,4 @@ Warning: Attempt to assign property of non-object in %s on line 26
   %unicode|string%(5) "hello"
   [%u|b%"intZero"]=>
   int(0)
-}
\ No newline at end of file
+}