Merge branch 'PHP-5.4' into PHP-5.5

This commit is contained in:
Bob Weinand 2014-06-15 23:54:05 +02:00
commit 4555779c39

View File

@ -2,8 +2,6 @@
Test script to verify that magic methods should be called only once when accessing an unset property. Test script to verify that magic methods should be called only once when accessing an unset property.
--CREDITS-- --CREDITS--
Marco Pivetta <ocramius@gmail.com> Marco Pivetta <ocramius@gmail.com>
--XFAIL--
Bug 63462 is not yet fixed
--FILE-- --FILE--
<?php <?php
class Test { class Test {
@ -20,7 +18,7 @@ class Test {
} }
function __get($name) { function __get($name) {
echo '__get ' . $name . "\n"; echo '__get ' . $name;
return $this->$name; return $this->$name;
} }
@ -54,13 +52,13 @@ $test->privateProperty = 'value';
--EXPECTF-- --EXPECTF--
__get nonExisting __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 __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 __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 __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 nonExisting
__isset publicProperty __isset publicProperty
__isset protectedProperty __isset protectedProperty