cvs: php-src /ext/pcre/tests bug34790.phpt dollar_endonly.phpt match_flags.phpt match_flags2.phpt match_flags3.phpt pcre_anchored.phpt
pcre_extended.phpt study.phpt ungreedy.phpt
| From: | Antony Dovgal | Date: | Tue, 29 Aug 2006 22:12:31 +0000 |
| Subject: | cvs: php-src /ext/pcre/tests bug34790.phpt dollar_endonly.phpt match_flags.phpt match_flags2.phpt match_flags3.phpt pcre_anchored.phpt pcre_extended.phpt study.phpt ungreedy.phpt |
||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-40173@lists.php.net to get a copy of this message | ||
tony2001 Tue Aug 29 22:12:31 2006 UTC
Modified files:
/php-src/ext/pcre/tests bug34790.phpt dollar_endonly.phpt
match_flags.phpt match_flags2.phpt
match_flags3.phpt pcre_anchored.phpt
pcre_extended.phpt study.phpt ungreedy.phpt
Log:
fix PCRE tests
http://cvs.php.net/viewvc.cgi/php-src/ext/pcre/tests/bug34790.phpt?r1=1.1&r2=1.2&diff_format=u
Index: php-src/ext/pcre/tests/bug34790.phpt
diff -u php-src/ext/pcre/tests/bug34790.phpt:1.1 php-src/ext/pcre/tests/bug34790.phpt:1.2
--- php-src/ext/pcre/tests/bug34790.phpt:1.1 Tue Oct 11 06:46:18 2005
+++ php-src/ext/pcre/tests/bug34790.phpt Tue Aug 29 22:12:31 2006
@@ -21,3 +21,14 @@
[3]=>
string(3) "the"
}
+--UEXPECT--
+array(4) {
+ [0]=>
+ unicode(3) "the"
+ [1]=>
+ unicode(3) "the"
+ [2]=>
+ unicode(3) "the"
+ [3]=>
+ unicode(3) "the"
+}
http://cvs.php.net/viewvc.cgi/php-src/ext/pcre/tests/dollar_endonly.phpt?r1=1.2&r2=1.3&diff_format=u
Index: php-src/ext/pcre/tests/dollar_endonly.phpt
diff -u php-src/ext/pcre/tests/dollar_endonly.phpt:1.2
php-src/ext/pcre/tests/dollar_endonly.phpt:1.3
--- php-src/ext/pcre/tests/dollar_endonly.phpt:1.2 Wed Jun 14 18:07:45 2006
+++ php-src/ext/pcre/tests/dollar_endonly.phpt Tue Aug 29 22:12:31 2006
@@ -37,3 +37,27 @@
"
}
}
+--UEXPECT--
+int(1)
+array(1) {
+ [0]=>
+ array(1) {
+ [0]=>
+ unicode(5) "aeiou"
+ }
+}
+int(0)
+array(1) {
+ [0]=>
+ array(0) {
+ }
+}
+int(1)
+array(1) {
+ [0]=>
+ array(1) {
+ [0]=>
+ unicode(6) "aeiou
+"
+ }
+}
http://cvs.php.net/viewvc.cgi/php-src/ext/pcre/tests/match_flags.phpt?r1=1.2&r2=1.3&diff_format=u
Index: php-src/ext/pcre/tests/match_flags.phpt
diff -u php-src/ext/pcre/tests/match_flags.phpt:1.2 php-src/ext/pcre/tests/match_flags.phpt:1.3
--- php-src/ext/pcre/tests/match_flags.phpt:1.2 Wed Jun 14 18:07:45 2006
+++ php-src/ext/pcre/tests/match_flags.phpt Tue Aug 29 22:12:31 2006
@@ -125,3 +125,112 @@
}
}
}
+--UEXPECT--
+int(2)
+array(2) {
+ [0]=>
+ array(2) {
+ [0]=>
+ unicode(2) "zx"
+ [1]=>
+ unicode(2) "ax"
+ }
+ [1]=>
+ array(2) {
+ [0]=>
+ unicode(1) "z"
+ [1]=>
+ unicode(1) "a"
+ }
+}
+int(2)
+array(2) {
+ [0]=>
+ array(2) {
+ [0]=>
+ unicode(2) "zx"
+ [1]=>
+ unicode(1) "z"
+ }
+ [1]=>
+ array(2) {
+ [0]=>
+ unicode(2) "yx"
+ [1]=>
+ unicode(1) "y"
+ }
+}
+int(2)
+array(2) {
+ [0]=>
+ array(2) {
+ [0]=>
+ array(2) {
+ [0]=>
+ unicode(2) "zx"
+ [1]=>
+ int(0)
+ }
+ [1]=>
+ array(2) {
+ [0]=>
+ unicode(2) "yx"
+ [1]=>
+ int(2)
+ }
+ }
+ [1]=>
+ array(2) {
+ [0]=>
+ array(2) {
+ [0]=>
+ unicode(1) "z"
+ [1]=>
+ int(0)
+ }
+ [1]=>
+ array(2) {
+ [0]=>
+ unicode(1) "y"
+ [1]=>
+ int(2)
+ }
+ }
+}
+int(2)
+array(2) {
+ [0]=>
+ array(2) {
+ [0]=>
+ array(2) {
+ [0]=>
+ unicode(2) "zx"
+ [1]=>
+ int(0)
+ }
+ [1]=>
+ array(2) {
+ [0]=>
+ unicode(1) "z"
+ [1]=>
+ int(0)
+ }
+ }
+ [1]=>
+ array(2) {
+ [0]=>
+ array(2) {
+ [0]=>
+ unicode(2) "yx"
+ [1]=>
+ int(2)
+ }
+ [1]=>
+ array(2) {
+ [0]=>
+ unicode(1) "y"
+ [1]=>
+ int(2)
+ }
+ }
+}
http://cvs.php.net/viewvc.cgi/php-src/ext/pcre/tests/match_flags2.phpt?r1=1.2&r2=1.3&diff_format=u
Index: php-src/ext/pcre/tests/match_flags2.phpt
diff -u php-src/ext/pcre/tests/match_flags2.phpt:1.2 php-src/ext/pcre/tests/match_flags2.phpt:1.3
--- php-src/ext/pcre/tests/match_flags2.phpt:1.2 Wed Jun 14 18:07:45 2006
+++ php-src/ext/pcre/tests/match_flags2.phpt Tue Aug 29 22:12:31 2006
@@ -99,14 +99,14 @@
[0]=>
array(2) {
[0]=>
- string(2) "xa"
+ unicode(2) "xa"
[1]=>
int(4)
}
[1]=>
array(2) {
[0]=>
- string(1) "a"
+ unicode(1) "a"
[1]=>
int(5)
}
@@ -116,14 +116,14 @@
[0]=>
array(2) {
[0]=>
- string(2) "ax"
+ unicode(2) "ax"
[1]=>
int(5)
}
[1]=>
array(2) {
[0]=>
- string(1) "a"
+ unicode(1) "a"
[1]=>
int(5)
}
@@ -133,42 +133,42 @@
[0]=>
array(2) {
[0]=>
- string(4) "zxax"
+ unicode(4) "zxax"
[1]=>
int(3)
}
[u"capt1"]=>
array(2) {
[0]=>
- string(1) "z"
+ unicode(1) "z"
[1]=>
int(3)
}
[1]=>
array(2) {
[0]=>
- string(1) "z"
+ unicode(1) "z"
[1]=>
int(3)
}
[2]=>
array(2) {
[0]=>
- string(1) "x"
+ unicode(1) "x"
[1]=>
int(4)
}
[u"letsmix"]=>
array(2) {
[0]=>
- string(2) "ax"
+ unicode(2) "ax"
[1]=>
int(5)
}
[3]=>
array(2) {
[0]=>
- string(2) "ax"
+ unicode(2) "ax"
[1]=>
int(5)
}
http://cvs.php.net/viewvc.cgi/php-src/ext/pcre/tests/match_flags3.phpt?r1=1.3&r2=1.4&diff_format=u
Index: php-src/ext/pcre/tests/match_flags3.phpt
diff -u php-src/ext/pcre/tests/match_flags3.phpt:1.3 php-src/ext/pcre/tests/match_flags3.phpt:1.4
--- php-src/ext/pcre/tests/match_flags3.phpt:1.3 Thu Jul 20 21:19:05 2006
+++ php-src/ext/pcre/tests/match_flags3.phpt Tue Aug 29 22:12:31 2006
@@ -44,3 +44,29 @@
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)
+array(1) {
+ [0]=>
+ unicode(3) "789"
+}
+int(1)
+array(1) {
+ [0]=>
+ unicode(3) "123"
+}
+int(2)
+array(1) {
+ [0]=>
+ array(2) {
+ [0]=>
+ unicode(3) "789"
+ [1]=>
+ unicode(3) "012"
+ }
+}
+
+Warning: preg_match(): Numeric named subpatterns are not allowed in %s on line %d
+bool(false)
http://cvs.php.net/viewvc.cgi/php-src/ext/pcre/tests/pcre_anchored.phpt?r1=1.2&r2=1.3&diff_format=u
Index: php-src/ext/pcre/tests/pcre_anchored.phpt
diff -u php-src/ext/pcre/tests/pcre_anchored.phpt:1.2 php-src/ext/pcre/tests/pcre_anchored.phpt:1.3
--- php-src/ext/pcre/tests/pcre_anchored.phpt:1.2 Wed Jun 14 18:07:45 2006
+++ php-src/ext/pcre/tests/pcre_anchored.phpt Tue Aug 29 22:12:31 2006
@@ -20,3 +20,12 @@
int(0)
int(0)
int(0)
+--UEXPECT--
+int(1)
+array(1) {
+ [0]=>
+ unicode(3) "abc"
+}
+int(0)
+int(0)
+int(0)
http://cvs.php.net/viewvc.cgi/php-src/ext/pcre/tests/pcre_extended.phpt?r1=1.2&r2=1.3&diff_format=u
Index: php-src/ext/pcre/tests/pcre_extended.phpt
diff -u php-src/ext/pcre/tests/pcre_extended.phpt:1.2 php-src/ext/pcre/tests/pcre_extended.phpt:1.3
--- php-src/ext/pcre/tests/pcre_extended.phpt:1.2 Wed Jun 14 18:07:45 2006
+++ php-src/ext/pcre/tests/pcre_extended.phpt Tue Aug 29 22:12:31 2006
@@ -27,3 +27,17 @@
[0]=>
string(5) "aeiou"
}
+--UEXPECT--
+int(0)
+array(0) {
+}
+int(1)
+array(1) {
+ [0]=>
+ unicode(5) "aeiou"
+}
+int(1)
+array(1) {
+ [0]=>
+ unicode(5) "aeiou"
+}
http://cvs.php.net/viewvc.cgi/php-src/ext/pcre/tests/study.phpt?r1=1.2&r2=1.3&diff_format=u
Index: php-src/ext/pcre/tests/study.phpt
diff -u php-src/ext/pcre/tests/study.phpt:1.2 php-src/ext/pcre/tests/study.phpt:1.3
--- php-src/ext/pcre/tests/study.phpt:1.2 Tue Jun 13 22:05:26 2006
+++ php-src/ext/pcre/tests/study.phpt Tue Aug 29 22:12:31 2006
@@ -29,3 +29,14 @@
string(5) "aeiou"
int(1)
string(5) "aeiou"
+--UEXPECT--
+int(1)
+unicode(1) "a"
+int(1)
+unicode(1) "a"
+int(1)
+unicode(1) "i"
+int(1)
+unicode(5) "aeiou"
+int(1)
+unicode(5) "aeiou"
http://cvs.php.net/viewvc.cgi/php-src/ext/pcre/tests/ungreedy.phpt?r1=1.2&r2=1.3&diff_format=u
Index: php-src/ext/pcre/tests/ungreedy.phpt
diff -u php-src/ext/pcre/tests/ungreedy.phpt:1.2 php-src/ext/pcre/tests/ungreedy.phpt:1.3
--- php-src/ext/pcre/tests/ungreedy.phpt:1.2 Wed Jun 14 18:07:45 2006
+++ php-src/ext/pcre/tests/ungreedy.phpt Tue Aug 29 22:12:31 2006
@@ -29,3 +29,19 @@
[0]=>
string(4) "<aa>"
}
+--UEXPECT--
+int(1)
+array(1) {
+ [0]=>
+ unicode(14) "<aa> <bb> <cc>"
+}
+int(1)
+array(1) {
+ [0]=>
+ unicode(4) "<aa>"
+}
+int(1)
+array(1) {
+ [0]=>
+ unicode(4) "<aa>"
+}