- MFH Clean up (after consulting Andrei)

  . Change the handlers SPL uses to php_pcre_*_impl(pcre_cache_entry*,....)
  . All refactored funcs (match, split, replace, grep) use the above
  . Change (zend|php)_error() to php_error_docref()
  . Move from old to new param parsing api
  . Fix memleaks in unicode mode

4 files changed, 10 insertions, 9 deletions

diff --git a/ext/pcre/tests/grep2.phpt b/ext/pcre/tests/grep2.phpt
index 106b5f8e0c..0cf8d4aebc 100644
--- a/ext/pcre/tests/grep2.phpt
+++ b/ext/pcre/tests/grep2.phpt
@@ -19,10 +19,10 @@ var_dump(preg_last_error() == PREG_RECURSION_LIMIT_ERROR);
 
 ?>
 --EXPECTF--
-Warning: Wrong parameter count for preg_grep() in %sgrep2.php on line 3
+Warning: preg_grep() expects at most 3 parameters, 4 given in %sgrep2.php on line 3
 NULL
 
-Warning: preg_grep(): Second argument to preg_grep() should be an array in %sgrep2.php on line 4
+Warning: preg_grep() expects parameter 2 to be array, integer given in %sgrep2.php on line 4
 NULL
 
 Warning: preg_grep(): Compilation failed: nothing to repeat at offset 0 in %sgrep2.php on line 5
diff --git a/ext/pcre/tests/match_flags3.phpt b/ext/pcre/tests/match_flags3.phpt
index a0fa5a8f3c..f22205e3d8 100644
--- a/ext/pcre/tests/match_flags3.phpt
+++ b/ext/pcre/tests/match_flags3.phpt
@@ -18,8 +18,9 @@ var_dump(preg_match('/(?P<3>)/', ''));
 
 ?>
 --EXPECTF--
-Warning: Wrong value for parameter 4 in call to preg_match() in %smatch_flags3.php on line 3
-NULL
+
+Warning: preg_match(): Empty regular expression in %smatch_flags3.php on line 3
+bool(false)
 int(1)
 array(1) {
   [0]=>
@@ -41,5 +42,5 @@ array(1) {
   }
 }
 
-Warning: preg_match: numeric named subpatterns are not allowed in %smatch_flags3.php on line 14
+Warning: preg_match(): Numeric named subpatterns are not allowed in %smatch_flags3.php on line 14
 bool(false)
diff --git a/ext/pcre/tests/preg_replace.phpt b/ext/pcre/tests/preg_replace.phpt
index 146bb7d4f9..f7b5f74157 100644
--- a/ext/pcre/tests/preg_replace.phpt
+++ b/ext/pcre/tests/preg_replace.phpt
@@ -18,8 +18,8 @@ string(1) "x"
 string(4) "abcd"
 string(8) "zaab2k3l"
 
-Warning: preg_replace_callback(): requires argument 2, '', to be a valid callback in %spreg_replace.php on line 8
+Warning: preg_replace_callback(): Requires argument 2, '', to be a valid callback in %spreg_replace.php on line 8
 string(0) ""
 
-Warning: preg_replace_callback(): /e modifier cannot be used with replacement callback in %spreg_replace.php on line 10
+Warning: preg_replace_callback(): Modifier /e cannot be used with replacement callback in %spreg_replace.php on line 10
 NULL
diff --git a/ext/pcre/tests/split.phpt b/ext/pcre/tests/split.phpt
index 6141de1eb0..8ec8e655cf 100644
--- a/ext/pcre/tests/split.phpt
+++ b/ext/pcre/tests/split.phpt
@@ -17,8 +17,8 @@ var_dump(preg_split('/\d*/', 'ab2c3u', -1, PREG_SPLIT_NO_EMPTY));
 
 ?>
 --EXPECTF--
-Warning: Wrong parameter count for preg_split() in %ssplit.php on line 3
-NULL
+Warning: preg_split() expects at least 2 parameters, 0 given in %ssplit.php on line 3
+bool(false)
 
 Warning: preg_split(): Compilation failed: nothing to repeat at offset 0 in %ssplit.php on line 4
 bool(false)