cvs: php-src /ext/openssl/tests 002.phpt 003.phpt 005.phpt bug28382.phpt bug38255.phpt bug38261.phpt /ext/pcre/tests 001.phpt 002.phpt 003.phpt
004.phpt 006.phpt bug20528.phpt bug21732.phpt bug21758.phpt bug26927.phpt bug34790.phpt bug37911.phpt bug40195.phpt bug40909.phpt bug42298.phpt
bug42945.phpt bug44214.phpt bug44214_2.phpt dollar_endonly.phpt grep.phpt grep2.phpt invalid_utf8_offset.phpt locales.phpt match_flags.phpt
match_flags2.phpt match_flags3.phpt pcre_anchored.phpt pcre_count.phpt pcre_extended.phpt preg_grep_basic.phpt preg_grep_error1.phpt
preg_grep_error2.phpt preg_match_all_basic.phpt preg_match_all_error1.phpt preg_match_all_error2.phpt preg_match_basic.phpt preg_quote_basic.phpt
preg_quote_error1.phpt preg_replace.phpt preg_replace2.phpt preg_replace_basic.phpt preg_replace_callback2.phpt preg_replace_callback3.phpt
preg_replace_callback_error.phpt preg_replace_error.phpt preg_replace_error1.phpt preg_replace_error2.phpt preg_split_basic.phpt pre!
g_split_error1.phpt preg_split_error2.phpt split.phpt split2.phpt study.phpt ungreedy.phpt

felipe Tue May 27 13:54:31 2008 UTC Modified files: /php-src/ext/openssl/tests 002.phpt 003.phpt 005.phpt bug28382.phpt bug38255.phpt bug38261.phpt /php-src/ext/pcre/tests 001.phpt 002.phpt 003.phpt 004.phpt 006.phpt bug20528.phpt bug21732.phpt bug21758.phpt bug26927.phpt bug34790.phpt bug37911.phpt bug40195.phpt bug40909.phpt bug42298.phpt bug42945.phpt bug44214.phpt bug44214_2.phpt dollar_endonly.phpt grep.phpt grep2.phpt invalid_utf8_offset.phpt locales.phpt match_flags.phpt match_flags2.phpt match_flags3.phpt pcre_anchored.phpt pcre_count.phpt pcre_extended.phpt preg_grep_basic.phpt preg_grep_error1.phpt preg_grep_error2.phpt preg_match_all_basic.phpt preg_match_all_error1.phpt preg_match_all_error2.phpt preg_match_basic.phpt preg_quote_basic.phpt preg_quote_error1.phpt preg_replace.phpt preg_replace2.phpt preg_replace_basic.phpt preg_replace_callback2.phpt preg_replace_callback3.phpt preg_replace_callback_error.phpt preg_replace_error.phpt preg_replace_error1.phpt preg_replace_error2.phpt preg_split_basic.phpt preg_split_error1.phpt preg_split_error2.phpt split.phpt split2.phpt study.phpt ungreedy.phpt Log: - Removed UEXPECT(F)

http://cvs.php.net/viewvc.cgi/php-src/ext/openssl/tests/002.phpt?r1=1.1&r2=1.2&diff_format=u Index: php-src/ext/openssl/tests/002.phpt diff -u php-src/ext/openssl/tests/002.phpt:1.1 php-src/ext/openssl/tests/002.phpt:1.2 --- php-src/ext/openssl/tests/002.phpt:1.1 Wed Aug 30 20:49:45 2006 +++ php-src/ext/openssl/tests/002.phpt Tue May 27 13:54:30 2008 @@ -24,19 +24,6 @@ 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 http://cvs.php.net/viewvc.cgi/php-src/ext/openssl/tests/003.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/openssl/tests/003.phpt diff -u php-src/ext/openssl/tests/003.phpt:1.2 php-src/ext/openssl/tests/003.phpt:1.3 --- php-src/ext/openssl/tests/003.phpt:1.2 Thu Aug 31 13:49:38 2006 +++ php-src/ext/openssl/tests/003.phpt Tue May 27 13:54:30 2008 @@ -26,22 +26,6 @@ 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" http://cvs.php.net/viewvc.cgi/php-src/ext/openssl/tests/005.phpt?r1=1.4&r2=1.5&diff_format=u Index: php-src/ext/openssl/tests/005.phpt diff -u php-src/ext/openssl/tests/005.phpt:1.4 php-src/ext/openssl/tests/005.phpt:1.5 --- php-src/ext/openssl/tests/005.phpt:1.4 Wed Jul 11 12:10:28 2007 +++ php-src/ext/openssl/tests/005.phpt Tue May 27 13:54:30 2008 @@ -17,23 +17,6 @@ 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" [u"ST"]=> http://cvs.php.net/viewvc.cgi/php-src/ext/openssl/tests/bug28382.phpt?r1=1.5&r2=1.6&diff_format=u Index: php-src/ext/openssl/tests/bug28382.phpt diff -u php-src/ext/openssl/tests/bug28382.phpt:1.5 php-src/ext/openssl/tests/bug28382.phpt:1.6 --- php-src/ext/openssl/tests/bug28382.phpt:1.5 Wed Jul 11 12:10:28 2007 +++ php-src/ext/openssl/tests/bug28382.phpt Tue May 27 13:54:30 2008 @@ -13,34 +13,6 @@ ?> --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" [u"nsComment"]=> @@ -66,4 +38,4 @@ unicode(20) "http://62.231.98.52/" [u"1.2.3.4"]=> string(4) "%s" -} \ No newline at end of file +} http://cvs.php.net/viewvc.cgi/php-src/ext/openssl/tests/bug38255.phpt?r1=1.3&r2=1.4&diff_format=u Index: php-src/ext/openssl/tests/bug38255.phpt diff -u php-src/ext/openssl/tests/bug38255.phpt:1.3 php-src/ext/openssl/tests/bug38255.phpt:1.4 --- php-src/ext/openssl/tests/bug38255.phpt:1.3 Sun May 27 19:13:29 2007 +++ php-src/ext/openssl/tests/bug38255.phpt Tue May 27 13:54:30 2008 @@ -38,30 +38,6 @@ 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 http://cvs.php.net/viewvc.cgi/php-src/ext/openssl/tests/bug38261.phpt?r1=1.4&r2=1.5&diff_format=u Index: php-src/ext/openssl/tests/bug38261.phpt diff -u php-src/ext/openssl/tests/bug38261.phpt:1.4 php-src/ext/openssl/tests/bug38261.phpt:1.5 --- php-src/ext/openssl/tests/bug38261.phpt:1.4 Sun May 27 19:13:29 2007 +++ php-src/ext/openssl/tests/bug38261.phpt Tue May 27 13:54:30 2008 @@ -27,16 +27,6 @@ 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) http://cvs.php.net/viewvc.cgi/php-src/ext/pcre/tests/001.phpt?r1=1.3&r2=1.4&diff_format=u Index: php-src/ext/pcre/tests/001.phpt diff -u php-src/ext/pcre/tests/001.phpt:1.3 php-src/ext/pcre/tests/001.phpt:1.4 --- php-src/ext/pcre/tests/001.phpt:1.3 Sun Dec 3 11:20:32 2006 +++ php-src/ext/pcre/tests/001.phpt Tue May 27 13:54:30 2008 @@ -19,76 +19,6 @@ 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" [u"date"]=> unicode(10) "2006-05-13" http://cvs.php.net/viewvc.cgi/php-src/ext/pcre/tests/002.phpt?r1=1.5&r2=1.6&diff_format=u Index: php-src/ext/pcre/tests/002.phpt diff -u php-src/ext/pcre/tests/002.phpt:1.5 php-src/ext/pcre/tests/002.phpt:1.6 --- php-src/ext/pcre/tests/002.phpt:1.5 Tue Dec 19 13:11:30 2006 +++ php-src/ext/pcre/tests/002.phpt Tue May 27 13:54:30 2008 @@ -28,29 +28,6 @@ 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) "" unicode(12) "a${1b${1c${1" http://cvs.php.net/viewvc.cgi/php-src/ext/pcre/tests/003.phpt?r1=1.3&r2=1.4&diff_format=u Index: php-src/ext/pcre/tests/003.phpt diff -u php-src/ext/pcre/tests/003.phpt:1.3 php-src/ext/pcre/tests/003.phpt:1.4 --- php-src/ext/pcre/tests/003.phpt:1.3 Sun Dec 3 11:20:32 2006 +++ php-src/ext/pcre/tests/003.phpt Tue May 27 13:54:30 2008 @@ -21,129 +21,6 @@ [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) { - [0]=> unicode(10) "2006-05-13" [1]=> unicode(9) "12-Aug-37" http://cvs.php.net/viewvc.cgi/php-src/ext/pcre/tests/004.phpt?r1=1.3&r2=1.4&diff_format=u Index: php-src/ext/pcre/tests/004.phpt diff -u php-src/ext/pcre/tests/004.phpt:1.3 php-src/ext/pcre/tests/004.phpt:1.4 --- php-src/ext/pcre/tests/004.phpt:1.3 Sun Dec 3 11:20:32 2006 +++ php-src/ext/pcre/tests/004.phpt Tue May 27 13:54:30 2008 @@ -22,137 +22,6 @@ [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) { - [0]=> unicode(24) "unsigned int xpto = 124;" [1]=> unicode(12) "unsigned int" http://cvs.php.net/viewvc.cgi/php-src/ext/pcre/tests/006.phpt?r1=1.1&r2=1.2&diff_format=u Index: php-src/ext/pcre/tests/006.phpt diff -u php-src/ext/pcre/tests/006.phpt:1.1 php-src/ext/pcre/tests/006.phpt:1.2 --- php-src/ext/pcre/tests/006.phpt:1.1 Thu Sep 20 08:10:20 2007 +++ php-src/ext/pcre/tests/006.phpt Tue May 27 13:54:30 2008 @@ -15,12 +15,6 @@ echo "Done\n"; ?> --EXPECTF-- -string(58) "[CODE]&lt;td align=&quot;$stylevar[right]&quot;&gt;[/CODE]" -NULL -string(58) "[CODE]&lt;td align=&quot;$stylevar[right]&quot;&gt;[/CODE]" -NULL -Done ---UEXPECTF-- unicode(58) "[CODE]&lt;td align=&quot;$stylevar[right]&quot;&gt;[/CODE]" NULL unicode(58) "[CODE]&lt;td align=&quot;$stylevar[right]&quot;&gt;[/CODE]" http://cvs.php.net/viewvc.cgi/php-src/ext/pcre/tests/bug20528.phpt?r1=1.4&r2=1.5&diff_format=u Index: php-src/ext/pcre/tests/bug20528.phpt diff -u php-src/ext/pcre/tests/bug20528.phpt:1.4 php-src/ext/pcre/tests/bug20528.phpt:1.5 --- php-src/ext/pcre/tests/bug20528.phpt:1.4 Tue Sep 19 11:49:21 2006 +++ php-src/ext/pcre/tests/bug20528.phpt Tue May 27 13:54:30 2008 @@ -8,23 +8,6 @@ --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) "(#" [1]=> unicode(2) "11" http://cvs.php.net/viewvc.cgi/php-src/ext/pcre/tests/bug21732.phpt?r1=1.3&r2=1.4&diff_format=u Index: php-src/ext/pcre/tests/bug21732.phpt diff -u php-src/ext/pcre/tests/bug21732.phpt:1.3 php-src/ext/pcre/tests/bug21732.phpt:1.4 --- php-src/ext/pcre/tests/bug21732.phpt:1.3 Tue Jul 10 09:11:35 2007 +++ php-src/ext/pcre/tests/bug21732.phpt Tue May 27 13:54:30 2008 @@ -18,19 +18,6 @@ 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" [1]=> unicode(2) "ab" http://cvs.php.net/viewvc.cgi/php-src/ext/pcre/tests/bug21758.phpt?r1=1.4&r2=1.5&diff_format=u Index: php-src/ext/pcre/tests/bug21758.phpt diff -u php-src/ext/pcre/tests/bug21758.phpt:1.4 php-src/ext/pcre/tests/bug21758.phpt:1.5 --- php-src/ext/pcre/tests/bug21758.phpt:1.4 Fri Aug 24 12:06:03 2007 +++ php-src/ext/pcre/tests/bug21758.phpt Tue May 27 13:54:30 2008 @@ -23,6 +23,4 @@ $o = new Foo; ?> --EXPECT-- -string(25) "preg_replace() is working" ---UEXPECT-- unicode(25) "preg_replace() is working" http://cvs.php.net/viewvc.cgi/php-src/ext/pcre/tests/bug26927.phpt?r1=1.3&r2=1.4&diff_format=u Index: php-src/ext/pcre/tests/bug26927.phpt diff -u php-src/ext/pcre/tests/bug26927.phpt:1.3 php-src/ext/pcre/tests/bug26927.phpt:1.4 --- php-src/ext/pcre/tests/bug26927.phpt:1.3 Tue Oct 3 21:37:02 2006 +++ php-src/ext/pcre/tests/bug26927.phpt Tue May 27 13:54:30 2008 @@ -8,7 +8,4 @@ ?> --EXPECT-- int(1) -string(6) "a\000b" ---UEXPECT-- -int(1) unicode(6) "a\000b" http://cvs.php.net/viewvc.cgi/php-src/ext/pcre/tests/bug34790.phpt?r1=1.3&r2=1.4&diff_format=u Index: php-src/ext/pcre/tests/bug34790.phpt diff -u php-src/ext/pcre/tests/bug34790.phpt:1.3 php-src/ext/pcre/tests/bug34790.phpt:1.4 --- php-src/ext/pcre/tests/bug34790.phpt:1.3 Sat May 24 15:13:09 2008 +++ php-src/ext/pcre/tests/bug34790.phpt Tue May 27 13:54:30 2008 @@ -13,17 +13,6 @@ --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" [1]=> unicode(3) "the" http://cvs.php.net/viewvc.cgi/php-src/ext/pcre/tests/bug37911.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/pcre/tests/bug37911.phpt diff -u php-src/ext/pcre/tests/bug37911.phpt:1.2 php-src/ext/pcre/tests/bug37911.phpt:1.3 --- php-src/ext/pcre/tests/bug37911.phpt:1.2 Sun Oct 7 12:09:02 2007 +++ php-src/ext/pcre/tests/bug37911.phpt Tue May 27 13:54:30 2008 @@ -20,28 +20,6 @@ --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" [u"name"]=> unicode(4) "blub" http://cvs.php.net/viewvc.cgi/php-src/ext/pcre/tests/bug40195.phpt?r1=1.3&r2=1.4&diff_format=u Index: php-src/ext/pcre/tests/bug40195.phpt diff -u php-src/ext/pcre/tests/bug40195.phpt:1.3 php-src/ext/pcre/tests/bug40195.phpt:1.4 --- php-src/ext/pcre/tests/bug40195.phpt:1.3 Mon May 7 17:23:02 2007 +++ php-src/ext/pcre/tests/bug40195.phpt Tue May 27 13:54:30 2008 @@ -14,39 +14,6 @@ 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" [1]=> unicode(6) "/abcde" http://cvs.php.net/viewvc.cgi/php-src/ext/pcre/tests/bug40909.phpt?r1=1.3&r2=1.4&diff_format=u Index: php-src/ext/pcre/tests/bug40909.phpt diff -u php-src/ext/pcre/tests/bug40909.phpt:1.3 php-src/ext/pcre/tests/bug40909.phpt:1.4 --- php-src/ext/pcre/tests/bug40909.phpt:1.3 Fri Jul 6 23:06:51 2007 +++ php-src/ext/pcre/tests/bug40909.phpt Tue May 27 13:54:30 2008 @@ -23,25 +23,6 @@ [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) { - [0]=> unicode(33) " an_attribute="simpleValueInside"" } [1]=> http://cvs.php.net/viewvc.cgi/php-src/ext/pcre/tests/bug42298.phpt?r1=1.3&r2=1.4&diff_format=u Index: php-src/ext/pcre/tests/bug42298.phpt diff -u php-src/ext/pcre/tests/bug42298.phpt:1.3 php-src/ext/pcre/tests/bug42298.phpt:1.4 --- php-src/ext/pcre/tests/bug42298.phpt:1.3 Fri Feb 15 16:55:11 2008 +++ php-src/ext/pcre/tests/bug42298.phpt Tue May 27 13:54:30 2008 @@ -16,39 +16,6 @@ [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) { - [0]=> unicode(3) "A£" [1]=> unicode(2) "BC" http://cvs.php.net/viewvc.cgi/php-src/ext/pcre/tests/bug42945.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/pcre/tests/bug42945.phpt diff -u php-src/ext/pcre/tests/bug42945.phpt:1.2 php-src/ext/pcre/tests/bug42945.phpt:1.3 --- php-src/ext/pcre/tests/bug42945.phpt:1.2 Sun Jan 13 14:57:54 2008 +++ php-src/ext/pcre/tests/bug42945.phpt Tue May 27 13:54:30 2008 @@ -20,80 +20,6 @@ [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) { - [0]=> - array(2) { - [0]=> unicode(0) "" [1]=> int(0) http://cvs.php.net/viewvc.cgi/php-src/ext/pcre/tests/bug44214.phpt?r1=1.3&r2=1.4&diff_format=u Index: php-src/ext/pcre/tests/bug44214.phpt diff -u php-src/ext/pcre/tests/bug44214.phpt:1.3 php-src/ext/pcre/tests/bug44214.phpt:1.4 --- php-src/ext/pcre/tests/bug44214.phpt:1.3 Wed Mar 19 14:17:50 2008 +++ php-src/ext/pcre/tests/bug44214.phpt Tue May 27 13:54:30 2008 @@ -16,20 +16,6 @@ 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]=> http://cvs.php.net/viewvc.cgi/php-src/ext/pcre/tests/bug44214_2.phpt?r1=1.3&r2=1.4&diff_format=u Index: php-src/ext/pcre/tests/bug44214_2.phpt diff -u php-src/ext/pcre/tests/bug44214_2.phpt:1.3 php-src/ext/pcre/tests/bug44214_2.phpt:1.4 --- php-src/ext/pcre/tests/bug44214_2.phpt:1.3 Wed Mar 19 14:19:54 2008 +++ php-src/ext/pcre/tests/bug44214_2.phpt Tue May 27 13:54:30 2008 @@ -16,14 +16,6 @@ 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]=> http://cvs.php.net/viewvc.cgi/php-src/ext/pcre/tests/dollar_endonly.phpt?r1=1.3&r2=1.4&diff_format=u Index: php-src/ext/pcre/tests/dollar_endonly.phpt diff -u php-src/ext/pcre/tests/dollar_endonly.phpt:1.3 php-src/ext/pcre/tests/dollar_endonly.phpt:1.4 --- php-src/ext/pcre/tests/dollar_endonly.phpt:1.3 Tue Aug 29 22:12:31 2006 +++ php-src/ext/pcre/tests/dollar_endonly.phpt Tue May 27 13:54:30 2008 @@ -19,30 +19,6 @@ [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) { - [0]=> unicode(5) "aeiou" } } http://cvs.php.net/viewvc.cgi/php-src/ext/pcre/tests/grep.phpt?r1=1.3&r2=1.4&diff_format=u Index: php-src/ext/pcre/tests/grep.phpt diff -u php-src/ext/pcre/tests/grep.phpt:1.3 php-src/ext/pcre/tests/grep.phpt:1.4 --- php-src/ext/pcre/tests/grep.phpt:1.3 Tue Oct 3 21:18:43 2006 +++ php-src/ext/pcre/tests/grep.phpt Tue May 27 13:54:30 2008 @@ -11,19 +11,6 @@ --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" [2]=> unicode(2) "q6" http://cvs.php.net/viewvc.cgi/php-src/ext/pcre/tests/grep2.phpt?r1=1.5&r2=1.6&diff_format=u Index: php-src/ext/pcre/tests/grep2.phpt diff -u php-src/ext/pcre/tests/grep2.phpt:1.5 php-src/ext/pcre/tests/grep2.phpt:1.6 --- php-src/ext/pcre/tests/grep2.phpt:1.5 Tue Oct 3 21:18:43 2006 +++ php-src/ext/pcre/tests/grep2.phpt Tue May 27 13:54:30 2008 @@ -29,31 +29,6 @@ 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) { - [5]=> unicode(1) "a" [u"xyz"]=> unicode(2) "q6" http://cvs.php.net/viewvc.cgi/php-src/ext/pcre/tests/invalid_utf8_offset.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/pcre/tests/invalid_utf8_offset.phpt diff -u php-src/ext/pcre/tests/invalid_utf8_offset.phpt:1.2 php-src/ext/pcre/tests/invalid_utf8_offset.phpt:1.3 --- php-src/ext/pcre/tests/invalid_utf8_offset.phpt:1.2 Sat Mar 8 11:51:03 2008 +++ php-src/ext/pcre/tests/invalid_utf8_offset.phpt Tue May 27 13:54:30 2008 @@ -29,7 +29,7 @@ int(1) array(1) { [0]=> - string(28) " uma string utf8 bem formada" + unicode(28) " uma string utf8 bem formada" } bool(true) Done http://cvs.php.net/viewvc.cgi/php-src/ext/pcre/tests/locales.phpt?r1=1.6&r2=1.7&diff_format=u Index: php-src/ext/pcre/tests/locales.phpt diff -u php-src/ext/pcre/tests/locales.phpt:1.6 php-src/ext/pcre/tests/locales.phpt:1.7 --- php-src/ext/pcre/tests/locales.phpt:1.6 Sat Mar 22 14:58:29 2008 +++ php-src/ext/pcre/tests/locales.phpt Tue May 27 13:54:30 2008 @@ -22,10 +22,6 @@ ?> --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) http://cvs.php.net/viewvc.cgi/php-src/ext/pcre/tests/match_flags.phpt?r1=1.3&r2=1.4&diff_format=u Index: php-src/ext/pcre/tests/match_flags.phpt diff -u php-src/ext/pcre/tests/match_flags.phpt:1.3 php-src/ext/pcre/tests/match_flags.phpt:1.4 --- php-src/ext/pcre/tests/match_flags.phpt:1.3 Tue Aug 29 22:12:31 2006 +++ php-src/ext/pcre/tests/match_flags.phpt Tue May 27 13:54:30 2008 @@ -22,115 +22,6 @@ [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) { - [0]=> unicode(2) "zx" [1]=> unicode(2) "ax" http://cvs.php.net/viewvc.cgi/php-src/ext/pcre/tests/match_flags2.phpt?r1=1.3&r2=1.4&diff_format=u Index: php-src/ext/pcre/tests/match_flags2.phpt diff -u php-src/ext/pcre/tests/match_flags2.phpt:1.3 php-src/ext/pcre/tests/match_flags2.phpt:1.4 --- php-src/ext/pcre/tests/match_flags2.phpt:1.3 Tue Aug 29 22:12:31 2006 +++ php-src/ext/pcre/tests/match_flags2.phpt Tue May 27 13:54:30 2008 @@ -19,86 +19,6 @@ [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) { - [0]=> unicode(2) "xa" [1]=> int(4) http://cvs.php.net/viewvc.cgi/php-src/ext/pcre/tests/match_flags3.phpt?r1=1.4&r2=1.5&diff_format=u Index: php-src/ext/pcre/tests/match_flags3.phpt diff -u php-src/ext/pcre/tests/match_flags3.phpt:1.4 php-src/ext/pcre/tests/match_flags3.phpt:1.5 --- php-src/ext/pcre/tests/match_flags3.phpt:1.4 Tue Aug 29 22:12:31 2006 +++ php-src/ext/pcre/tests/match_flags3.phpt Tue May 27 13:54:30 2008 @@ -18,33 +18,6 @@ ?> --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) http://cvs.php.net/viewvc.cgi/php-src/ext/pcre/tests/pcre_anchored.phpt?r1=1.4&r2=1.5&diff_format=u Index: php-src/ext/pcre/tests/pcre_anchored.phpt diff -u php-src/ext/pcre/tests/pcre_anchored.phpt:1.4 php-src/ext/pcre/tests/pcre_anchored.phpt:1.5 --- php-src/ext/pcre/tests/pcre_anchored.phpt:1.4 Mon Feb 12 14:22:02 2007 +++ php-src/ext/pcre/tests/pcre_anchored.phpt Tue May 27 13:54:30 2008 @@ -21,15 +21,6 @@ int(1) array(1) { [0]=> - string(3) "abc" -} -int(0) -int(0) -int(0) ---UEXPECT-- -int(1) -array(1) { - [0]=> unicode(3) "abc" } int(0) http://cvs.php.net/viewvc.cgi/php-src/ext/pcre/tests/pcre_count.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/pcre/tests/pcre_count.phpt diff -u php-src/ext/pcre/tests/pcre_count.phpt:1.2 php-src/ext/pcre/tests/pcre_count.phpt:1.3 --- php-src/ext/pcre/tests/pcre_count.phpt:1.2 Tue Sep 19 11:49:21 2006 +++ php-src/ext/pcre/tests/pcre_count.phpt Tue May 27 13:54:30 2008 @@ -30,15 +30,6 @@ 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" http://cvs.php.net/viewvc.cgi/php-src/ext/pcre/tests/pcre_extended.phpt?r1=1.3&r2=1.4&diff_format=u Index: php-src/ext/pcre/tests/pcre_extended.phpt diff -u php-src/ext/pcre/tests/pcre_extended.phpt:1.3 php-src/ext/pcre/tests/pcre_extended.phpt:1.4 --- php-src/ext/pcre/tests/pcre_extended.phpt:1.3 Tue Aug 29 22:12:31 2006 +++ php-src/ext/pcre/tests/pcre_extended.phpt Tue May 27 13:54:30 2008 @@ -20,20 +20,6 @@ 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" } int(1) http://cvs.php.net/viewvc.cgi/php-src/ext/pcre/tests/preg_grep_basic.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/pcre/tests/preg_grep_basic.phpt diff -u php-src/ext/pcre/tests/preg_grep_basic.phpt:1.2 php-src/ext/pcre/tests/preg_grep_basic.phpt:1.3 --- php-src/ext/pcre/tests/preg_grep_basic.phpt:1.2 Wed Nov 21 18:23:02 2007 +++ php-src/ext/pcre/tests/preg_grep_basic.phpt Tue May 27 13:54:30 2008 @@ -18,52 +18,6 @@ --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" [1]=> unicode(11) "/index.html" @@ -105,4 +59,4 @@ unicode(11) "/info/stat/" [4]=> unicode(17) "/display/dept.php" -} \ No newline at end of file +} http://cvs.php.net/viewvc.cgi/php-src/ext/pcre/tests/preg_grep_error1.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/pcre/tests/preg_grep_error1.phpt diff -u php-src/ext/pcre/tests/preg_grep_error1.phpt:1.2 php-src/ext/pcre/tests/preg_grep_error1.phpt:1.3 --- php-src/ext/pcre/tests/preg_grep_error1.phpt:1.2 Wed Nov 21 18:23:02 2007 +++ php-src/ext/pcre/tests/preg_grep_error1.phpt Tue May 27 13:54:30 2008 @@ -58,45 +58,6 @@ 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]=> unicode(3) "abc" [2]=> unicode(4) "test" @@ -104,4 +65,4 @@ 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 http://cvs.php.net/viewvc.cgi/php-src/ext/pcre/tests/preg_grep_error2.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/pcre/tests/preg_grep_error2.phpt diff -u php-src/ext/pcre/tests/preg_grep_error2.phpt:1.2 php-src/ext/pcre/tests/preg_grep_error2.phpt:1.3 --- php-src/ext/pcre/tests/preg_grep_error2.phpt:1.2 Wed Nov 21 18:23:02 2007 +++ php-src/ext/pcre/tests/preg_grep_error2.phpt Tue May 27 13:54:30 2008 @@ -26,25 +26,6 @@ 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 @@ 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 http://cvs.php.net/viewvc.cgi/php-src/ext/pcre/tests/preg_match_all_basic.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/pcre/tests/preg_match_all_basic.phpt diff -u php-src/ext/pcre/tests/preg_match_all_basic.phpt:1.2 php-src/ext/pcre/tests/preg_match_all_basic.phpt:1.3 --- php-src/ext/pcre/tests/preg_match_all_basic.phpt:1.2 Wed Nov 21 18:23:02 2007 +++ php-src/ext/pcre/tests/preg_match_all_basic.phpt Tue May 27 13:54:30 2008 @@ -26,69 +26,6 @@ [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) { - [0]=> - array(2) { - [0]=> unicode(1) "3" [1]=> int(61) @@ -142,4 +79,4 @@ [2]=> array(0) { } -} \ No newline at end of file +} http://cvs.php.net/viewvc.cgi/php-src/ext/pcre/tests/preg_match_all_error1.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/pcre/tests/preg_match_all_error1.phpt diff -u php-src/ext/pcre/tests/preg_match_all_error1.phpt:1.2 php-src/ext/pcre/tests/preg_match_all_error1.phpt:1.3 --- php-src/ext/pcre/tests/preg_match_all_error1.phpt:1.2 Wed Nov 21 18:23:02 2007 +++ php-src/ext/pcre/tests/preg_match_all_error1.phpt Tue May 27 13:54:30 2008 @@ -66,59 +66,6 @@ [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) { - [0]=> - array(4) { - [0]=> unicode(1) "t" [1]=> unicode(1) "e" @@ -131,4 +78,4 @@ 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 http://cvs.php.net/viewvc.cgi/php-src/ext/pcre/tests/preg_match_all_error2.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/pcre/tests/preg_match_all_error2.phpt diff -u php-src/ext/pcre/tests/preg_match_all_error2.phpt:1.2 php-src/ext/pcre/tests/preg_match_all_error2.phpt:1.3 --- php-src/ext/pcre/tests/preg_match_all_error2.phpt:1.2 Wed Nov 21 18:23:02 2007 +++ php-src/ext/pcre/tests/preg_match_all_error2.phpt Tue May 27 13:54:30 2008 @@ -42,36 +42,6 @@ [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) { - [0]=> - array(4) { - [0]=> unicode(1) "t" [1]=> unicode(1) "e" @@ -81,4 +51,4 @@ unicode(1) "t" } } -Done \ No newline at end of file +Done http://cvs.php.net/viewvc.cgi/php-src/ext/pcre/tests/preg_match_basic.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/pcre/tests/preg_match_basic.phpt diff -u php-src/ext/pcre/tests/preg_match_basic.phpt:1.2 php-src/ext/pcre/tests/preg_match_basic.phpt:1.3 --- php-src/ext/pcre/tests/preg_match_basic.phpt:1.2 Wed Nov 21 18:23:02 2007 +++ php-src/ext/pcre/tests/preg_match_basic.phpt Tue May 27 13:54:30 2008 @@ -24,37 +24,6 @@ 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]=> unicode(7) "Hello, " } int(0) @@ -79,4 +48,4 @@ } int(0) array(0) { -} \ No newline at end of file +} http://cvs.php.net/viewvc.cgi/php-src/ext/pcre/tests/preg_quote_basic.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/pcre/tests/preg_quote_basic.phpt diff -u php-src/ext/pcre/tests/preg_quote_basic.phpt:1.2 php-src/ext/pcre/tests/preg_quote_basic.phpt:1.3 --- php-src/ext/pcre/tests/preg_quote_basic.phpt:1.2 Wed Nov 21 18:23:02 2007 +++ php-src/ext/pcre/tests/preg_quote_basic.phpt Tue May 27 13:54:30 2008 @@ -15,19 +15,10 @@ 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 +} http://cvs.php.net/viewvc.cgi/php-src/ext/pcre/tests/preg_quote_error1.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/pcre/tests/preg_quote_error1.phpt diff -u php-src/ext/pcre/tests/preg_quote_error1.phpt:1.2 php-src/ext/pcre/tests/preg_quote_error1.phpt:1.3 --- php-src/ext/pcre/tests/preg_quote_error1.phpt:1.2 Wed Nov 21 18:23:02 2007 +++ php-src/ext/pcre/tests/preg_quote_error1.phpt Tue May 27 13:54:30 2008 @@ -24,20 +24,6 @@ *** 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" Arg value is: Array @@ -47,4 +33,4 @@ 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 http://cvs.php.net/viewvc.cgi/php-src/ext/pcre/tests/preg_replace.phpt?r1=1.4&r2=1.5&diff_format=u Index: php-src/ext/pcre/tests/preg_replace.phpt diff -u php-src/ext/pcre/tests/preg_replace.phpt:1.4 php-src/ext/pcre/tests/preg_replace.phpt:1.5 --- php-src/ext/pcre/tests/preg_replace.phpt:1.4 Tue Sep 19 11:49:21 2006 +++ php-src/ext/pcre/tests/preg_replace.phpt Tue May 27 13:54:30 2008 @@ -14,16 +14,6 @@ ?> --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" http://cvs.php.net/viewvc.cgi/php-src/ext/pcre/tests/preg_replace2.phpt?r1=1.6&r2=1.7&diff_format=u Index: php-src/ext/pcre/tests/preg_replace2.phpt diff -u php-src/ext/pcre/tests/preg_replace2.phpt:1.6 php-src/ext/pcre/tests/preg_replace2.phpt:1.7 --- php-src/ext/pcre/tests/preg_replace2.phpt:1.6 Mon Feb 12 14:22:02 2007 +++ php-src/ext/pcre/tests/preg_replace2.phpt Tue May 27 13:54:30 2008 @@ -22,31 +22,6 @@ ?> --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" http://cvs.php.net/viewvc.cgi/php-src/ext/pcre/tests/preg_replace_basic.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/pcre/tests/preg_replace_basic.phpt diff -u php-src/ext/pcre/tests/preg_replace_basic.phpt:1.2 php-src/ext/pcre/tests/preg_replace_basic.phpt:1.3 --- php-src/ext/pcre/tests/preg_replace_basic.phpt:1.2 Wed Nov 21 18:23:02 2007 +++ php-src/ext/pcre/tests/preg_replace_basic.phpt Tue May 27 13:54:30 2008 @@ -17,17 +17,9 @@ ?> --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" http://cvs.php.net/viewvc.cgi/php-src/ext/pcre/tests/preg_replace_callback2.phpt?r1=1.6&r2=1.7&diff_format=u Index: php-src/ext/pcre/tests/preg_replace_callback2.phpt diff -u php-src/ext/pcre/tests/preg_replace_callback2.phpt:1.6 php-src/ext/pcre/tests/preg_replace_callback2.phpt:1.7 --- php-src/ext/pcre/tests/preg_replace_callback2.phpt:1.6 Wed Mar 14 23:47:19 2007 +++ php-src/ext/pcre/tests/preg_replace_callback2.phpt Tue May 27 13:54:30 2008 @@ -24,22 +24,6 @@ --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" [u"v"]=> unicode(6) "aksfjk" http://cvs.php.net/viewvc.cgi/php-src/ext/pcre/tests/preg_replace_callback3.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/pcre/tests/preg_replace_callback3.phpt diff -u php-src/ext/pcre/tests/preg_replace_callback3.phpt:1.2 php-src/ext/pcre/tests/preg_replace_callback3.phpt:1.3 --- php-src/ext/pcre/tests/preg_replace_callback3.phpt:1.2 Tue Sep 19 11:49:21 2006 +++ php-src/ext/pcre/tests/preg_replace_callback3.phpt Tue May 27 13:54:30 2008 @@ -36,31 +36,6 @@ 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 http://cvs.php.net/viewvc.cgi/php-src/ext/pcre/tests/preg_replace_callback_error.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/pcre/tests/preg_replace_callback_error.phpt diff -u php-src/ext/pcre/tests/preg_replace_callback_error.phpt:1.2 php-src/ext/pcre/tests/preg_replace_callback_error.phpt:1.3 --- php-src/ext/pcre/tests/preg_replace_callback_error.phpt:1.2 Wed Nov 21 18:23:02 2007 +++ php-src/ext/pcre/tests/preg_replace_callback_error.phpt Tue May 27 13:54:30 2008 @@ -46,21 +46,3 @@ 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 http://cvs.php.net/viewvc.cgi/php-src/ext/pcre/tests/preg_replace_error.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/pcre/tests/preg_replace_error.phpt diff -u php-src/ext/pcre/tests/preg_replace_error.phpt:1.2 php-src/ext/pcre/tests/preg_replace_error.phpt:1.3 --- php-src/ext/pcre/tests/preg_replace_error.phpt:1.2 Wed Nov 21 18:23:02 2007 +++ php-src/ext/pcre/tests/preg_replace_error.phpt Tue May 27 13:54:30 2008 @@ -43,21 +43,3 @@ 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 http://cvs.php.net/viewvc.cgi/php-src/ext/pcre/tests/preg_replace_error1.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/pcre/tests/preg_replace_error1.phpt diff -u php-src/ext/pcre/tests/preg_replace_error1.phpt:1.2 php-src/ext/pcre/tests/preg_replace_error1.phpt:1.3 --- php-src/ext/pcre/tests/preg_replace_error1.phpt:1.2 Wed Nov 21 18:23:02 2007 +++ php-src/ext/pcre/tests/preg_replace_error1.phpt Tue May 27 13:54:30 2008 @@ -50,41 +50,9 @@ 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 http://cvs.php.net/viewvc.cgi/php-src/ext/pcre/tests/preg_replace_error2.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/pcre/tests/preg_replace_error2.phpt diff -u php-src/ext/pcre/tests/preg_replace_error2.phpt:1.2 php-src/ext/pcre/tests/preg_replace_error2.phpt:1.3 --- php-src/ext/pcre/tests/preg_replace_error2.phpt:1.2 Wed Nov 21 18:23:02 2007 +++ php-src/ext/pcre/tests/preg_replace_error2.phpt Tue May 27 13:54:30 2008 @@ -26,20 +26,6 @@ *** 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" Arg value is: Array @@ -47,4 +33,4 @@ 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 http://cvs.php.net/viewvc.cgi/php-src/ext/pcre/tests/preg_split_basic.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/pcre/tests/preg_split_basic.phpt diff -u php-src/ext/pcre/tests/preg_split_basic.phpt:1.2 php-src/ext/pcre/tests/preg_split_basic.phpt:1.3 --- php-src/ext/pcre/tests/preg_split_basic.phpt:1.2 Wed Nov 21 18:23:02 2007 +++ php-src/ext/pcre/tests/preg_split_basic.phpt Tue May 27 13:54:30 2008 @@ -18,65 +18,6 @@ --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" [1]=> unicode(7) " value1" @@ -132,4 +73,4 @@ unicode(1) "(" [9]=> unicode(1) ")" -} \ No newline at end of file +} http://cvs.php.net/viewvc.cgi/php-src/ext/pcre/tests/preg_split_error1.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/pcre/tests/preg_split_error1.phpt diff -u php-src/ext/pcre/tests/preg_split_error1.phpt:1.2 php-src/ext/pcre/tests/preg_split_error1.phpt:1.3 --- php-src/ext/pcre/tests/preg_split_error1.phpt:1.2 Wed Nov 21 18:23:02 2007 +++ php-src/ext/pcre/tests/preg_split_error1.phpt Tue May 27 13:54:30 2008 @@ -56,46 +56,6 @@ 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]=> unicode(4) "1 2 " [1]=> unicode(5) " 3 4 " http://cvs.php.net/viewvc.cgi/php-src/ext/pcre/tests/preg_split_error2.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/pcre/tests/preg_split_error2.phpt diff -u php-src/ext/pcre/tests/preg_split_error2.phpt:1.2 php-src/ext/pcre/tests/preg_split_error2.phpt:1.3 --- php-src/ext/pcre/tests/preg_split_error2.phpt:1.2 Wed Nov 21 18:23:02 2007 +++ php-src/ext/pcre/tests/preg_split_error2.phpt Tue May 27 13:54:30 2008 @@ -32,14 +32,3 @@ 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 http://cvs.php.net/viewvc.cgi/php-src/ext/pcre/tests/split.phpt?r1=1.4&r2=1.5&diff_format=u Index: php-src/ext/pcre/tests/split.phpt diff -u php-src/ext/pcre/tests/split.phpt:1.4 php-src/ext/pcre/tests/split.phpt:1.5 --- php-src/ext/pcre/tests/split.phpt:1.4 Tue Sep 19 11:49:21 2006 +++ php-src/ext/pcre/tests/split.phpt Tue May 27 13:54:30 2008 @@ -17,74 +17,6 @@ ?> --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) http://cvs.php.net/viewvc.cgi/php-src/ext/pcre/tests/split2.phpt?r1=1.4&r2=1.5&diff_format=u Index: php-src/ext/pcre/tests/split2.phpt diff -u php-src/ext/pcre/tests/split2.phpt:1.4 php-src/ext/pcre/tests/split2.phpt:1.5 --- php-src/ext/pcre/tests/split2.phpt:1.4 Tue Sep 19 11:49:21 2006 +++ php-src/ext/pcre/tests/split2.phpt Tue May 27 13:54:30 2008 @@ -21,301 +21,6 @@ --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) "" [1]=> unicode(0) "" http://cvs.php.net/viewvc.cgi/php-src/ext/pcre/tests/study.phpt?r1=1.3&r2=1.4&diff_format=u Index: php-src/ext/pcre/tests/study.phpt diff -u php-src/ext/pcre/tests/study.phpt:1.3 php-src/ext/pcre/tests/study.phpt:1.4 --- php-src/ext/pcre/tests/study.phpt:1.3 Tue Aug 29 22:12:31 2006 +++ php-src/ext/pcre/tests/study.phpt Tue May 27 13:54:30 2008 @@ -20,17 +20,6 @@ ?> --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" http://cvs.php.net/viewvc.cgi/php-src/ext/pcre/tests/ungreedy.phpt?r1=1.3&r2=1.4&diff_format=u Index: php-src/ext/pcre/tests/ungreedy.phpt diff -u php-src/ext/pcre/tests/ungreedy.phpt:1.3 php-src/ext/pcre/tests/ungreedy.phpt:1.4 --- php-src/ext/pcre/tests/ungreedy.phpt:1.3 Tue Aug 29 22:12:31 2006 +++ php-src/ext/pcre/tests/ungreedy.phpt Tue May 27 13:54:30 2008 @@ -17,22 +17,6 @@ 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>" } int(1)