- Unicodify (#46687)

diff --git a/ext/standard/string.c b/ext/standard/string.c
index ce9f7c2a240153ed175f9fa9c7c6bbea599f2b23..65d1cc30ff703fb372c3176ec02f4296ca84d769 100644 (file)
--- 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 d2d5b2b612468c4b782f023b9a85307692cc3b92..178fae7d08d2d634b42a358c0746b18049310d18 100644 (file)
--- 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===