diff options
| author | Michael Moravec <mail@majkl578.cz> | 2013-04-09 23:49:02 +0200 |
|---|---|---|
| committer | Xinchen Hui <laruence@php.net> | 2013-04-10 13:36:47 +0800 |
| commit | 70668fd88a51fbf1c6b9ef8d19f5623f5eb1c34d (patch) | |
| tree | 4a28262ba311a3cdda3c57c74a774d6e50552ab2 /Zend | |
| parent | 1c498e6e942ec6f98e57c9fb803bef18dec30ba7 (diff) | |
| download | php-git-70668fd88a51fbf1c6b9ef8d19f5623f5eb1c34d.tar.gz | |
Fixed typo - inconsistent notice for undefined property (introduced by fix for #49348)
Diffstat (limited to 'Zend')
| -rw-r--r-- | Zend/tests/bug52041.phpt | 12 | ||||
| -rw-r--r-- | Zend/tests/bug60536_001.phpt | 2 | ||||
| -rw-r--r-- | Zend/tests/bug62005.phpt | 2 | ||||
| -rw-r--r-- | Zend/zend_object_handlers.c | 2 |
4 files changed, 9 insertions, 9 deletions
diff --git a/Zend/tests/bug52041.phpt b/Zend/tests/bug52041.phpt index 96ddaa1c6d..7e1f3423a6 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 418b986fc8..a94e21ecee 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 2f83412b5f..83158d5cc2 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 54140b87c4..92c67c3436 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) && |