diff options
| author | Ferenc Kovacs <tyrael@php.net> | 2014-02-27 02:32:47 +0100 |
|---|---|---|
| committer | Ferenc Kovacs <tyrael@php.net> | 2014-02-27 02:32:47 +0100 |
| commit | 42a43d45317ac93c2ba934486879a0bc418bc34d (patch) | |
| tree | 646c507f4beeca8804e64cc8cb07dd1398f83954 | |
| parent | afb0675e3b5efde717b482ec69e7fb7e601a6ad0 (diff) | |
| parent | fd20278fa58f77879124783d3207a7fd6e059199 (diff) | |
| download | php-git-42a43d45317ac93c2ba934486879a0bc418bc34d.tar.gz | |
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
fix tests broken by 633f898f1520253d3530fe91fc82f68bca7c4627
3 files changed, 3 insertions, 3 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 diff --git a/ext/spl/tests/bug54291.phpt b/ext/spl/tests/bug54291.phpt index b8f596e02c..9314b6b9ff 100644 --- a/ext/spl/tests/bug54291.phpt +++ b/ext/spl/tests/bug54291.phpt @@ -7,7 +7,7 @@ $dir->isFile(); --EXPECTF-- Fatal error: Uncaught exception 'UnexpectedValueException' with message 'Failed to open directory ""' in %s:%d Stack trace: -#0 %s(%d): DirectoryIterator->__construct('?/abc') +#0 %s(%d): DirectoryIterator->__construct('\x00/abc') #1 {main} thrown in %s on line %d |