summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorBob Weinand <bobwei9@hotmail.com>2014-06-15 23:55:44 +0200
committerBob Weinand <bobwei9@hotmail.com>2014-06-15 23:55:44 +0200
commit0913c1509295a7db8cfc33e3b50cd1bc948b1864 (patch)
tree0b3f2edfa75d30e249522e5b6147a224b41782ac /tests
parentf92143f740c06d4344e15fa2b310f1cc674be77c (diff)
parent4555779c39ed5a208decabd8835eb866fe6ffa76 (diff)
downloadphp-git-0913c1509295a7db8cfc33e3b50cd1bc948b1864.tar.gz
Merge branch 'PHP-5.5' into PHP-5.6
Diffstat (limited to 'tests')
-rw-r--r--tests/classes/bug63462.phpt12
1 files changed, 5 insertions, 7 deletions
diff --git a/tests/classes/bug63462.phpt b/tests/classes/bug63462.phpt
index dc5edbd5e1..f425c1526b 100644
--- a/tests/classes/bug63462.phpt
+++ b/tests/classes/bug63462.phpt
@@ -2,8 +2,6 @@
Test script to verify that magic methods should be called only once when accessing an unset property.
--CREDITS--
Marco Pivetta <ocramius@gmail.com>
---XFAIL--
-Bug 63462 is not yet fixed
--FILE--
<?php
class Test {
@@ -20,7 +18,7 @@ class Test {
}
function __get($name) {
- echo '__get ' . $name . "\n";
+ echo '__get ' . $name;
return $this->$name;
}
@@ -54,13 +52,13 @@ $test->privateProperty = 'value';
--EXPECTF--
__get nonExisting
-Notice: Undefined index: nonExisting in %__set__get_006.php on line %d
+Notice: Undefined property: Test::$nonExisting in %sbug63462.php on line %d
__get publicProperty
-Notice: Undefined index: publicProperty in %__set__get_006.php on line %d
+Notice: Undefined property: Test::$publicProperty in %sbug63462.php on line %d
__get protectedProperty
-Notice: Undefined index: protectedProperty in %__set__get_006.php on line %d
+Notice: Undefined property: Test::$protectedProperty in %sbug63462.php on line %d
__get privateProperty
-Notice: Undefined index: privateProperty in %__set__get_006.php on line %d
+Notice: Undefined property: Test::$privateProperty in %sbug63462.php on line %d
__isset nonExisting
__isset publicProperty
__isset protectedProperty