- Removed UEXPECT(F)

diff --git a/ext/openssl/tests/002.phpt b/ext/openssl/tests/002.phpt
index 42b1fdb0d34db01f33f1c10ccfedb6d92fa0b76c..10fcdd5a6c1dcbe9d143911a7ddff12a07eb216b 100644 (file)
--- a/ext/openssl/tests/002.phpt
+++ b/ext/openssl/tests/002.phpt
@@ -24,19 +24,6 @@ bool(false)
 Warning: openssl_seal(): Fourth argument to openssl_seal() must be a non-empty array in %s on line %d
 bool(false)
 
-Warning: openssl_seal() expects parameter 1 to be string, array given in %s on line %d
-NULL
-
-Warning: openssl_seal() expects parameter 1 to be string, array given in %s on line %d
-NULL
-Done
---UEXPECTF--
-Warning: openssl_seal(): not a public key (0th member of pubkeys) in %s on line %d
-bool(false)
-
-Warning: openssl_seal(): Fourth argument to openssl_seal() must be a non-empty array in %s on line %d
-bool(false)
-
 Warning: openssl_seal() expects parameter 1 to be binary string, array given in %s on line %d
 NULL
 

diff --git a/ext/openssl/tests/003.phpt b/ext/openssl/tests/003.phpt
index 370f4a4dfa2c644a89508b26acdc7999572cec28..939de51bf5b9fce4d0341712dab6964d6142a7c0 100644 (file)
--- a/ext/openssl/tests/003.phpt
+++ b/ext/openssl/tests/003.phpt
@@ -26,22 +26,6 @@ var_dump(openssl_pkcs7_decrypt($a, $b, 0, 0));
 echo "Done\n";
 ?>
 --EXPECTF--    
-string(57) "Object of class stdClass could not be converted to string"
-string(45) "Object of class stdClass to string conversion"
-string(66) "openssl_pkcs7_decrypt(): unable to coerce parameter 3 to x509 cert"
-bool(false)
-object(stdClass)#1 (0) {
-}
-string(66) "openssl_pkcs7_decrypt(): unable to coerce parameter 3 to x509 cert"
-bool(false)
-string(66) "openssl_pkcs7_decrypt(): unable to coerce parameter 3 to x509 cert"
-bool(false)
-string(66) "openssl_pkcs7_decrypt(): unable to coerce parameter 3 to x509 cert"
-bool(false)
-string(66) "openssl_pkcs7_decrypt(): unable to coerce parameter 3 to x509 cert"
-bool(false)
-Done
---UEXPECTF--
 unicode(64) "Object of class stdClass could not be converted to binary string"
 unicode(45) "Object of class stdClass to string conversion"
 unicode(66) "openssl_pkcs7_decrypt(): unable to coerce parameter 3 to x509 cert"

diff --git a/ext/openssl/tests/005.phpt b/ext/openssl/tests/005.phpt
index e4431fb972d34dae98d15426535780e2fa607fd2..82ee1d81cc4638f94b661d4c361daa3329b6ed70 100644 (file)
--- a/ext/openssl/tests/005.phpt
+++ b/ext/openssl/tests/005.phpt
@@ -16,23 +16,6 @@ echo "\n";
 $cn = utf8_decode($out['CN']);
 var_dump($cn);
 --EXPECTF--    
-array(6) {
-  ["C"]=>
-  string(2) "NL"
-  ["ST"]=>
-  string(13) "Noord Brabant"
-  ["L"]=>
-  string(4) "Uden"
-  ["O"]=>
-  string(10) "Triconnect"
-  ["OU"]=>
-  string(10) "Triconnect"
-  ["CN"]=>
-  string(15) "*.triconnect.nl"
-}
-
-string(15) "*.triconnect.nl"
---UEXPECTF--   
 array(6) {
   [u"C"]=>
   unicode(2) "NL"

diff --git a/ext/openssl/tests/bug28382.phpt b/ext/openssl/tests/bug28382.phpt
index a26cf3409d8572aa22bcd9b847f7744c62a2e131..b8829c98afc368f56ac3a0a187beaa1a1ef26ccc 100644 (file)
--- a/ext/openssl/tests/bug28382.phpt
+++ b/ext/openssl/tests/bug28382.phpt
@@ -12,34 +12,6 @@ $ext = openssl_x509_parse($cert);
 var_dump($ext['extensions']);
 ?>
 --EXPECTF--
-array(11) {
-  ["basicConstraints"]=>
-  string(8) "CA:FALSE"
-  ["nsComment"]=>
-  string(38) "For Grid use only; request tag userTag"
-  ["nsCertType"]=>
-  string(30) "SSL Client, SSL Server, S/MIME"
-  ["crlDistributionPoints"]=>
-  string(51) "URI:http://mobile.blue-software.ro:90/ca/crl.shtml
-"
-  ["nsCaPolicyUrl"]=>
-  string(38) "http://mobile.blue-software.ro:90/pub/"
-  ["subjectAltName"]=>
-  string(28) "email:sergiu@bluesoftware.ro"
-  ["subjectKeyIdentifier"]=>
-  string(59) "B0:A7:FF:F9:41:15:DE:23:39:BD:DD:31:0F:97:A0:B2:A2:74:E0:FC"
-  ["authorityKeyIdentifier"]=>
-  string(115) "DirName:/C=RO/ST=Romania/L=Craiova/O=Sergiu/OU=Sergiu SRL/CN=Sergiu CA/emailAddress=n_sergiu@hotmail.com
-serial:00
-"
-  ["keyUsage"]=>
-  string(71) "Digital Signature, Non Repudiation, Key Encipherment, Data Encipherment"
-  ["nsBaseUrl"]=>
-  string(20) "http://62.231.98.52/"
-  ["1.2.3.4"]=>
-  string(4) "%s"
-}
---UEXPECTF--
 array(11) {
   [u"basicConstraints"]=>
   unicode(8) "CA:FALSE"
@@ -66,4 +38,4 @@ serial:00
   unicode(20) "http://62.231.98.52/"
   [u"1.2.3.4"]=>
   string(4) "%s"
-}
\ No newline at end of file
+}

diff --git a/ext/openssl/tests/bug38255.phpt b/ext/openssl/tests/bug38255.phpt
index 1c640b067888e7b30ad41a5517274691d61f98f2..a647c5cf51d69c11e0b8b24bb94f4ed6af9b3749 100644 (file)
--- a/ext/openssl/tests/bug38255.phpt
+++ b/ext/openssl/tests/bug38255.phpt
@@ -38,30 +38,6 @@ bool(false)
 Warning: openssl_verify(): supplied key param cannot be coerced into a public key in %s on line %d
 bool(false)
 
-Warning: openssl_verify() expects parameter 2 to be string, object given in %s on line %d
-NULL
-
-Warning: openssl_verify() expects parameter 2 to be string, object given in %s on line %d
-NULL
-
-Warning: openssl_verify() expects parameter 2 to be string, array given in %s on line %d
-NULL
-
-Warning: openssl_verify() expects at least 3 parameters, 0 given in %s on line %d
-NULL
-
-Warning: openssl_verify() expects parameter 1 to be string, object given in %s on line %d
-NULL
-Done
---UEXPECTF--
-Warning: openssl_verify(): supplied key param cannot be coerced into a public key in %s on line %d
-
-Warning: openssl_verify(): supplied key param cannot be coerced into a public key in %s on line %d
-bool(false)
-
-Warning: openssl_verify(): supplied key param cannot be coerced into a public key in %s on line %d
-bool(false)
-
 Warning: openssl_verify() expects parameter 2 to be binary string, object given in %s on line %d
 NULL
 

diff --git a/ext/openssl/tests/bug38261.phpt b/ext/openssl/tests/bug38261.phpt
index 33fc7702ade1021b73d2c467aef1f2a832ed03e2..a3bb0eb011f163e0b6c187bf5c916bfd36e8b3f4 100644 (file)
--- a/ext/openssl/tests/bug38261.phpt
+++ b/ext/openssl/tests/bug38261.phpt
@@ -27,16 +27,6 @@ bool(false)
 bool(false)
 bool(false)
 
-Warning: openssl_x509_parse() expects at least 1 parameter, 0 given in %sbug38261.php on line %d
-NULL
-bool(false)
-
-Catchable fatal error: Object of class stdClass could not be converted to string in %sbug38261.php on line %d 
---UEXPECTF--
-bool(false)
-bool(false)
-bool(false)
-
 Warning: openssl_x509_parse() expects at least 1 parameter, 0 given in %s on line %d
 NULL
 bool(false)

diff --git a/ext/pcre/tests/001.phpt b/ext/pcre/tests/001.phpt
index 2e310432441b02480d5bc73c052db53b147a1298..0d8fec35d6ebe0f73bc990a3a9e1a6786f04da8a 100644 (file)
--- a/ext/pcre/tests/001.phpt
+++ b/ext/pcre/tests/001.phpt
@@ -17,76 +17,6 @@ foreach (array('2006-05-13', '06-12-12', 'data: "12-Aug-87"') as $s) {
 ?>
 --EXPECT--
 int(1)
-array(10) {
-  [0]=>
-  string(10) "2006-05-13"
-  ["date"]=>
-  string(10) "2006-05-13"
-  [1]=>
-  string(10) "2006-05-13"
-  ["year"]=>
-  string(4) "2006"
-  [2]=>
-  string(4) "2006"
-  [3]=>
-  string(2) "20"
-  ["month"]=>
-  string(2) "05"
-  [4]=>
-  string(2) "05"
-  ["day"]=>
-  string(2) "13"
-  [5]=>
-  string(2) "13"
-}
-int(1)
-array(10) {
-  [0]=>
-  string(8) "06-12-12"
-  ["date"]=>
-  string(8) "06-12-12"
-  [1]=>
-  string(8) "06-12-12"
-  ["year"]=>
-  string(2) "06"
-  [2]=>
-  string(2) "06"
-  [3]=>
-  string(0) ""
-  ["month"]=>
-  string(2) "12"
-  [4]=>
-  string(2) "12"
-  ["day"]=>
-  string(2) "12"
-  [5]=>
-  string(2) "12"
-}
-int(1)
-array(10) {
-  [0]=>
-  string(8) "12-Aug-8"
-  ["date"]=>
-  string(8) "12-Aug-8"
-  [1]=>
-  string(8) "12-Aug-8"
-  ["year"]=>
-  string(2) "12"
-  [2]=>
-  string(2) "12"
-  [3]=>
-  string(0) ""
-  ["month"]=>
-  string(3) "Aug"
-  [4]=>
-  string(3) "Aug"
-  ["day"]=>
-  string(1) "8"
-  [5]=>
-  string(1) "8"
-}
---UEXPECT--
-int(1)
 array(10) {
   [0]=>
   unicode(10) "2006-05-13"

diff --git a/ext/pcre/tests/002.phpt b/ext/pcre/tests/002.phpt
index 0fffdf2438862e9d807dbaba1aee5a4227d955a5..f38522bfe3078aede650fc5e296a809b21861c35 100644 (file)
--- a/ext/pcre/tests/002.phpt
+++ b/ext/pcre/tests/002.phpt
@@ -26,29 +26,6 @@ bool(false)
 Warning: preg_match_all(): Invalid flags specified in %s002.php on line 5
 NULL
 
-Warning: preg_quote() expects at least 1 parameter, 0 given in %s002.php on line 7
-NULL
-string(0) ""
-string(12) "a${1b${1c${1"
-
-Warning: preg_replace(): Compilation failed: missing terminating ] for character class at offset 8 in %s002.php on line 11
-NULL
-
-Parse error: %s, unexpected T_FOR in %s002.php(12) : regexp code on line 1
-
-Fatal error: preg_replace(): Failed evaluating code: 
-for ($ in %s002.php on line 12
---UEXPECTF--
-
-Warning: preg_match() expects at least 2 parameters, 0 given in %s002.php on line 3
-bool(false)
-
-Warning: preg_match_all() expects at least 3 parameters, 0 given in %s002.php on line 4
-bool(false)
-
-Warning: preg_match_all(): Invalid flags specified in %s002.php on line 5
-NULL
-
 Warning: preg_quote() expects at least 1 parameter, 0 given in %s002.php on line 7
 NULL
 unicode(0) ""

diff --git a/ext/pcre/tests/003.phpt b/ext/pcre/tests/003.phpt
index 4b8a7d3f94e41aa1db6fff81a26f3a69f449bab3..053ba0eddb512a129cf3882ba45c40abbdc76ba3 100644 (file)
--- a/ext/pcre/tests/003.phpt
+++ b/ext/pcre/tests/003.phpt
@@ -17,129 +17,6 @@ foreach (array(PREG_PATTERN_ORDER, PREG_SET_ORDER) as $flag) {
 ?>
 --EXPECT--
 int(2)
-array(10) {
-  [0]=>
-  array(2) {
-    [0]=>
-    string(10) "2006-05-13"
-    [1]=>
-    string(9) "12-Aug-37"
-  }
-  ["date"]=>
-  array(2) {
-    [0]=>
-    string(10) "2006-05-13"
-    [1]=>
-    string(9) "12-Aug-37"
-  }
-  [1]=>
-  array(2) {
-    [0]=>
-    string(10) "2006-05-13"
-    [1]=>
-    string(9) "12-Aug-37"
-  }
-  ["year"]=>
-  array(2) {
-    [0]=>
-    string(4) "2006"
-    [1]=>
-    string(2) "12"
-  }
-  [2]=>
-  array(2) {
-    [0]=>
-    string(4) "2006"
-    [1]=>
-    string(2) "12"
-  }
-  [3]=>
-  array(2) {
-    [0]=>
-    string(2) "20"
-    [1]=>
-    string(0) ""
-  }
-  ["month"]=>
-  array(2) {
-    [0]=>
-    string(2) "05"
-    [1]=>
-    string(3) "Aug"
-  }
-  [4]=>
-  array(2) {
-    [0]=>
-    string(2) "05"
-    [1]=>
-    string(3) "Aug"
-  }
-  ["day"]=>
-  array(2) {
-    [0]=>
-    string(2) "13"
-    [1]=>
-    string(2) "37"
-  }
-  [5]=>
-  array(2) {
-    [0]=>
-    string(2) "13"
-    [1]=>
-    string(2) "37"
-  }
-}
-int(2)
-array(2) {
-  [0]=>
-  array(10) {
-    [0]=>
-    string(10) "2006-05-13"
-    ["date"]=>
-    string(10) "2006-05-13"
-    [1]=>
-    string(10) "2006-05-13"
-    ["year"]=>
-    string(4) "2006"
-    [2]=>
-    string(4) "2006"
-    [3]=>
-    string(2) "20"
-    ["month"]=>
-    string(2) "05"
-    [4]=>
-    string(2) "05"
-    ["day"]=>
-    string(2) "13"
-    [5]=>
-    string(2) "13"
-  }
-  [1]=>
-  array(10) {
-    [0]=>
-    string(9) "12-Aug-37"
-    ["date"]=>
-    string(9) "12-Aug-37"
-    [1]=>
-    string(9) "12-Aug-37"
-    ["year"]=>
-    string(2) "12"
-    [2]=>
-    string(2) "12"
-    [3]=>
-    string(0) ""
-    ["month"]=>
-    string(3) "Aug"
-    [4]=>
-    string(3) "Aug"
-    ["day"]=>
-    string(2) "37"
-    [5]=>
-    string(2) "37"
-  }
-}
---UEXPECT--
-int(2)
 array(10) {
   [0]=>
   array(2) {

diff --git a/ext/pcre/tests/004.phpt b/ext/pcre/tests/004.phpt
index 93f4a1c34b7271ca5cf040d76002b97a35d7d11e..8ab4a85dcc7a62ec077c172f029c4f236bc61f23 100644 (file)
--- a/ext/pcre/tests/004.phpt
+++ b/ext/pcre/tests/004.phpt
@@ -18,137 +18,6 @@ var_dump(preg_split('/PHP_(?:NAMED_)?(?:FUNCTION|METHOD)\s*\((\w+(?:,\s*\w+)?)\)
 ?>
 --EXPECT--
 int(2)
-array(2) {
-  [0]=>
-  array(7) {
-    [0]=>
-    string(24) "unsigned int xpto = 124;"
-    [1]=>
-    string(12) "unsigned int"
-    [2]=>
-    string(0) ""
-    [3]=>
-    string(0) ""
-    [4]=>
-    string(4) "xpto"
-    [5]=>
-    string(1) "="
-    [6]=>
-    string(0) ""
-  }
-  [1]=>
-  array(7) {
-    [0]=>
-    string(11) "short a, b;"
-    [1]=>
-    string(5) "short"
-    [2]=>
-    string(0) ""
-    [3]=>
-    string(0) ""
-    [4]=>
-    string(1) "a"
-    [5]=>
-    string(0) ""
-    [6]=>
-    string(3) ", b"
-  }
-}
-int(3)
-array(3) {
-  [0]=>
-  array(4) {
-    [0]=>
-    string(3) "&a,"
-    [1]=>
-    string(1) "&"
-    [2]=>
-    string(1) "a"
-    [3]=>
-    string(0) ""
-  }
-  [1]=>
-  array(4) {
-    [0]=>
-    string(2) "b,"
-    [1]=>
-    string(0) ""
-    [2]=>
-    string(1) "b"
-    [3]=>
-    string(0) ""
-  }
-  [2]=>
-  array(4) {
-    [0]=>
-    string(2) "&c"
-    [1]=>
-    string(1) "&"
-    [2]=>
-    string(1) "c"
-    [3]=>
-    string(0) ""
-  }
-}
-int(1)
-array(1) {
-  [0]=>
-  array(3) {
-    [0]=>
-    array(2) {
-      [0]=>
-      string(46) "zend_parse_parameters( 0, "addd|s/", a, b, &c)"
-      [1]=>
-      int(0)
-    }
-    [1]=>
-    array(2) {
-      [0]=>
-      string(7) "addd|s/"
-      [1]=>
-      int(27)
-    }
-    [2]=>
-    array(2) {
-      [0]=>
-      string(9) "a, b, &c)"
-      [1]=>
-      int(37)
-    }
-  }
-}
-string(9) "hello
-
-
-
-"
-array(3) {
-  [0]=>
-  array(2) {
-    [0]=>
-    string(0) ""
-    [1]=>
-    int(0)
-  }
-  [1]=>
-  array(2) {
-    [0]=>
-    string(13) "s, preg_match"
-    [1]=>
-    int(13)
-  }
-  [2]=>
-  array(2) {
-    [0]=>
-    string(9) "
-{
-lalala"
-    [1]=>
-    int(27)
-  }
-}
---UEXPECT--
-int(2)
 array(2) {
   [0]=>
   array(7) {

diff --git a/ext/pcre/tests/006.phpt b/ext/pcre/tests/006.phpt
index befca54aaafeaad39791a0f6458e5d78c633d3f3..e3ba106c1c6e8130bf4f4e103a0952d04f2c6d1f 100644 (file)
--- a/ext/pcre/tests/006.phpt
+++ b/ext/pcre/tests/006.phpt
@@ -15,12 +15,6 @@ var_dump($result);
 echo "Done\n";
 ?>
 --EXPECTF--    
-string(58) "[CODE]<td align="$stylevar[right]">[/CODE]"
-NULL
-string(58) "[CODE]<td align="$stylevar[right]">[/CODE]"
-NULL
-Done
---UEXPECTF--
 unicode(58) "[CODE]<td align="$stylevar[right]">[/CODE]"
 NULL
 unicode(58) "[CODE]<td align="$stylevar[right]">[/CODE]"

diff --git a/ext/pcre/tests/bug20528.phpt b/ext/pcre/tests/bug20528.phpt
index 87f0672fc140637fc8b52c99cbea9f24824ac34e..e68cc1fe8b608e600eb3119efc653b737d7f043f 100644 (file)
--- a/ext/pcre/tests/bug20528.phpt
+++ b/ext/pcre/tests/bug20528.phpt
@@ -6,23 +6,6 @@ Bug #20528 (preg_split() drops characters (re-opens Bug #15413))
        var_dump(preg_split('/\b/', $data));
 ?>
 --EXPECT--
-array(7) {
-  [0]=>
-  string(2) "(#"
-  [1]=>
-  string(2) "11"
-  [2]=>
-  string(1) "/"
-  [3]=>
-  string(2) "19"
-  [4]=>
-  string(1) "/"
-  [5]=>
-  string(4) "2002"
-  [6]=>
-  string(2) "#)"
-}
---UEXPECT--
 array(7) {
   [0]=>
   unicode(2) "(#"

diff --git a/ext/pcre/tests/bug21732.phpt b/ext/pcre/tests/bug21732.phpt
index 7daf1084ab4d61660008d3f43ec558ed96ba482c..973568c787dff9bdec7ad3ee9575c522cea4a580 100644 (file)
--- a/ext/pcre/tests/bug21732.phpt
+++ b/ext/pcre/tests/bug21732.phpt
@@ -16,19 +16,6 @@ var_dump(preg_replace_callback("/(ab)(cd)(e)/", array(new foo(), "cb"), 'abcde')
 ?>
 --EXPECT--
 bool(false)
-array(4) {
-  [0]=>
-  string(5) "abcde"
-  [1]=>
-  string(2) "ab"
-  [2]=>
-  string(2) "cd"
-  [3]=>
-  string(1) "e"
-}
-string(4) "yes!"
---UEXPECT--
-bool(false)
 array(4) {
   [0]=>
   unicode(5) "abcde"

diff --git a/ext/pcre/tests/bug21758.phpt b/ext/pcre/tests/bug21758.phpt
index 86e7db622c1c3e52f4eebe6472bdadfdaeeb7a12..3454ca06481267dda64a595947d9bd1ed342e0b0 100644 (file)
--- a/ext/pcre/tests/bug21758.phpt
+++ b/ext/pcre/tests/bug21758.phpt
@@ -23,6 +23,4 @@ Bug #21758 (preg_replace_callback() not working with class methods)
   $o = new Foo;
 ?>
 --EXPECT--
-string(25) "preg_replace() is working"
---UEXPECT--
 unicode(25) "preg_replace() is working"

diff --git a/ext/pcre/tests/bug26927.phpt b/ext/pcre/tests/bug26927.phpt
index 7e74d3cddd66d0a8722966b456044cb59bd80ec4..72f740e220ea7aeaa2ba80b04aaa3b560866340e 100644 (file)
--- a/ext/pcre/tests/bug26927.phpt
+++ b/ext/pcre/tests/bug26927.phpt
@@ -8,7 +8,4 @@ Bug #26927 (preg_quote() does not escape \0)
 ?>
 --EXPECT--
 int(1)
-string(6) "a\000b"
---UEXPECT--
-int(1)
 unicode(6) "a\000b"

diff --git a/ext/pcre/tests/bug34790.phpt b/ext/pcre/tests/bug34790.phpt
index c3477026961b8f29ff80f46db38892b2d2415aa7..50c4358bd299be6bbbd5b4470de3fe8a5d7967d5 100755 (executable)
--- a/ext/pcre/tests/bug34790.phpt
+++ b/ext/pcre/tests/bug34790.phpt
@@ -11,17 +11,6 @@ $words = func1();
 var_dump($words);
 ?>
 --EXPECT--
-array(4) {
-  [0]=>
-  string(3) "the"
-  [1]=>
-  string(3) "the"
-  [2]=>
-  string(3) "the"
-  [3]=>
-  string(3) "the"
-}
---UEXPECT--
 array(4) {
   [0]=>
   unicode(3) "the"

diff --git a/ext/pcre/tests/bug37911.phpt b/ext/pcre/tests/bug37911.phpt
index d55bd87afc505de0c51b4130d6daeb8eca5582c1..8a9be95f7354bfbe7bd06ccb8ba556c9a536c0a1 100644 (file)
--- a/ext/pcre/tests/bug37911.phpt
+++ b/ext/pcre/tests/bug37911.phpt
@@ -18,28 +18,6 @@ var_dump(preg_replace_callback('|(?P<1>blub)|', 'callback', 'bla blub blah'));
 
 ?>
 --EXPECTF--
-array(3) {
-  [0]=>
-  string(4) "blub"
-  ["name"]=>
-  string(4) "blub"
-  [1]=>
-  string(4) "blub"
-}
-string(15) "bla blub/4 blah"
-int(1)
-array(3) {
-  [0]=>
-  string(4) "blub"
-  ["name"]=>
-  string(4) "blub"
-  [1]=>
-  string(4) "blub"
-}
-
-Warning: preg_replace_callback(): Numeric named subpatterns are not allowed in %sbug37911.php on line 14
-NULL
---UEXPECTF--
 array(3) {
   [0]=>
   unicode(4) "blub"

diff --git a/ext/pcre/tests/bug40195.phpt b/ext/pcre/tests/bug40195.phpt
index 887761b00d2d73f733be4f8b34f979027a22d496..1c27f5c535ea1bc7b9cacfac2c8c1c269b381748 100644 (file)
--- a/ext/pcre/tests/bug40195.phpt
+++ b/ext/pcre/tests/bug40195.phpt
@@ -12,39 +12,6 @@ var_dump(preg_match('@^(/(?:[a-z]+))+$@', '/a/abcde', $m)); var_dump($m);
 ?>
 --EXPECT--
 int(1)
-array(3) {
-  [0]=>
-  string(7) "//abcde"
-  [1]=>
-  string(6) "/abcde"
-  [2]=>
-  string(5) "abcde"
-}
-int(1)
-array(2) {
-  [0]=>
-  string(7) "//abcde"
-  [1]=>
-  string(6) "/abcde"
-}
-int(1)
-array(3) {
-  [0]=>
-  string(8) "/a/abcde"
-  [1]=>
-  string(6) "/abcde"
-  [2]=>
-  string(5) "abcde"
-}
-int(1)
-array(2) {
-  [0]=>
-  string(8) "/a/abcde"
-  [1]=>
-  string(6) "/abcde"
-}
---UEXPECT--
-int(1)
 array(3) {
   [0]=>
   unicode(7) "//abcde"

diff --git a/ext/pcre/tests/bug40909.phpt b/ext/pcre/tests/bug40909.phpt
index 67132b098f99578a1d73f57572807f4fdcb6bf9e..9b53f1fb43a76aa0ed74ca896ecfaf5e642d872c 100644 (file)
--- a/ext/pcre/tests/bug40909.phpt
+++ b/ext/pcre/tests/bug40909.phpt
@@ -19,25 +19,6 @@ var_dump($match);
 ?>
 --EXPECT--
 int(1)
-array(3) {
-  [0]=>
-  array(1) {
-    [0]=>
-    string(33) " an_attribute="simpleValueInside""
-  }
-  [1]=>
-  array(1) {
-    [0]=>
-    string(12) "an_attribute"
-  }
-  [2]=>
-  array(1) {
-    [0]=>
-    string(19) ""simpleValueInside""
-  }
-}
---UEXPECT--
-int(1)
 array(3) {
   [0]=>
   array(1) {

diff --git a/ext/pcre/tests/bug42298.phpt b/ext/pcre/tests/bug42298.phpt
index d53fd97712e323278dc4175b8d71018413f80492..b6f0c303584cb7c22274c511a05f24964391d03d 100644 (file)
--- a/ext/pcre/tests/bug42298.phpt
+++ b/ext/pcre/tests/bug42298.phpt
@@ -12,39 +12,6 @@ preg_match_all('/\W{2}/u', $str, $m);        var_dump($m);
 
 ?>
 --EXPECT--
-array(1) {
-  [0]=>
-  array(2) {
-    [0]=>
-    string(3) "A£"
-    [1]=>
-    string(2) "BC"
-  }
-}
-array(1) {
-  [0]=>
-  array(2) {
-    [0]=>
-    string(3) "A£"
-    [1]=>
-    string(2) "BC"
-  }
-}
-array(1) {
-  [0]=>
-  array(1) {
-    [0]=>
-    string(4) "€ "
-  }
-}
-array(1) {
-  [0]=>
-  array(1) {
-    [0]=>
-    string(4) "€ "
-  }
-}
---UEXPECT--
 array(1) {
   [0]=>
   array(2) {

diff --git a/ext/pcre/tests/bug42945.phpt b/ext/pcre/tests/bug42945.phpt
index 15a3ed6e9cc0ce3cd7c83c107e10c6d4537c45e2..d1ed1d401ff2f8634fcc54076e65cf94680b1d95 100644 (file)
--- a/ext/pcre/tests/bug42945.phpt
+++ b/ext/pcre/tests/bug42945.phpt
@@ -14,80 +14,6 @@ var_dump(preg_split('/\b/', "a'", -1, PREG_SPLIT_NO_EMPTY|PREG_SPLIT_OFFSET_CAPT
 ?>
 --EXPECT--
 int(2)
-array(1) {
-  [0]=>
-  array(2) {
-    [0]=>
-    array(2) {
-      [0]=>
-      string(0) ""
-      [1]=>
-      int(0)
-    }
-    [1]=>
-    array(2) {
-      [0]=>
-      string(0) ""
-      [1]=>
-      int(1)
-    }
-  }
-}
-array(3) {
-  [0]=>
-  string(0) ""
-  [1]=>
-  string(1) "a"
-  [2]=>
-  string(1) "'"
-}
-array(3) {
-  [0]=>
-  array(2) {
-    [0]=>
-    string(0) ""
-    [1]=>
-    int(0)
-  }
-  [1]=>
-  array(2) {
-    [0]=>
-    string(1) "a"
-    [1]=>
-    int(0)
-  }
-  [2]=>
-  array(2) {
-    [0]=>
-    string(1) "'"
-    [1]=>
-    int(1)
-  }
-}
-array(2) {
-  [0]=>
-  string(1) "a"
-  [1]=>
-  string(1) "'"
-}
-array(2) {
-  [0]=>
-  array(2) {
-    [0]=>
-    string(1) "a"
-    [1]=>
-    int(0)
-  }
-  [1]=>
-  array(2) {
-    [0]=>
-    string(1) "'"
-    [1]=>
-    int(1)
-  }
-}
---UEXPECT--
-int(2)
 array(1) {
   [0]=>
   array(2) {

diff --git a/ext/pcre/tests/bug44214.phpt b/ext/pcre/tests/bug44214.phpt
index d888345b5df4d8669714b535896fc211693376ff..1e8b7ef294a8c70ae0167c5edb00677fd4fd7ebf 100644 (file)
--- a/ext/pcre/tests/bug44214.phpt
+++ b/ext/pcre/tests/bug44214.phpt
@@ -16,20 +16,6 @@ var_dump(preg_replace_callback( '`a+`', 'myCallBack', $string));
 var_dump($array);
 ?>
 --EXPECT--
-string(31) "xxx bbb ccc ddd eee ccc xxx bbb"
-array(2) {
-  [0]=>
-  array(1) {
-    [0]=>
-    string(3) "aaa"
-  }
-  [1]=>
-  array(1) {
-    [0]=>
-    string(3) "aaa"
-  }
-}
---UEXPECT--
 unicode(31) "xxx bbb ccc ddd eee ccc xxx bbb"
 array(2) {
   [0]=>

diff --git a/ext/pcre/tests/bug44214_2.phpt b/ext/pcre/tests/bug44214_2.phpt
index 07c5e7035c8190d23e1c836e5385ad697ad64af1..03ef3bc1cc5e8705e8c73674087c6bddb102d94f 100644 (file)
--- a/ext/pcre/tests/bug44214_2.phpt
+++ b/ext/pcre/tests/bug44214_2.phpt
@@ -16,14 +16,6 @@ var_dump(preg_replace_callback( '`a+`', 'myCallBack', $string));
 var_dump($array);
 ?>
 --EXPECT--
-string(31) "xxx bbb ccc ddd eee ccc xxx bbb"
-array(2) {
-  [0]=>
-  string(3) "aaa"
-  [1]=>
-  string(3) "aaa"
-}
---UEXPECT--
 unicode(31) "xxx bbb ccc ddd eee ccc xxx bbb"
 array(2) {
   [0]=>

diff --git a/ext/pcre/tests/dollar_endonly.phpt b/ext/pcre/tests/dollar_endonly.phpt
index a8cfa5710e80eb973fd80961d2cdfc52a8a3223e..d2d787f68b988ff65fd487c7fbbb14d85e79fba9 100644 (file)
--- a/ext/pcre/tests/dollar_endonly.phpt
+++ b/ext/pcre/tests/dollar_endonly.phpt
@@ -15,30 +15,6 @@ var_dump($m);
 ?>
 --EXPECT--
 int(1)
-array(1) {
-  [0]=>
-  array(1) {
-    [0]=>
-    string(5) "aeiou"
-  }
-}
-int(0)
-array(1) {
-  [0]=>
-  array(0) {
-  }
-}
-int(1)
-array(1) {
-  [0]=>
-  array(1) {
-    [0]=>
-    string(6) "aeiou
-"
-  }
-}
---UEXPECT--
-int(1)
 array(1) {
   [0]=>
   array(1) {

diff --git a/ext/pcre/tests/grep.phpt b/ext/pcre/tests/grep.phpt
index d3fe63131278fe4c1f06358b9f085391b8963431..fe1b1107faad78feff260b4bb51c363687492b91 100644 (file)
--- a/ext/pcre/tests/grep.phpt
+++ b/ext/pcre/tests/grep.phpt
@@ -9,19 +9,6 @@ var_dump(preg_grep('/^(\d|.\d)$/', $array, PREG_GREP_INVERT));
 
 ?>
 --EXPECT--
-array(2) {
-  [1]=>
-  string(1) "1"
-  [2]=>
-  string(2) "q6"
-}
-array(2) {
-  [0]=>
-  string(1) "a"
-  [3]=>
-  string(3) "h20"
-}
---UEXPECT--
 array(2) {
   [1]=>
   unicode(1) "1"

diff --git a/ext/pcre/tests/grep2.phpt b/ext/pcre/tests/grep2.phpt
index 6ea0116a38ace0ba68587c4d6c1155c2c8a6c481..fdb1f126732beb16ae0fdf168a2aa985900bb4ac 100644 (file)
--- a/ext/pcre/tests/grep2.phpt
+++ b/ext/pcre/tests/grep2.phpt
@@ -25,31 +25,6 @@ NULL
 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
-bool(false)
-array(3) {
-  [5]=>
-  string(1) "a"
-  ["xyz"]=>
-  string(2) "q6"
-  [6]=>
-  string(3) "h20"
-}
-array(1) {
-  ["x"]=>
-  string(1) "1"
-}
-bool(true)
-array(0) {
-}
-bool(true)
---UEXPECTF--
-Warning: preg_grep() expects at most 3 parameters, 4 given in %sgrep2.php on line 3
-NULL
-
-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
 bool(false)
 array(3) {

diff --git a/ext/pcre/tests/invalid_utf8_offset.phpt b/ext/pcre/tests/invalid_utf8_offset.phpt
index 4e0d40caf41b222300eb29528fdc8a8f2ee2222f..d2433d0d749fba6dfbbc2c19b72169c8af708d5b 100644 (file)
--- a/ext/pcre/tests/invalid_utf8_offset.phpt
+++ b/ext/pcre/tests/invalid_utf8_offset.phpt
@@ -29,7 +29,7 @@ bool(true)
 int(1)
 array(1) {
   [0]=>
-  string(28) " uma string utf8 bem formada"
+  unicode(28) " uma string utf8 bem formada"
 }
 bool(true)
 Done

diff --git a/ext/pcre/tests/locales.phpt b/ext/pcre/tests/locales.phpt
index f4d650910e1addbdd4474015d350f857fba99613..4abe66c8d4a65d2d45381194883af122f87ac511 100644 (file)
--- a/ext/pcre/tests/locales.phpt
+++ b/ext/pcre/tests/locales.phpt
@@ -22,10 +22,6 @@ var_dump(preg_match('/^\w{6}$/', 'a
 
 ?>
 --EXPECT--
-int(0)
-int(1)
-int(0)
---UEXPECTF--
 Deprecated: setlocale(): deprecated in Unicode mode, please use ICU locale functions in %s on line %d
 int(0)
 

diff --git a/ext/pcre/tests/match_flags.phpt b/ext/pcre/tests/match_flags.phpt
index 27de99853cb498375519e07ff4f434e97de2a9f8..bf28794e7b5a4710450ca47858db5477e607da03 100644 (file)
--- a/ext/pcre/tests/match_flags.phpt
+++ b/ext/pcre/tests/match_flags.phpt
@@ -18,115 +18,6 @@ var_dump($match);
 ?>
 --EXPECT--
 int(2)
-array(2) {
-  [0]=>
-  array(2) {
-    [0]=>
-    string(2) "zx"
-    [1]=>
-    string(2) "ax"
-  }
-  [1]=>
-  array(2) {
-    [0]=>
-    string(1) "z"
-    [1]=>
-    string(1) "a"
-  }
-}
-int(2)
-array(2) {
-  [0]=>
-  array(2) {
-    [0]=>
-    string(2) "zx"
-    [1]=>
-    string(1) "z"
-  }
-  [1]=>
-  array(2) {
-    [0]=>
-    string(2) "yx"
-    [1]=>
-    string(1) "y"
-  }
-}
-int(2)
-array(2) {
-  [0]=>
-  array(2) {
-    [0]=>
-    array(2) {
-      [0]=>
-      string(2) "zx"
-      [1]=>
-      int(0)
-    }
-    [1]=>
-    array(2) {
-      [0]=>
-      string(2) "yx"
-      [1]=>
-      int(2)
-    }
-  }
-  [1]=>
-  array(2) {
-    [0]=>
-    array(2) {
-      [0]=>
-      string(1) "z"
-      [1]=>
-      int(0)
-    }
-    [1]=>
-    array(2) {
-      [0]=>
-      string(1) "y"
-      [1]=>
-      int(2)
-    }
-  }
-}
-int(2)
-array(2) {
-  [0]=>
-  array(2) {
-    [0]=>
-    array(2) {
-      [0]=>
-      string(2) "zx"
-      [1]=>
-      int(0)
-    }
-    [1]=>
-    array(2) {
-      [0]=>
-      string(1) "z"
-      [1]=>
-      int(0)
-    }
-  }
-  [1]=>
-  array(2) {
-    [0]=>
-    array(2) {
-      [0]=>
-      string(2) "yx"
-      [1]=>
-      int(2)
-    }
-    [1]=>
-    array(2) {
-      [0]=>
-      string(1) "y"
-      [1]=>
-      int(2)
-    }
-  }
-}
---UEXPECT--
-int(2)
 array(2) {
   [0]=>
   array(2) {

diff --git a/ext/pcre/tests/match_flags2.phpt b/ext/pcre/tests/match_flags2.phpt
index e84373adfde02b1a6310121406831e0c78f00644..a392bdc01c9c589112d3e56fb321d89198c873af 100644 (file)
--- a/ext/pcre/tests/match_flags2.phpt
+++ b/ext/pcre/tests/match_flags2.phpt
@@ -15,86 +15,6 @@ var_dump($match);
 ?>
 --EXPECT--
 int(1)
-array(2) {
-  [0]=>
-  array(2) {
-    [0]=>
-    string(2) "xa"
-    [1]=>
-    int(4)
-  }
-  [1]=>
-  array(2) {
-    [0]=>
-    string(1) "a"
-    [1]=>
-    int(5)
-  }
-}
-int(1)
-array(2) {
-  [0]=>
-  array(2) {
-    [0]=>
-    string(2) "ax"
-    [1]=>
-    int(5)
-  }
-  [1]=>
-  array(2) {
-    [0]=>
-    string(1) "a"
-    [1]=>
-    int(5)
-  }
-}
-int(1)
-array(6) {
-  [0]=>
-  array(2) {
-    [0]=>
-    string(4) "zxax"
-    [1]=>
-    int(3)
-  }
-  ["capt1"]=>
-  array(2) {
-    [0]=>
-    string(1) "z"
-    [1]=>
-    int(3)
-  }
-  [1]=>
-  array(2) {
-    [0]=>
-    string(1) "z"
-    [1]=>
-    int(3)
-  }
-  [2]=>
-  array(2) {
-    [0]=>
-    string(1) "x"
-    [1]=>
-    int(4)
-  }
-  ["letsmix"]=>
-  array(2) {
-    [0]=>
-    string(2) "ax"
-    [1]=>
-    int(5)
-  }
-  [3]=>
-  array(2) {
-    [0]=>
-    string(2) "ax"
-    [1]=>
-    int(5)
-  }
-}
---UEXPECT--
-int(1)
 array(2) {
   [0]=>
   array(2) {

diff --git a/ext/pcre/tests/match_flags3.phpt b/ext/pcre/tests/match_flags3.phpt
index 5a1eaef299d53cdd95767a847454a93ba8db39fd..3b708607664b15702d4a99813de3644f7b78fa69 100644 (file)
--- a/ext/pcre/tests/match_flags3.phpt
+++ b/ext/pcre/tests/match_flags3.phpt
@@ -18,33 +18,6 @@ var_dump(preg_match('/(?P<3>)/', ''));
 
 ?>
 --EXPECTF--
-
-Warning: preg_match(): Empty regular expression in %smatch_flags3.php on line 3
-bool(false)
-int(1)
-array(1) {
-  [0]=>
-  string(3) "789"
-}
-int(1)
-array(1) {
-  [0]=>
-  string(3) "123"
-}
-int(2)
-array(1) {
-  [0]=>
-  array(2) {
-    [0]=>
-    string(3) "789"
-    [1]=>
-    string(3) "012"
-  }
-}
-
-Warning: preg_match(): Numeric named subpatterns are not allowed in %smatch_flags3.php on line 14
-bool(false)
---UEXPECTF--
 Warning: preg_match(): Empty regular expression in %s on line %d
 bool(false)
 int(1)

diff --git a/ext/pcre/tests/pcre_anchored.phpt b/ext/pcre/tests/pcre_anchored.phpt
index c232a48da1c5100adf1bbaffe37a7613647d93ff..908b1ae972e60401205a959b6cbeac82823471c6 100644 (file)
--- a/ext/pcre/tests/pcre_anchored.phpt
+++ b/ext/pcre/tests/pcre_anchored.phpt
@@ -19,15 +19,6 @@ var_dump(preg_match('/^\P{N}+/A', '123abc'));
 ?>
 --EXPECT--
 int(1)
-array(1) {
-  [0]=>
-  string(3) "abc"
-}
-int(0)
-int(0)
-int(0)
---UEXPECT--
-int(1)
 array(1) {
   [0]=>
   unicode(3) "abc"

diff --git a/ext/pcre/tests/pcre_count.phpt b/ext/pcre/tests/pcre_count.phpt
index 68162c4a66fd2539d583c5470b6d09e2260178e4..60197831e71304af638722226e427a512da21ec3 100644 (file)
--- a/ext/pcre/tests/pcre_count.phpt
+++ b/ext/pcre/tests/pcre_count.phpt
@@ -30,15 +30,6 @@ var_dump(preg_replace($regex, '...', $string, -1));
 var_dump($count);
 ?>
 --EXPECT--
-string(56) "xxxx xxxx 1-a-3-4 1-2-a-4 1-2-3-a a-a-a-a xxxx xxxx-xxxx"
-int(5)
-string(41) "Hxxxx xxxx xxxx xxxx xxxx 42 xxxx 13 xxxx"
-int(7)
-string(25) "... ... ... ... v1c0d1/|/"
-int(4)
-string(25) "... ... ... ... v1c0d1/|/"
-NULL
---UEXPECT--
 unicode(56) "xxxx xxxx 1-a-3-4 1-2-a-4 1-2-3-a a-a-a-a xxxx xxxx-xxxx"
 int(5)
 unicode(41) "Hxxxx xxxx xxxx xxxx xxxx 42 xxxx 13 xxxx"

diff --git a/ext/pcre/tests/pcre_extended.phpt b/ext/pcre/tests/pcre_extended.phpt
index 74fb7f1686ef8db40f1b834dd315ebd63d280d0c..270efd45acae849cd99271523b3d6a909c4d8531 100644 (file)
--- a/ext/pcre/tests/pcre_extended.phpt
+++ b/ext/pcre/tests/pcre_extended.phpt
@@ -18,20 +18,6 @@ int(0)
 array(0) {
 }
 int(1)
-array(1) {
-  [0]=>
-  string(5) "aeiou"
-}
-int(1)
-array(1) {
-  [0]=>
-  string(5) "aeiou"
-}
---UEXPECT--
-int(0)
-array(0) {
-}
-int(1)
 array(1) {
   [0]=>
   unicode(5) "aeiou"

diff --git a/ext/pcre/tests/preg_grep_basic.phpt b/ext/pcre/tests/preg_grep_basic.phpt
index 8383db345923300bf4a5c2daead17444ad02a157..9e7bf8d6b777ebae88e296e0960a299b0f8d10c0 100644 (file)
--- a/ext/pcre/tests/preg_grep_basic.phpt
+++ b/ext/pcre/tests/preg_grep_basic.phpt
@@ -16,52 +16,6 @@ var_dump(preg_grep('@^HTTP(.*?)\w{2,}$@i', $array, PREG_GREP_INVERT)); //same as
 
 ?>
 --EXPECT--
-array(5) {
-  [0]=>
-  string(22) "HTTP://WWW.EXAMPLE.COM"
-  [1]=>
-  string(11) "/index.html"
-  [2]=>
-  string(11) "/info/stat/"
-  [3]=>
-  string(29) "http://test.uk.com/index/html"
-  [4]=>
-  string(17) "/display/dept.php"
-}
-array(2) {
-  [0]=>
-  string(22) "HTTP://WWW.EXAMPLE.COM"
-  [3]=>
-  string(29) "http://test.uk.com/index/html"
-}
-array(5) {
-  [0]=>
-  string(22) "HTTP://WWW.EXAMPLE.COM"
-  [1]=>
-  string(11) "/index.html"
-  [2]=>
-  string(11) "/info/stat/"
-  [3]=>
-  string(29) "http://test.uk.com/index/html"
-  [4]=>
-  string(17) "/display/dept.php"
-}
-array(1) {
-  [3]=>
-  string(29) "http://test.uk.com/index/html"
-}
-array(0) {
-}
-array(3) {
-  [1]=>
-  string(11) "/index.html"
-  [2]=>
-  string(11) "/info/stat/"
-  [4]=>
-  string(17) "/display/dept.php"
-}
-
---UEXPECTF--
 array(5) {
   [0]=>
   unicode(22) "HTTP://WWW.EXAMPLE.COM"
@@ -105,4 +59,4 @@ array(3) {
   unicode(11) "/info/stat/"
   [4]=>
   unicode(17) "/display/dept.php"
-}
\ No newline at end of file
+}

diff --git a/ext/pcre/tests/preg_grep_error1.phpt b/ext/pcre/tests/preg_grep_error1.phpt
index f5229b73cda5072cc0e5ca161b57dd08be3c9887..bd9d1eff80467c3ea9ae857ac983d70f5ddec5e8 100644 (file)
--- a/ext/pcre/tests/preg_grep_error1.phpt
+++ b/ext/pcre/tests/preg_grep_error1.phpt
@@ -55,45 +55,6 @@ Arg value is Array
 Warning: preg_grep() expects parameter 1 to be string (Unicode or binary), array given in %spreg_grep_error1.php on line %d
 NULL
 
-Arg value is /[a-zA-Z]/
-array(2) {
-  [1]=>
-  string(3) "abc"
-  [2]=>
-  string(4) "test"
-}
-
-Warning: preg_grep() expects parameter 1 to be string (Unicode or binary), object given in %spreg_grep_error1.php on line %d
-NULL
-Done
---UEXPECTF--
-*** Testing preg_grep() : error conditions ***
-
-Arg value is abcdef
-
-Warning: preg_grep(): Delimiter must not be alphanumeric or backslash in %spreg_grep_error1.php on line %d
-bool(false)
-
-Arg value is /[a-zA-Z]
-
-Warning: preg_grep(): No ending delimiter '/' found in %spreg_grep_error1.php on line %d
-bool(false)
-
-Arg value is [a-zA-Z]/
-
-Warning: preg_grep(): Unknown modifier '/' in %spreg_grep_error1.php on line %d
-bool(false)
-
-Arg value is /[a-zA-Z]/F
-
-Warning: preg_grep(): Unknown modifier 'F' in %spreg_grep_error1.php on line %d
-bool(false)
-
-Arg value is Array
-
-Warning: preg_grep() expects parameter 1 to be string (Unicode or binary), array given in %spreg_grep_error1.php on line %d
-NULL
-
 Arg value is /[a-zA-Z]/
 array(2) {
   [1]=>
@@ -104,4 +65,4 @@ array(2) {
 
 Warning: preg_grep() expects parameter 1 to be string (Unicode or binary), object given in %spreg_grep_error1.php on line %d
 NULL
-Done
\ No newline at end of file
+Done

diff --git a/ext/pcre/tests/preg_grep_error2.phpt b/ext/pcre/tests/preg_grep_error2.phpt
index b9a239594a957fea50e490b1cc2b422042cd39cc..65bb959f66e25e011e71e24fc75608a4f50384f8 100644 (file)
--- a/ext/pcre/tests/preg_grep_error2.phpt
+++ b/ext/pcre/tests/preg_grep_error2.phpt
@@ -26,25 +26,6 @@ echo "Done";
 
 Arg value is: this is a string
 
-Warning: preg_grep() expects parameter 2 to be array, string given in %spreg_grep_error2.php on line %d
-NULL
-
-Arg value is: Array
-array(2) {
-  [0]=>
-  string(7) "this is"
-  [1]=>
-  string(10) "a subarray"
-}
-
-Warning: preg_grep() expects parameter 2 to be array, object given in %spreg_grep_error2.php on line %d
-NULL
-Done
---UEXPECTF--
-*** Testing preg_grep() : error conditions ***
-
-Arg value is: this is a string
-
 Warning: preg_grep() expects parameter 2 to be array, Unicode string given in %spreg_grep_error2.php on line %d
 NULL
 
@@ -58,4 +39,4 @@ array(2) {
 
 Warning: preg_grep() expects parameter 2 to be array, object given in %spreg_grep_error2.php on line %d
 NULL
-Done
\ No newline at end of file
+Done

diff --git a/ext/pcre/tests/preg_match_all_basic.phpt b/ext/pcre/tests/preg_match_all_basic.phpt
index 154d8a42404d7bd94cbe1bf86790332193841ef0..9059a437c3dc73444df739f7bdb7c17da06fe45b 100644 (file)
--- a/ext/pcre/tests/preg_match_all_basic.phpt
+++ b/ext/pcre/tests/preg_match_all_basic.phpt
@@ -20,69 +20,6 @@ var_dump($match5);
 ?>
 --EXPECTF--
 int(1)
-array(1) {
-  [0]=>
-  array(1) {
-    [0]=>
-    array(2) {
-      [0]=>
-      string(1) "3"
-      [1]=>
-      int(61)
-    }
-  }
-}
-int(2)
-array(2) {
-  [0]=>
-  array(2) {
-    [0]=>
-    string(15) "This is a test."
-    [1]=>
-    string(5) " test"
-  }
-  [1]=>
-  array(2) {
-    [0]=>
-    string(21) "This is another test."
-    [1]=>
-    string(11) "nother test"
-  }
-}
-int(1)
-array(2) {
-  [0]=>
-  array(1) {
-    [0]=>
-    string(21) ". \[4]. 34534 string."
-  }
-  [1]=>
-  array(1) {
-    [0]=>
-    string(17) "[4]. 34534 string"
-  }
-}
-int(0)
-array(1) {
-  [0]=>
-  array(0) {
-  }
-}
-int(0)
-array(3) {
-  [0]=>
-  array(0) {
-  }
-  [1]=>
-  array(0) {
-  }
-  [2]=>
-  array(0) {
-  }
-}
-
---UEXPECTF--
-int(1)
 array(1) {
   [0]=>
   array(1) {
@@ -142,4 +79,4 @@ array(3) {
   [2]=>
   array(0) {
   }
-}
\ No newline at end of file
+}

diff --git a/ext/pcre/tests/preg_match_all_error1.phpt b/ext/pcre/tests/preg_match_all_error1.phpt
index 3cb607baa082db6eb945b36812f610173336d4dd..d32f0b3828bf919b137a73c98b7eddf32b696d39 100644 (file)
--- a/ext/pcre/tests/preg_match_all_error1.phpt
+++ b/ext/pcre/tests/preg_match_all_error1.phpt
@@ -60,59 +60,6 @@ Warning: preg_match_all() expects parameter 1 to be string (Unicode or binary),
 bool(false)
 NULL
 
-Arg value is /[a-zA-Z]/
-int(4)
-array(1) {
-  [0]=>
-  array(4) {
-    [0]=>
-    string(1) "t"
-    [1]=>
-    string(1) "e"
-    [2]=>
-    string(1) "s"
-    [3]=>
-    string(1) "t"
-  }
-}
-
-Warning: preg_match_all() expects parameter 1 to be string (Unicode or binary), object given in %spreg_match_all_error1.php on line %d
-bool(false)
-NULL
-
---UEXPECTF--
-*** Testing preg_match_all() : error conditions ***
-
-Arg value is abcdef
-
-Warning: preg_match_all(): Delimiter must not be alphanumeric or backslash in %spreg_match_all_error1.php on line %d
-bool(false)
-NULL
-
-Arg value is /[a-zA-Z]
-
-Warning: preg_match_all(): No ending delimiter '/' found in %spreg_match_all_error1.php on line %d
-bool(false)
-NULL
-
-Arg value is [a-zA-Z]/
-
-Warning: preg_match_all(): Unknown modifier '/' in %spreg_match_all_error1.php on line %d
-bool(false)
-NULL
-
-Arg value is /[a-zA-Z]/F
-
-Warning: preg_match_all(): Unknown modifier 'F' in %spreg_match_all_error1.php on line %d
-bool(false)
-NULL
-
-Arg value is Array
-
-Warning: preg_match_all() expects parameter 1 to be string (Unicode or binary), array given in %spreg_match_all_error1.php on line %d
-bool(false)
-NULL
-
 Arg value is /[a-zA-Z]/
 int(4)
 array(1) {
@@ -131,4 +78,4 @@ array(1) {
 
 Warning: preg_match_all() expects parameter 1 to be string (Unicode or binary), object given in %spreg_match_all_error1.php on line %d
 bool(false)
-NULL
\ No newline at end of file
+NULL

diff --git a/ext/pcre/tests/preg_match_all_error2.phpt b/ext/pcre/tests/preg_match_all_error2.phpt
index c9d2c89f48df19306be2aa58d7ffdb72dacfb501..1d12a85a96085e188c0378e3914780208d5ef121 100644 (file)
--- a/ext/pcre/tests/preg_match_all_error2.phpt
+++ b/ext/pcre/tests/preg_match_all_error2.phpt
@@ -36,36 +36,6 @@ Warning: preg_match_all() expects parameter 2 to be string (Unicode or binary),
 bool(false)
 NULL
 
-Arg value is: test
-int(4)
-array(1) {
-  [0]=>
-  array(4) {
-    [0]=>
-    string(1) "t"
-    [1]=>
-    string(1) "e"
-    [2]=>
-    string(1) "s"
-    [3]=>
-    string(1) "t"
-  }
-}
-Done
-
---UEXPECTF--
-*** Testing preg_match_all() : error conditions ***
-
-Warning: preg_match_all() expects parameter 2 to be string (Unicode or binary), object given in %spreg_match_all_error2.php on line %d
-bool(false)
-NULL
-
-Arg value is: Array
-
-Warning: preg_match_all() expects parameter 2 to be string (Unicode or binary), array given in %spreg_match_all_error2.php on line %d
-bool(false)
-NULL
-
 Arg value is: test
 int(4)
 array(1) {
@@ -81,4 +51,4 @@ array(1) {
     unicode(1) "t"
   }
 }
-Done
\ No newline at end of file
+Done

diff --git a/ext/pcre/tests/preg_match_basic.phpt b/ext/pcre/tests/preg_match_basic.phpt
index 470663c2e8c09d500429373aae109761466178ef..5770f7de043dab070bc7fa1ed3f55dc63741b592 100644 (file)
--- a/ext/pcre/tests/preg_match_basic.phpt
+++ b/ext/pcre/tests/preg_match_basic.phpt
@@ -21,37 +21,6 @@ var_dump($match5);
 
 --EXPECTF--
 
-int(1)
-array(1) {
-  [0]=>
-  string(7) "Hello, "
-}
-int(0)
-array(0) {
-}
-int(1)
-array(2) {
-  [0]=>
-  string(23) "[*], this is \ a string"
-  [1]=>
-  string(18) "this is \ a string"
-}
-int(1)
-array(1) {
-  [0]=>
-  array(2) {
-    [0]=>
-    string(18) "this is \ a string"
-    [1]=>
-    int(19)
-  }
-}
-int(0)
-array(0) {
-}
-
-
---UEXPECTF--
 int(1)
 array(1) {
   [0]=>
@@ -79,4 +48,4 @@ array(1) {
 }
 int(0)
 array(0) {
-}
\ No newline at end of file
+}

diff --git a/ext/pcre/tests/preg_quote_basic.phpt b/ext/pcre/tests/preg_quote_basic.phpt
index 2b9be8962c5d1904227f166e924fe44bab124dbf..8349a508684c3b3754c5bdedcaf99c20f93583dc 100644 (file)
--- a/ext/pcre/tests/preg_quote_basic.phpt
+++ b/ext/pcre/tests/preg_quote_basic.phpt
@@ -15,19 +15,10 @@ var_dump(preg_match('/^[tT]\w{6} - ' . preg_quote($string_before, '/') . ' [a-z]
 var_dump($matches1);
 ?>
 --EXPECT--
-
-$string_before looks like: /this *-has \ metacharacters^ in $
-$string_after looks like: \/this \*-has \\ metacharacters\^ in \$, with metacharacters and / (set as delimiter) escaped
-int(1)
-array(1) {
-  [0]=>
-  string(58) "testing - /this *-has \ metacharacters^ in $ should   work"
-}
---UEXPECTF--
 $string_before looks like: /this *-has \ metacharacters^ in $
 $string_after looks like: \/this \*-has \\ metacharacters\^ in \$, with metacharacters and / (set as delimiter) escaped
 int(1)
 array(1) {
   [0]=>
   unicode(58) "testing - /this *-has \ metacharacters^ in $ should   work"
-}
\ No newline at end of file
+}

diff --git a/ext/pcre/tests/preg_quote_error1.phpt b/ext/pcre/tests/preg_quote_error1.phpt
index 929fe3fa47f6c75d9c333bfc5716ca295d6570d6..5a43009340941531acb95bb997d1d7a38e338703 100644 (file)
--- a/ext/pcre/tests/preg_quote_error1.phpt
+++ b/ext/pcre/tests/preg_quote_error1.phpt
@@ -23,20 +23,6 @@ echo "Done";
 --EXPECTF--
 *** Testing preg_quote() : error conditions ***
 
-Arg value is: this is a string
-string(16) "this is a string"
-
-Arg value is: Array
-
-Warning: preg_quote() expects parameter 1 to be string, array given in %spreg_quote_error1.php on line %d
-NULL
-
-Warning: preg_quote() expects parameter 1 to be string, object given in %spreg_quote_error1.php on line %d
-NULL
-Done
---UEXPECTF--
-*** Testing preg_quote() : error conditions ***
-
 Arg value is: this is a string
 unicode(16) "this is a string"
 
@@ -47,4 +33,4 @@ NULL
 
 Warning: preg_quote() expects parameter 1 to be binary string, object given in %spreg_quote_error1.php on line %d
 NULL
-Done
\ No newline at end of file
+Done

diff --git a/ext/pcre/tests/preg_replace.phpt b/ext/pcre/tests/preg_replace.phpt
index eac46c0f4b3d6f93734c1e1ccc2ab86a9e49aed3..df2fc6a10e933fd8b4dc8b3812f872e71fbd78a5 100644 (file)
--- a/ext/pcre/tests/preg_replace.phpt
+++ b/ext/pcre/tests/preg_replace.phpt
@@ -14,16 +14,6 @@ var_dump(preg_replace_callback('//e', 'strtolower', ''));
 
 ?>
 --EXPECTF--
-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
-string(0) ""
-
-Warning: preg_replace_callback(): Modifier /e cannot be used with replacement callback in %spreg_replace.php on line 10
-NULL
---UEXPECTF--
 unicode(1) "x"
 unicode(4) "abcd"
 unicode(8) "zaab2k3l"

diff --git a/ext/pcre/tests/preg_replace2.phpt b/ext/pcre/tests/preg_replace2.phpt
index f3441b91f8b5d447e1944a56377fdfeac8d8e15c..ff4c2537f2b65cef06e1edeeebb305f896af541f 100644 (file)
--- a/ext/pcre/tests/preg_replace2.phpt
+++ b/ext/pcre/tests/preg_replace2.phpt
@@ -22,31 +22,6 @@ echo "==done==\n";
 
 ?>
 --EXPECTF--
-Warning: preg_replace(): Parameter mismatch, pattern is a string while replacement is an array in %spreg_replace2.php on line 3
-bool(false)
-string(1) "c"
-array(3) {
-  [0]=>
-  string(1) "x"
-  [1]=>
-  string(2) "aA"
-  [2]=>
-  string(2) "vb"
-}
-array(2) {
-  [0]=>
-  string(1) "$"
-  [1]=>
-  string(1) "$"
-}
-array(2) {
-  [0]=>
-  string(3) "x$y"
-  [1]=>
-  string(1) "$"
-}
-==done==
---UEXPECTF--
 Warning: preg_replace(): Parameter mismatch, pattern is a string while replacement is an array in %s on line %d
 bool(false)
 unicode(1) "c"

diff --git a/ext/pcre/tests/preg_replace_basic.phpt b/ext/pcre/tests/preg_replace_basic.phpt
index cc7f55d23dee567aa418dd696671b8bed1a9d754..0758b26e36067706443eb2c8334c8ea04a2ec1a6 100644 (file)
--- a/ext/pcre/tests/preg_replace_basic.phpt
+++ b/ext/pcre/tests/preg_replace_basic.phpt
@@ -17,17 +17,9 @@ var_dump(preg_replace('<(^[a-z]\w+)@(\w+)\.(\w+)\.([a-z]{2,}$)>', '\\1 at \\2 do
 ?>
 --EXPECT--
 
-string(54) "123456789 - Hello, world -           This is a string."
-string(54) "123456789 - Hello, world -           This is a string."
-string(54) "444444444 - Hello, world -           This is a string."
-string(56) "123456789 - Bonjour, world -           This is a string."
-string(42) "123456789. Hello, world. This is a string."
-string(30) "josmessa at uk dot ibm dot com"
-
---UEXPECTF--
 unicode(54) "123456789 - Hello, world -           This is a string."
 unicode(54) "123456789 - Hello, world -           This is a string."
 unicode(54) "444444444 - Hello, world -           This is a string."
 unicode(56) "123456789 - Bonjour, world -           This is a string."
 unicode(42) "123456789. Hello, world. This is a string."
-unicode(30) "josmessa at uk dot ibm dot com"
\ No newline at end of file
+unicode(30) "josmessa at uk dot ibm dot com"

diff --git a/ext/pcre/tests/preg_replace_callback2.phpt b/ext/pcre/tests/preg_replace_callback2.phpt
index e46aa556d0b336902a6f11694f1a48075b1eba05..f8d9ba0a7c9d6593c12cd08ff70378d07436bf0a 100644 (file)
--- a/ext/pcre/tests/preg_replace_callback2.phpt
+++ b/ext/pcre/tests/preg_replace_callback2.phpt
@@ -22,22 +22,6 @@ var_dump(preg_replace_callback('~\A.~', 'g', array(array('xyz'))));
 var_dump(preg_replace_callback('~\A.~', create_function('$m', 'return strtolower($m[0]);'), 'ABC'));
 ?>
 --EXPECTF--
-array(3) {
-  [0]=>
-  string(12) "'a' 'b3' bcd"
-  ["v"]=>
-  string(6) "aksfjk"
-  [12]=>
-  string(9) "'aa' 'bb'"
-}
-
-Notice: Array to string conversion in %spreg_replace_callback2.php on line 17
-array(1) {
-  [0]=>
-  string(7) "'A'rray"
-}
-string(3) "aBC"
---UEXPECTF--
 array(3) {
   [0]=>
   unicode(12) "'a' 'b3' bcd"

diff --git a/ext/pcre/tests/preg_replace_callback3.phpt b/ext/pcre/tests/preg_replace_callback3.phpt
index 9e1a0c595ea94dca487f95a5e7e96e522c27c1b9..c250bda0b6b9ac868c04d68af1e6301aeed860b2 100644 (file)
--- a/ext/pcre/tests/preg_replace_callback3.phpt
+++ b/ext/pcre/tests/preg_replace_callback3.phpt
@@ -36,31 +36,6 @@ int(3)
 Warning: preg_replace_callback(): Requires argument 2, '2', to be a valid callback in %s on line %d
 int(3)
 
-Warning: preg_replace_callback() expects parameter 4 to be long, string given in %s on line %d
-NULL
-
-Warning: preg_replace_callback() expects parameter 4 to be long, array given in %s on line %d
-NULL
-Done
---UEXPECTF--
-Warning: preg_replace_callback() expects at least 3 parameters, 0 given in %s on line %d
-NULL
-
-Warning: preg_replace_callback() expects at least 3 parameters, 1 given in %s on line %d
-NULL
-
-Warning: preg_replace_callback() expects at least 3 parameters, 2 given in %s on line %d
-NULL
-
-Warning: preg_replace_callback(): Requires argument 2, '2', to be a valid callback in %s on line %d
-int(3)
-
-Warning: preg_replace_callback(): Requires argument 2, '2', to be a valid callback in %s on line %d
-int(3)
-
-Warning: preg_replace_callback(): Requires argument 2, '2', to be a valid callback in %s on line %d
-int(3)
-
 Warning: preg_replace_callback() expects parameter 4 to be long, Unicode string given in %s on line %d
 NULL
 

diff --git a/ext/pcre/tests/preg_replace_callback_error.phpt b/ext/pcre/tests/preg_replace_callback_error.phpt
index b6ed1d1a958c0e716f58d5d42ea1fb4ca3ea0aa5..a924702ccd78183ecf4e4c8921cde6997d92186d 100644 (file)
--- a/ext/pcre/tests/preg_replace_callback_error.phpt
+++ b/ext/pcre/tests/preg_replace_callback_error.phpt
@@ -46,21 +46,3 @@ NULL
 Warning: preg_replace_callback() expects at least 3 parameters, 2 given in %spreg_replace_callback_error.php on line %d
 NULL
 Done
---UEXPECTF--
-***Testing preg_replace_callback() : error conditions***
-
--- Testing preg_replace_callback() function with Zero arguments --
-
-Warning: preg_replace_callback() expects at least 3 parameters, 0 given in %spreg_replace_callback_error.php on line %d
-NULL
-
--- Testing preg_replace_callback() function with more than expected no. of arguments --
-
-Warning: preg_replace_callback() expects at most 5 parameters, 6 given in %spreg_replace_callback_error.php on line %d
-NULL
-
--- Testing preg_replace_callback() function with less than expected no. of arguments --
-
-Warning: preg_replace_callback() expects at least 3 parameters, 2 given in %spreg_replace_callback_error.php on line %d
-NULL
-Done

diff --git a/ext/pcre/tests/preg_replace_error.phpt b/ext/pcre/tests/preg_replace_error.phpt
index 2ef6c0d26fc7e385b957e2343a8298b54d0725ca..523e44fe00935d95449b978ccc84e09c161b8341 100644 (file)
--- a/ext/pcre/tests/preg_replace_error.phpt
+++ b/ext/pcre/tests/preg_replace_error.phpt
@@ -43,21 +43,3 @@ NULL
 Warning: preg_replace() expects at least 3 parameters, 2 given in %spreg_replace_error.php on line %d
 NULL
 Done
---UEXPECTF--
-*** Testing preg_replace() : error conditions ***
-
--- Testing preg_replace() function with zero arguments --
-
-Warning: preg_replace() expects at least 3 parameters, 0 given in %spreg_replace_error.php on line %d
-NULL
-
--- Testing preg_replace() function with more than expected no. of arguments --
-
-Warning: preg_replace() expects at most 5 parameters, 6 given in %spreg_replace_error.php on line %d
-NULL
-
--- Testing preg_replace() function with less than expected no. of arguments --
-
-Warning: preg_replace() expects at least 3 parameters, 2 given in %spreg_replace_error.php on line %d
-NULL
-Done

diff --git a/ext/pcre/tests/preg_replace_error1.phpt b/ext/pcre/tests/preg_replace_error1.phpt
index 0e1db5e61f4d9517fbb8306c6091af0c5030b78b..bcc8e83f43eda1c836242c799b7f78a38447d9ed 100644 (file)
--- a/ext/pcre/tests/preg_replace_error1.phpt
+++ b/ext/pcre/tests/preg_replace_error1.phpt
@@ -49,42 +49,10 @@ Arg value is /[a-zA-Z]/F
 Warning: preg_replace(): Unknown modifier 'F' in %spreg_replace_error1.php on line %d
 NULL
 
-Arg value is Array
-string(1) "a"
-
-Arg value is /[a-zA-Z]/
-string(1) "1"
-
-Catchable fatal error: Object of class stdClass could not be converted to string in %spreg_replace_error1.php on line %d
-
-
---UEXPECTF--
-*** Testing preg_replace() : error conditions***
-
-Arg value is abcdef
-
-Warning: preg_replace(): Delimiter must not be alphanumeric or backslash in %spreg_replace_error1.php on line %d
-NULL
-
-Arg value is /[a-zA-Z]
-
-Warning: preg_replace(): No ending delimiter '/' found in %spreg_replace_error1.php on line %d
-NULL
-
-Arg value is [a-zA-Z]/
-
-Warning: preg_replace(): Unknown modifier '/' in %spreg_replace_error1.php on line %d
-NULL
-
-Arg value is /[a-zA-Z]/F
-
-Warning: preg_replace(): Unknown modifier 'F' in %spreg_replace_error1.php on line %d
-NULL
-
 Arg value is Array
 unicode(1) "a"
 
 Arg value is /[a-zA-Z]/
 unicode(1) "1"
 
-Catchable fatal error: Object of class stdClass could not be converted to binary string in %spreg_replace_error1.php on line %d
\ No newline at end of file
+Catchable fatal error: Object of class stdClass could not be converted to binary string in %spreg_replace_error1.php on line %d

diff --git a/ext/pcre/tests/preg_replace_error2.phpt b/ext/pcre/tests/preg_replace_error2.phpt
index 739d8a93b7d4b789e426eb4af5a4f89ac7403ebe..d37669d09a308eb2ad7fa3f2024b80a03f74385d 100644 (file)
--- a/ext/pcre/tests/preg_replace_error2.phpt
+++ b/ext/pcre/tests/preg_replace_error2.phpt
@@ -25,20 +25,6 @@ echo "Done";
 --EXPECTF--
 *** Testing preg_replace() : error conditions ***
 
-Arg value is: this is a string
-string(64) "this is a stringthis is a stringthis is a stringthis is a string"
-
-Arg value is: Array
-
-Warning: preg_replace(): Parameter mismatch, pattern is a string while replacement is an array in %spreg_replace_error2.php on line %d
-bool(false)
-
-Catchable fatal error: Object of class stdClass could not be converted to string in %spreg_replace_error2.php on line %d
-
-
---UEXPECTF--
-*** Testing preg_replace() : error conditions ***
-
 Arg value is: this is a string
 unicode(64) "this is a stringthis is a stringthis is a stringthis is a string"
 
@@ -47,4 +33,4 @@ Arg value is: Array
 Warning: preg_replace(): Parameter mismatch, pattern is a string while replacement is an array in %spreg_replace_error2.php on line %d
 bool(false)
 
-Catchable fatal error: Object of class stdClass could not be converted to binary string in %spreg_replace_error2.php on line %d
\ No newline at end of file
+Catchable fatal error: Object of class stdClass could not be converted to binary string in %spreg_replace_error2.php on line %d

diff --git a/ext/pcre/tests/preg_split_basic.phpt b/ext/pcre/tests/preg_split_basic.phpt
index 75f5beeddcf6ebeb7b6c81a97a437fa567d5fcd8..5470f91e1e2d77313a7088194d184439a9c9b55f 100644 (file)
--- a/ext/pcre/tests/preg_split_basic.phpt
+++ b/ext/pcre/tests/preg_split_basic.phpt
@@ -16,65 +16,6 @@ var_dump(preg_split('/\w/', $string, -1, PREG_SPLIT_NO_EMPTY)); //every characte
 
 ?>
 --EXPECT--
-array(7) {
-  [0]=>
-  string(14) "this is a_list"
-  [1]=>
-  string(7) " value1"
-  [2]=>
-  string(7) " Test__"
-  [3]=>
-  string(7) " string"
-  [4]=>
-  string(6) " Hello"
-  [5]=>
-  string(8) " world!_"
-  [6]=>
-  string(11) "parentheses"
-}
-array(2) {
-  [0]=>
-  string(14) "this is a_list"
-  [1]=>
-  string(28) " Hello, world!_(parentheses)"
-}
-array(4) {
-  [0]=>
-  string(54) "this is a_list: value1, Test__, string; Hello, world!_"
-  [1]=>
-  string(1) "("
-  [2]=>
-  string(11) "parentheses"
-  [3]=>
-  string(1) ")"
-}
-array(1) {
-  [0]=>
-  string(67) "this is a_list: value1, Test__, string; Hello, world!_(parentheses)"
-}
-array(10) {
-  [0]=>
-  string(1) " "
-  [1]=>
-  string(1) " "
-  [2]=>
-  string(2) ": "
-  [3]=>
-  string(2) ", "
-  [4]=>
-  string(2) ", "
-  [5]=>
-  string(2) "; "
-  [6]=>
-  string(2) ", "
-  [7]=>
-  string(1) "!"
-  [8]=>
-  string(1) "("
-  [9]=>
-  string(1) ")"
-}
---UEXPECTF--
 array(7) {
   [0]=>
   unicode(14) "this is a_list"
@@ -132,4 +73,4 @@ array(10) {
   unicode(1) "("
   [9]=>
   unicode(1) ")"
-}
\ No newline at end of file
+}

diff --git a/ext/pcre/tests/preg_split_error1.phpt b/ext/pcre/tests/preg_split_error1.phpt
index 94c4ee522e5a692cc63902ce9f2c087a2a324d15..8ad62ecbc396752aafde2405321ea6eb15d2b588 100644 (file)
--- a/ext/pcre/tests/preg_split_error1.phpt
+++ b/ext/pcre/tests/preg_split_error1.phpt
@@ -53,46 +53,6 @@ Arg value is Array
 Warning: preg_split() expects parameter 1 to be string (Unicode or binary), array given in %spreg_split_error1.php on line %d
 bool(false)
 
-Arg value is /[a-zA-Z]/
-array(3) {
-  [0]=>
-  string(4) "1 2 "
-  [1]=>
-  string(5) " 3 4 "
-  [2]=>
-  string(4) " 5 6"
-}
-
-Warning: preg_split() expects parameter 1 to be string (Unicode or binary), object given in %spreg_split_error1.php on line %d
-bool(false)
---UEXPECTF--
-*** Testing preg_split() : error conditions ***
-
-Arg value is abcdef
-
-Warning: preg_split(): Delimiter must not be alphanumeric or backslash in %spreg_split_error1.php on line %d
-bool(false)
-
-Arg value is /[a-zA-Z]
-
-Warning: preg_split(): No ending delimiter '/' found in %spreg_split_error1.php on line %d
-bool(false)
-
-Arg value is [a-zA-Z]/
-
-Warning: preg_split(): Unknown modifier '/' in %spreg_split_error1.php on line %d
-bool(false)
-
-Arg value is /[a-zA-Z]/F
-
-Warning: preg_split(): Unknown modifier 'F' in %spreg_split_error1.php on line %d
-bool(false)
-
-Arg value is Array
-
-Warning: preg_split() expects parameter 1 to be string (Unicode or binary), array given in %spreg_split_error1.php on line %d
-bool(false)
-
 Arg value is /[a-zA-Z]/
 array(3) {
   [0]=>

diff --git a/ext/pcre/tests/preg_split_error2.phpt b/ext/pcre/tests/preg_split_error2.phpt
index d4e7f1bf6475f9882c8f2f04ca433bd6136dc3c2..7e3cfc527778ce62ca5f162e6e00ae1ec068042a 100644 (file)
--- a/ext/pcre/tests/preg_split_error2.phpt
+++ b/ext/pcre/tests/preg_split_error2.phpt
@@ -32,14 +32,3 @@ bool(false)
 Warning: preg_split() expects parameter 2 to be string (Unicode or binary), object given in %spreg_split_error2.php on line %d
 bool(false)
 Done
---UEXPECTF--
-*** Testing preg_split() : error conditions ***
-
-Arg value is: Array
-
-Warning: preg_split() expects parameter 2 to be string (Unicode or binary), array given in %spreg_split_error2.php on line %d
-bool(false)
-
-Warning: preg_split() expects parameter 2 to be string (Unicode or binary), object given in %spreg_split_error2.php on line %d
-bool(false)
-Done

diff --git a/ext/pcre/tests/split.phpt b/ext/pcre/tests/split.phpt
index a2a024fc40643a7a18634024101fb1e42c5878a2..b862dafb15b99aaf2515aaed12a5f8fb34ee8ea2 100644 (file)
--- a/ext/pcre/tests/split.phpt
+++ b/ext/pcre/tests/split.phpt
@@ -17,74 +17,6 @@ var_dump(preg_split('/\d*/', 'ab2c3u', -1, PREG_SPLIT_NO_EMPTY));
 
 ?>
 --EXPECTF--
-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)
-array(3) {
-  [0]=>
-  string(1) "x"
-  [1]=>
-  string(2) "yy"
-  [2]=>
-  string(3) "zzz"
-}
-array(3) {
-  [0]=>
-  string(1) "x"
-  [1]=>
-  string(2) "yy"
-  [2]=>
-  string(3) "zzz"
-}
-array(3) {
-  [0]=>
-  string(1) "x"
-  [1]=>
-  string(2) "yy"
-  [2]=>
-  string(3) "zzz"
-}
-array(1) {
-  [0]=>
-  string(8) "x yy,zzz"
-}
-array(2) {
-  [0]=>
-  string(1) "x"
-  [1]=>
-  string(6) "yy,zzz"
-}
-array(8) {
-  [0]=>
-  string(0) ""
-  [1]=>
-  string(1) "a"
-  [2]=>
-  string(1) "b"
-  [3]=>
-  string(0) ""
-  [4]=>
-  string(1) "c"
-  [5]=>
-  string(0) ""
-  [6]=>
-  string(1) "u"
-  [7]=>
-  string(0) ""
-}
-array(4) {
-  [0]=>
-  string(1) "a"
-  [1]=>
-  string(1) "b"
-  [2]=>
-  string(1) "c"
-  [3]=>
-  string(1) "u"
-}
---UEXPECTF--
 Warning: preg_split() expects at least 2 parameters, 0 given in %s on line %d
 bool(false)
 

diff --git a/ext/pcre/tests/split2.phpt b/ext/pcre/tests/split2.phpt
index d57e20cd69954178b3c42aef1ee6ef66f25f1dd2..e87be7cbaa6b62fc609f88fd54f8c45ef83ce0bc 100644 (file)
--- a/ext/pcre/tests/split2.phpt
+++ b/ext/pcre/tests/split2.phpt
@@ -19,301 +19,6 @@ var_dump(preg_last_error() == PREG_RECURSION_LIMIT_ERROR);
 
 ?>
 --EXPECTF--
-array(15) {
-  [0]=>
-  string(0) ""
-  [1]=>
-  string(0) ""
-  [2]=>
-  string(1) "a"
-  [3]=>
-  string(0) ""
-  [4]=>
-  string(1) "b"
-  [5]=>
-  string(1) "2"
-  [6]=>
-  string(0) ""
-  [7]=>
-  string(0) ""
-  [8]=>
-  string(1) "c"
-  [9]=>
-  string(1) "3"
-  [10]=>
-  string(0) ""
-  [11]=>
-  string(0) ""
-  [12]=>
-  string(1) "u"
-  [13]=>
-  string(0) ""
-  [14]=>
-  string(0) ""
-}
-array(8) {
-  [0]=>
-  array(2) {
-    [0]=>
-    string(0) ""
-    [1]=>
-    int(0)
-  }
-  [1]=>
-  array(2) {
-    [0]=>
-    string(1) "a"
-    [1]=>
-    int(0)
-  }
-  [2]=>
-  array(2) {
-    [0]=>
-    string(1) "b"
-    [1]=>
-    int(1)
-  }
-  [3]=>
-  array(2) {
-    [0]=>
-    string(0) ""
-    [1]=>
-    int(3)
-  }
-  [4]=>
-  array(2) {
-    [0]=>
-    string(1) "c"
-    [1]=>
-    int(3)
-  }
-  [5]=>
-  array(2) {
-    [0]=>
-    string(0) ""
-    [1]=>
-    int(5)
-  }
-  [6]=>
-  array(2) {
-    [0]=>
-    string(1) "u"
-    [1]=>
-    int(5)
-  }
-  [7]=>
-  array(2) {
-    [0]=>
-    string(0) ""
-    [1]=>
-    int(6)
-  }
-}
-array(6) {
-  [0]=>
-  string(1) "a"
-  [1]=>
-  string(1) "b"
-  [2]=>
-  string(1) "2"
-  [3]=>
-  string(1) "c"
-  [4]=>
-  string(1) "3"
-  [5]=>
-  string(1) "u"
-}
-array(4) {
-  [0]=>
-  array(2) {
-    [0]=>
-    string(1) "a"
-    [1]=>
-    int(0)
-  }
-  [1]=>
-  array(2) {
-    [0]=>
-    string(1) "b"
-    [1]=>
-    int(1)
-  }
-  [2]=>
-  array(2) {
-    [0]=>
-    string(1) "c"
-    [1]=>
-    int(3)
-  }
-  [3]=>
-  array(2) {
-    [0]=>
-    string(1) "u"
-    [1]=>
-    int(5)
-  }
-}
-array(15) {
-  [0]=>
-  array(2) {
-    [0]=>
-    string(0) ""
-    [1]=>
-    int(0)
-  }
-  [1]=>
-  array(2) {
-    [0]=>
-    string(0) ""
-    [1]=>
-    int(0)
-  }
-  [2]=>
-  array(2) {
-    [0]=>
-    string(1) "a"
-    [1]=>
-    int(0)
-  }
-  [3]=>
-  array(2) {
-    [0]=>
-    string(0) ""
-    [1]=>
-    int(1)
-  }
-  [4]=>
-  array(2) {
-    [0]=>
-    string(1) "b"
-    [1]=>
-    int(1)
-  }
-  [5]=>
-  array(2) {
-    [0]=>
-    string(1) "2"
-    [1]=>
-    int(2)
-  }
-  [6]=>
-  array(2) {
-    [0]=>
-    string(0) ""
-    [1]=>
-    int(3)
-  }
-  [7]=>
-  array(2) {
-    [0]=>
-    string(0) ""
-    [1]=>
-    int(3)
-  }
-  [8]=>
-  array(2) {
-    [0]=>
-    string(1) "c"
-    [1]=>
-    int(3)
-  }
-  [9]=>
-  array(2) {
-    [0]=>
-    string(1) "3"
-    [1]=>
-    int(4)
-  }
-  [10]=>
-  array(2) {
-    [0]=>
-    string(0) ""
-    [1]=>
-    int(5)
-  }
-  [11]=>
-  array(2) {
-    [0]=>
-    string(0) ""
-    [1]=>
-    int(5)
-  }
-  [12]=>
-  array(2) {
-    [0]=>
-    string(1) "u"
-    [1]=>
-    int(5)
-  }
-  [13]=>
-  array(2) {
-    [0]=>
-    string(0) ""
-    [1]=>
-    int(6)
-  }
-  [14]=>
-  array(2) {
-    [0]=>
-    string(0) ""
-    [1]=>
-    int(6)
-  }
-}
-array(6) {
-  [0]=>
-  array(2) {
-    [0]=>
-    string(1) "a"
-    [1]=>
-    int(0)
-  }
-  [1]=>
-  array(2) {
-    [0]=>
-    string(1) "b"
-    [1]=>
-    int(1)
-  }
-  [2]=>
-  array(2) {
-    [0]=>
-    string(1) "2"
-    [1]=>
-    int(2)
-  }
-  [3]=>
-  array(2) {
-    [0]=>
-    string(1) "c"
-    [1]=>
-    int(3)
-  }
-  [4]=>
-  array(2) {
-    [0]=>
-    string(1) "3"
-    [1]=>
-    int(4)
-  }
-  [5]=>
-  array(2) {
-    [0]=>
-    string(1) "u"
-    [1]=>
-    int(5)
-  }
-}
-
-Warning: preg_last_error() expects exactly 0 parameters, 1 given in %s on line %d
-NULL
-bool(true)
-array(1) {
-  [0]=>
-  string(6) "ab2c3u"
-}
-bool(true)
---UEXPECTF--
 array(15) {
   [0]=>
   unicode(0) ""

diff --git a/ext/pcre/tests/study.phpt b/ext/pcre/tests/study.phpt
index e3a69922e7807a459be1eba9dc533fd65c48566f..29007c80c5dfac21e2a3055912e425404fa33e37 100644 (file)
--- a/ext/pcre/tests/study.phpt
+++ b/ext/pcre/tests/study.phpt
@@ -20,17 +20,6 @@ var_dump($dump[0]);
 ?>
 --EXPECT--
 int(1)
-string(1) "a"
-int(1)
-string(1) "a"
-int(1)
-string(1) "i"
-int(1)
-string(5) "aeiou"
-int(1)
-string(5) "aeiou"
---UEXPECT--
-int(1)
 unicode(1) "a"
 int(1)
 unicode(1) "a"

diff --git a/ext/pcre/tests/ungreedy.phpt b/ext/pcre/tests/ungreedy.phpt
index 9282aac6dec64ce8f4bdb2c58f81490dac7db64e..bf491b59de429b506ad1e62b9ba41cef61f9b1fe 100644 (file)
--- a/ext/pcre/tests/ungreedy.phpt
+++ b/ext/pcre/tests/ungreedy.phpt
@@ -15,22 +15,6 @@ var_dump($m);
 ?>
 --EXPECT--
 int(1)
-array(1) {
-  [0]=>
-  string(14) "<aa> <bb> <cc>"
-}
-int(1)
-array(1) {
-  [0]=>
-  string(4) "<aa>"
-}
-int(1)
-array(1) {
-  [0]=>
-  string(4) "<aa>"
-}
---UEXPECT--
-int(1)
 array(1) {
   [0]=>
   unicode(14) "<aa> <bb> <cc>"