diff options
| -rw-r--r-- | it.class | 8 | ||||
| -rwxr-xr-x | tests/it.t | 3 |
2 files changed, 6 insertions, 5 deletions
@@ -394,18 +394,16 @@ static function match($pattern, $string, $p = null) */ static function replace($replacements, $string, $p = array()) { - $patterns = array(); - - foreach (array_keys($replacements) as $pattern) + foreach ($replacements as $pattern => $dummy) $patterns[] = !preg_match('/\\\\[wb]|[!\x80-\xff]|\[\[:/i', $pattern) && !$p ? "!$pattern!i" : it::convertregex($complex = $pattern, $p); if (!$complex) - $result = preg_replace($patterns, array_values($replacements), $string); + $result = preg_replace($patterns, $replacements, $string); else { $oldlocale = setlocale(LC_CTYPE, 0); setlocale(LC_CTYPE, 'de_CH'); - $result = preg_replace($patterns, array_values($replacements), $string, isset($p['limit']) ? $p['limit'] : -1); + $result = preg_replace($patterns, $replacements, $string, isset($p['limit']) ? $p['limit'] : -1); setlocale(LC_CTYPE, $oldlocale); } @@ -210,7 +210,10 @@ is( "test all=>1,pattern_order=>1" ); +is(it::replace(array('a' => "1", 'b' => "2"), "ab"), "12"); +is(it::replace(array('!' => "x"), "!"), "x"); is(it::replace(array('\w' => "x"), "oö"), "xx"); +is(it::replace(array('[[:alpha:]]' => "x"), "ö"), "x"); is(it::replace(array('\w' => "x", '#' => "!"), "#ö"), "!x"); is(it::replace(array('#' => "!", '\w' => "x"), "#ö"), "!x"); is(it::replace(array('ö' => "x"), "Ö"), "x"); |