diff options
-rw-r--r-- | it.class | 4 | ||||
-rwxr-xr-x | tests/it.t | 1 |
2 files changed, 3 insertions, 2 deletions
@@ -429,8 +429,8 @@ static function any2utf8($value, $errprefix = "") if (is_array($value)) { foreach ($value as $idx => $v) - if (is_string($v) || is_array($v)) - $value[$idx] = self::any2utf8($v, $errprefix); + $newarr[self::any2utf8($idx)] = is_string($v) || is_array($v) ? self::any2utf8($v, $errprefix) : $v; + $value = $newarr; } else if (is_string($value)) { @@ -389,6 +389,7 @@ is(it::any2utf8("a💚b"), "a💚b", "it::any2utf8 correctly handles 4-byte utf- is(it::any2utf8(array("foo", utf8_decode("bär"))), array("foo", "bär"), "any2utf8 on arrays"); is(it::any2utf8(array("foo", array(utf8_decode("bär")))), array("foo", array("bär")), "any2utf8 on recursive arrays"); is(it::any2utf8(array(1, true, false, null)), array(1, true, false, null), "any2utf8 should leave types alone"); +is(it::any2utf8(array(utf8_decode('Müller') => utf8_decode('Müller'))), array('Müller' => 'Müller'), "it::any2utf8 latin1 keys"); foreach (array($dummy, false, true, null, 1, "a", "Ä", "/", array()) as $var) is(it::json_decode(it::json_encode($var)), $var); |