diff options
| author | Felipe Pena <felipe@php.net> | 2008-12-28 20:16:48 +0000 |
|---|---|---|
| committer | Felipe Pena <felipe@php.net> | 2008-12-28 20:16:48 +0000 |
| commit | 7f74e97e3e367e896fe6d87c62b6eeaeb3e96845 (patch) | |
| tree | 55f6274b4a2d3e53e856060afa4625049b97be80 | |
| parent | 7c8f0cf3d8d328d7e81acd516a7563f400ed5367 (diff) | |
| download | php-git-7f74e97e3e367e896fe6d87c62b6eeaeb3e96845.tar.gz | |
- Unicodify (#46687)
| -rw-r--r-- | ext/standard/string.c | 2 | ||||
| -rw-r--r-- | ext/standard/tests/file/pathinfo_variation2.phpt | 14 |
2 files changed, 8 insertions, 8 deletions
diff --git a/ext/standard/string.c b/ext/standard/string.c index ce9f7c2a24..65d1cc30ff 100644 --- a/ext/standard/string.c +++ b/ext/standard/string.c @@ -2129,7 +2129,7 @@ PHP_FUNCTION(pathinfo) if (zend_hash_get_current_data(Z_ARRVAL_P(tmp), (void **) &element) == SUCCESS) { RETVAL_ZVAL(*element, 1, 0); } else { - ZVAL_EMPTY_STRING(return_value); + ZVAL_EMPTY_UNICODE(return_value); } } diff --git a/ext/standard/tests/file/pathinfo_variation2.phpt b/ext/standard/tests/file/pathinfo_variation2.phpt index d2d5b2b612..178fae7d08 100644 --- a/ext/standard/tests/file/pathinfo_variation2.phpt +++ b/ext/standard/tests/file/pathinfo_variation2.phpt @@ -122,7 +122,7 @@ unicode(%d) %s unicode(%d) %s --float .5-- -string(0) "" +unicode(0) "" --empty array-- Error: 2 - pathinfo() expects parameter 2 to be long, array given, %s(%d) @@ -141,22 +141,22 @@ Error: 2 - pathinfo() expects parameter 2 to be long, array given, %s(%d) NULL --uppercase NULL-- -string(0) "" +unicode(0) "" --lowercase null-- -string(0) "" +unicode(0) "" --lowercase true-- unicode(17) "/usr/include/arpa" --lowercase false-- -string(0) "" +unicode(0) "" --uppercase TRUE-- unicode(17) "/usr/include/arpa" --uppercase FALSE-- -string(0) "" +unicode(0) "" --empty string DQ-- Error: 2 - pathinfo() expects parameter 2 to be long, Unicode string given, %s(%d) @@ -191,9 +191,9 @@ Error: 2 - pathinfo() expects parameter 2 to be long, object given, %s(%d) NULL --undefined var-- -string(0) "" +unicode(0) "" --unset var-- -string(0) "" +unicode(0) "" ===DONE=== |