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

Majkl578 · laruence · commit 70668fd88a51 · 2013-04-10T13:36:47.000+08:00
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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,15 +51,15 @@ 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 )---
   --> Attempting implicit conversion to object using increment...
 
 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,15 +69,15 @@ 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 )---
   --> Attempting implicit conversion to object using increment...
 
 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)
-}
+}

Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@ add_points(NULL, 2);`
`10`	`10`	`--EXPECTF--`
`11`	`11`	`Warning: Creating default object from empty value in %sbug62005.php on line %d`
`12`	`12`
`13`		`-Notice: Undefined property: energy in %sbug62005.php on line 3`
	`13`	`+Notice: Undefined property: stdClass::$energy in %sbug62005.php on line 3`
`14`	`14`	`stdClass Object`
`15`	`15`	`(`
`16`	`16`	`[energy] => 2`
Original file line number	Diff line number	Diff line change
`@@ -755,7 +755,7 @@ static zval *zend_std_get_property_ptr_ptr(zval object, zval *member, int type`
`755`	`755`	`new_zval = &EG(uninitialized_zval);`
`756`	`756`
`757`	`757`	`if(UNEXPECTED(type == BP_VAR_RW \|\| type == BP_VAR_R)) {`
`758`		`- zend_error(E_NOTICE, "Undefined property: %s", Z_STRVAL_P(member));`
	`758`	`+ zend_error(E_NOTICE, "Undefined property: %s::$%s", zobj->ce->name, Z_STRVAL_P(member));`
`759`	`759`	`}`
`760`	`760`	`Z_ADDREF_P(new_zval);`
`761`	`761`	`if (EXPECTED((property_info->flags & ZEND_ACC_STATIC) == 0) &&`