diff options
| author | krakjoe <joe.watkins@live.co.uk> | 2014-05-05 22:45:29 +0100 |
|---|---|---|
| committer | krakjoe <joe.watkins@live.co.uk> | 2014-05-05 22:45:29 +0100 |
| commit | d7c529ed327cca4fad2c42fe74fabc367f24dc5b (patch) | |
| tree | 919d9e6800c6244436ddce9d09d707922fd859a4 /tests | |
| parent | 875c48ae679158cb2194c4e277810883e0b21768 (diff) | |
| parent | 211d32c81429730e2692c65577d021616a525726 (diff) | |
| download | php-git-d7c529ed327cca4fad2c42fe74fabc367f24dc5b.tar.gz | |
Merge branch 'phpng' of git.php.net:php-src into phpng
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/classes/bug63462.phpt | 14 | ||||
| -rw-r--r-- | tests/classes/constants_error_002.phpt | 12 | ||||
| -rw-r--r-- | tests/classes/inheritance_007.phpt | 4 |
3 files changed, 16 insertions, 14 deletions
diff --git a/tests/classes/bug63462.phpt b/tests/classes/bug63462.phpt index dc5edbd5e1..119bf592c2 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 { @@ -54,13 +52,17 @@ $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 diff --git a/tests/classes/constants_error_002.phpt b/tests/classes/constants_error_002.phpt index 610a42da9b..be27971b87 100644 --- a/tests/classes/constants_error_002.phpt +++ b/tests/classes/constants_error_002.phpt @@ -2,11 +2,11 @@ Error case: class constant as an array --FILE-- <?php -class myclass -{ - const myConst = array(); -} + class myclass + { + const myConst = array(); + } ?> -===DONE=== --EXPECTF-- -===DONE=== + +Fatal error: Arrays are not allowed in class constants in %s on line 4 diff --git a/tests/classes/inheritance_007.phpt b/tests/classes/inheritance_007.phpt index 0b2bde0350..46100449c4 100644 --- a/tests/classes/inheritance_007.phpt +++ b/tests/classes/inheritance_007.phpt @@ -20,14 +20,14 @@ $b->b(); --EXPECTF-- array(2) { [0]=> - &object(ReflectionMethod)#%d (2) { + object(ReflectionMethod)#%d (2) { ["name"]=> string(1) "B" ["class"]=> string(1) "A" } [1]=> - &object(ReflectionMethod)#%d (2) { + object(ReflectionMethod)#%d (2) { ["name"]=> string(1) "A" ["class"]=> |