From e98356668ca2b3b748cb277b8931bfbfd051e1b5 Mon Sep 17 00:00:00 2001 From: Michael Moravec Date: Tue, 9 Apr 2013 23:49:02 +0200 Subject: [PATCH] Fixed typo - inconsistent notice for undefined property (introduced by fix for #49348) --- Zend/tests/bug52041.phpt | 12 ++++++------ Zend/tests/bug60536_001.phpt | 2 +- Zend/tests/bug62005.phpt | 2 +- Zend/zend_object_handlers.c | 2 +- tests/classes/implicit_instantiation_001.phpt | 14 +++++++------- 5 files changed, 16 insertions(+), 16 deletions(-) diff --git a/Zend/tests/bug52041.phpt b/Zend/tests/bug52041.phpt index 96ddaa1c6d9d6..7e1f3423a6ee2 100644 --- 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 418b986fc8d43..a94e21eceed83 100644 --- 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 2f83412b5fb10..83158d5cc236d 100644 --- 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 54140b87c42c2..92c67c3436d4a 100644 --- 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 19ddbe2681653..51427df1e84fe 100644 --- 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 +}