diff options
| author | Ferenc Kovacs <tyrael@php.net> | 2014-02-27 02:32:07 +0100 |
|---|---|---|
| committer | Ferenc Kovacs <tyrael@php.net> | 2014-02-27 02:32:07 +0100 |
| commit | fd20278fa58f77879124783d3207a7fd6e059199 (patch) | |
| tree | 02bc4c337d5baeeadcefdf8ff33791defc4c64e4 /ext/reflection | |
| parent | 38797e598b6af7502f708b6a3d951fdb86272abe (diff) | |
| parent | bd961f3e873f71c1408111da065d94cd0c6527d9 (diff) | |
| download | php-git-fd20278fa58f77879124783d3207a7fd6e059199.tar.gz | |
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
fix tests broken by 633f898f1520253d3530fe91fc82f68bca7c4627
Diffstat (limited to 'ext/reflection')
| -rw-r--r-- | ext/reflection/tests/ReflectionClass_getStaticPropertyValue_001_2_4.phpt | 2 | ||||
| -rw-r--r-- | ext/reflection/tests/ReflectionClass_setStaticPropertyValue_001_2_4.phpt | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/ext/reflection/tests/ReflectionClass_getStaticPropertyValue_001_2_4.phpt b/ext/reflection/tests/ReflectionClass_getStaticPropertyValue_001_2_4.phpt index c299412e13..8bb62d95f1 100644 --- a/ext/reflection/tests/ReflectionClass_getStaticPropertyValue_001_2_4.phpt +++ b/ext/reflection/tests/ReflectionClass_getStaticPropertyValue_001_2_4.phpt @@ -56,6 +56,6 @@ string(13) "default value" Fatal error: Uncaught exception 'ReflectionException' with message 'Class A does not have a property named ' in %sReflectionClass_getStaticPropertyValue_001_2_4.php:%d Stack trace: -#0 %sReflectionClass_getStaticPropertyValue_001_2_4.php(%d): ReflectionClass->getStaticPropertyValue('?A?privateOverr...') +#0 %sReflectionClass_getStaticPropertyValue_001_2_4.php(%d): ReflectionClass->getStaticPropertyValue('\x00A\x00privateOverr...') #1 {main} thrown in %sReflectionClass_getStaticPropertyValue_001_2_4.php on line %d diff --git a/ext/reflection/tests/ReflectionClass_setStaticPropertyValue_001_2_4.phpt b/ext/reflection/tests/ReflectionClass_setStaticPropertyValue_001_2_4.phpt index 1092f6553d..dc13bf562d 100644 --- a/ext/reflection/tests/ReflectionClass_setStaticPropertyValue_001_2_4.phpt +++ b/ext/reflection/tests/ReflectionClass_setStaticPropertyValue_001_2_4.phpt @@ -56,6 +56,6 @@ Set static values in A: Fatal error: Uncaught exception 'ReflectionException' with message 'Class A does not have a property named ' in %sReflectionClass_setStaticPropertyValue_001_2_4.php:%d Stack trace: -#0 %sReflectionClass_setStaticPropertyValue_001_2_4.php(%d): ReflectionClass->setStaticPropertyValue('?A?privateOverr...', 'new value 1') +#0 %sReflectionClass_setStaticPropertyValue_001_2_4.php(%d): ReflectionClass->setStaticPropertyValue('\x00A\x00privateOverr...', 'new value 1') #1 {main} thrown in %sReflectionClass_setStaticPropertyValue_001_2_4.php on line %d |