tony2001 Fri Dec 23 13:24:17 2005 EDT
Modified files:
/php-src/ext/tokenizer/tests 001.phpt 002.phpt 003.phpt
bug26463.phpt
Log:
fix tests
http://cvs.php.net/viewcvs.cgi/php-src/ext/tokenizer/tests/001.phpt?r1=1.3&r2=1.4&diff_format=u
Index: php-src/ext/tokenizer/tests/001.phpt
diff -u php-src/ext/tokenizer/tests/001.phpt:1.3
php-src/ext/tokenizer/tests/001.phpt:1.4
--- php-src/ext/tokenizer/tests/001.phpt:1.3 Wed Dec 21 11:43:24 2005
+++ php-src/ext/tokenizer/tests/001.phpt Fri Dec 23 13:24:17 2005
@@ -255,7 +255,7 @@
UNKNOWN
UNKNOWN
-Warning: token_name() expects parameter 1 to be long, string given in %s on
line %d
+Warning: token_name() expects parameter 1 to be long, %s string given in %s on
line %d
Warning: token_name() expects parameter 1 to be long, array given in %s on
line %d
http://cvs.php.net/viewcvs.cgi/php-src/ext/tokenizer/tests/002.phpt?r1=1.3&r2=1.4&diff_format=u
Index: php-src/ext/tokenizer/tests/002.phpt
diff -u php-src/ext/tokenizer/tests/002.phpt:1.3
php-src/ext/tokenizer/tests/002.phpt:1.4
--- php-src/ext/tokenizer/tests/002.phpt:1.3 Wed Dec 21 11:43:24 2005
+++ php-src/ext/tokenizer/tests/002.phpt Fri Dec 23 13:24:17 2005
@@ -24,35 +24,35 @@
[0]=>
array(2) {
[0]=>
- int(367)
+ int(369)
[1]=>
string(2) "<?"
}
[1]=>
array(2) {
[0]=>
- int(370)
+ int(372)
[1]=>
string(1) " "
}
[2]=>
array(2) {
[0]=>
- int(316)
+ int(318)
[1]=>
string(4) "echo"
}
[3]=>
array(2) {
[0]=>
- int(370)
+ int(372)
[1]=>
string(1) " "
}
[4]=>
array(2) {
[0]=>
- int(305)
+ int(307)
[1]=>
string(1) "1"
}
@@ -61,21 +61,21 @@
[6]=>
array(2) {
[0]=>
- int(370)
+ int(372)
[1]=>
string(1) " "
}
[7]=>
array(2) {
[0]=>
- int(301)
+ int(303)
[1]=>
string(2) "if"
}
[8]=>
array(2) {
[0]=>
- int(370)
+ int(372)
[1]=>
string(1) " "
}
@@ -84,7 +84,7 @@
[10]=>
array(2) {
[0]=>
- int(349)
+ int(351)
[1]=>
string(5) "isset"
}
@@ -93,7 +93,7 @@
[12]=>
array(2) {
[0]=>
- int(309)
+ int(311)
[1]=>
string(2) "$a"
}
@@ -104,7 +104,7 @@
[15]=>
array(2) {
[0]=>
- int(370)
+ int(372)
[1]=>
string(1) " "
}
@@ -118,14 +118,14 @@
[17]=>
array(2) {
[0]=>
- int(370)
+ int(372)
[1]=>
string(1) " "
}
[18]=>
array(2) {
[0]=>
- int(309)
+ int(311)
[1]=>
string(2) "$a"
}
@@ -134,7 +134,7 @@
[20]=>
array(2) {
[0]=>
- int(305)
+ int(307)
[1]=>
string(1) "1"
}
@@ -143,21 +143,21 @@
[22]=>
array(2) {
[0]=>
- int(370)
+ int(372)
[1]=>
string(1) " "
}
[23]=>
array(2) {
[0]=>
- int(309)
+ int(311)
[1]=>
string(2) "$a"
}
[24]=>
array(2) {
[0]=>
- int(297)
+ int(299)
[1]=>
string(2) "++"
}
@@ -166,21 +166,21 @@
[26]=>
array(2) {
[0]=>
- int(370)
+ int(372)
[1]=>
string(1) " "
}
[27]=>
array(2) {
[0]=>
- int(309)
+ int(311)
[1]=>
string(2) "$a"
}
[28]=>
array(2) {
[0]=>
- int(296)
+ int(298)
[1]=>
string(2) "--"
}
@@ -189,21 +189,21 @@
[30]=>
array(2) {
[0]=>
- int(370)
+ int(372)
[1]=>
string(1) " "
}
[31]=>
array(2) {
[0]=>
- int(309)
+ int(311)
[1]=>
string(2) "$a"
}
[32]=>
array(2) {
[0]=>
- int(370)
+ int(372)
[1]=>
string(1) " "
}
@@ -217,14 +217,14 @@
[34]=>
array(2) {
[0]=>
- int(370)
+ int(372)
[1]=>
string(1) " "
}
[35]=>
array(2) {
[0]=>
- int(305)
+ int(307)
[1]=>
string(1) "2"
}
@@ -233,21 +233,21 @@
[37]=>
array(2) {
[0]=>
- int(370)
+ int(372)
[1]=>
string(1) " "
}
[38]=>
array(2) {
[0]=>
- int(309)
+ int(311)
[1]=>
string(2) "$a"
}
[39]=>
array(2) {
[0]=>
- int(370)
+ int(372)
[1]=>
string(1) " "
}
@@ -261,14 +261,14 @@
[41]=>
array(2) {
[0]=>
- int(370)
+ int(372)
[1]=>
string(1) " "
}
[42]=>
array(2) {
[0]=>
- int(305)
+ int(307)
[1]=>
string(1) "2"
}
@@ -277,14 +277,14 @@
[44]=>
array(2) {
[0]=>
- int(370)
+ int(372)
[1]=>
string(1) " "
}
[45]=>
array(2) {
[0]=>
- int(304)
+ int(306)
[1]=>
string(5) "endif"
}
@@ -293,14 +293,14 @@
[47]=>
array(2) {
[0]=>
- int(370)
+ int(372)
[1]=>
string(1) " "
}
[48]=>
array(2) {
[0]=>
- int(369)
+ int(371)
[1]=>
string(2) "?>"
}
@@ -309,14 +309,14 @@
[0]=>
array(2) {
[0]=>
- int(367)
+ int(369)
[1]=>
string(6) "<?php "
}
[1]=>
array(2) {
[0]=>
- int(327)
+ int(329)
[1]=>
string(6) "switch"
}
@@ -325,7 +325,7 @@
[3]=>
array(2) {
[0]=>
- int(309)
+ int(311)
[1]=>
string(2) "$a"
}
@@ -334,7 +334,7 @@
[5]=>
array(2) {
[0]=>
- int(370)
+ int(372)
[1]=>
string(1) " "
}
@@ -343,28 +343,28 @@
[7]=>
array(2) {
[0]=>
- int(370)
+ int(372)
[1]=>
string(1) " "
}
[8]=>
array(2) {
[0]=>
- int(329)
+ int(331)
[1]=>
string(4) "case"
}
[9]=>
array(2) {
[0]=>
- int(370)
+ int(372)
[1]=>
string(1) " "
}
[10]=>
array(2) {
[0]=>
- int(305)
+ int(307)
[1]=>
string(1) "1"
}
@@ -373,14 +373,14 @@
[12]=>
array(2) {
[0]=>
- int(370)
+ int(372)
[1]=>
string(1) " "
}
[13]=>
array(2) {
[0]=>
- int(331)
+ int(333)
[1]=>
string(5) "break"
}
@@ -389,14 +389,14 @@
[15]=>
array(2) {
[0]=>
- int(370)
+ int(372)
[1]=>
string(1) " "
}
[16]=>
array(2) {
[0]=>
- int(330)
+ int(332)
[1]=>
string(7) "default"
}
@@ -405,14 +405,14 @@
[18]=>
array(2) {
[0]=>
- int(370)
+ int(372)
[1]=>
string(1) " "
}
[19]=>
array(2) {
[0]=>
- int(331)
+ int(333)
[1]=>
string(5) "break"
}
@@ -421,7 +421,7 @@
[21]=>
array(2) {
[0]=>
- int(370)
+ int(372)
[1]=>
string(1) " "
}
@@ -430,14 +430,14 @@
[23]=>
array(2) {
[0]=>
- int(370)
+ int(372)
[1]=>
string(1) " "
}
[24]=>
array(2) {
[0]=>
- int(318)
+ int(320)
[1]=>
string(5) "while"
}
@@ -446,7 +446,7 @@
[26]=>
array(2) {
[0]=>
- int(309)
+ int(311)
[1]=>
string(2) "$a"
}
@@ -455,7 +455,7 @@
[28]=>
array(2) {
[0]=>
- int(370)
+ int(372)
[1]=>
string(1) " "
}
@@ -464,14 +464,14 @@
[30]=>
array(2) {
[0]=>
- int(370)
+ int(372)
[1]=>
string(1) " "
}
[31]=>
array(2) {
[0]=>
- int(300)
+ int(302)
[1]=>
string(4) "exit"
}
@@ -480,7 +480,7 @@
[33]=>
array(2) {
[0]=>
- int(370)
+ int(372)
[1]=>
string(1) " "
}
@@ -489,14 +489,14 @@
[35]=>
array(2) {
[0]=>
- int(370)
+ int(372)
[1]=>
string(1) " "
}
[36]=>
array(2) {
[0]=>
- int(369)
+ int(371)
[1]=>
string(2) "?>"
}
@@ -505,42 +505,42 @@
[0]=>
array(2) {
[0]=>
- int(367)
+ int(369)
[1]=>
string(2) "<?"
}
[1]=>
array(2) {
[0]=>
- int(370)
+ int(372)
[1]=>
string(1) " "
}
[2]=>
array(2) {
[0]=>
- int(365)
+ int(367)
[1]=>
string(13) "/* comment */"
}
[3]=>
array(2) {
[0]=>
- int(370)
+ int(372)
[1]=>
string(1) " "
}
[4]=>
array(2) {
[0]=>
- int(301)
+ int(303)
[1]=>
string(2) "if"
}
[5]=>
array(2) {
[0]=>
- int(370)
+ int(372)
[1]=>
string(1) " "
}
@@ -549,14 +549,14 @@
[7]=>
array(2) {
[0]=>
- int(305)
+ int(307)
[1]=>
string(1) "1"
}
[8]=>
array(2) {
[0]=>
- int(370)
+ int(372)
[1]=>
string(1) " "
}
@@ -570,14 +570,14 @@
[10]=>
array(2) {
[0]=>
- int(370)
+ int(372)
[1]=>
string(1) " "
}
[11]=>
array(2) {
[0]=>
- int(305)
+ int(307)
[1]=>
string(1) "2"
}
@@ -586,7 +586,7 @@
[13]=>
array(2) {
[0]=>
- int(370)
+ int(372)
[1]=>
string(1) " "
}
@@ -595,7 +595,7 @@
[15]=>
array(2) {
[0]=>
- int(370)
+ int(372)
[1]=>
string(1) " "
}
@@ -604,21 +604,21 @@
[17]=>
array(2) {
[0]=>
- int(370)
+ int(372)
[1]=>
string(1) " "
}
[18]=>
array(2) {
[0]=>
- int(309)
+ int(311)
[1]=>
string(2) "$a"
}
[19]=>
array(2) {
[0]=>
- int(370)
+ int(372)
[1]=>
string(1) " "
}
@@ -627,21 +627,21 @@
[21]=>
array(2) {
[0]=>
- int(370)
+ int(372)
[1]=>
string(1) " "
}
[22]=>
array(2) {
[0]=>
- int(305)
+ int(307)
[1]=>
string(1) "2"
}
[23]=>
array(2) {
[0]=>
- int(370)
+ int(372)
[1]=>
string(1) " "
}
@@ -650,14 +650,14 @@
[25]=>
array(2) {
[0]=>
- int(370)
+ int(372)
[1]=>
string(1) " "
}
[26]=>
array(2) {
[0]=>
- int(305)
+ int(307)
[1]=>
string(1) "1"
}
@@ -666,21 +666,21 @@
[28]=>
array(2) {
[0]=>
- int(370)
+ int(372)
[1]=>
string(1) " "
}
[29]=>
array(2) {
[0]=>
- int(309)
+ int(311)
[1]=>
string(2) "$b"
}
[30]=>
array(2) {
[0]=>
- int(370)
+ int(372)
[1]=>
string(1) " "
}
@@ -689,14 +689,14 @@
[32]=>
array(2) {
[0]=>
- int(370)
+ int(372)
[1]=>
string(1) " "
}
[33]=>
array(2) {
[0]=>
- int(305)
+ int(307)
[1]=>
string(1) "3"
}
@@ -705,7 +705,7 @@
[35]=>
array(2) {
[0]=>
- int(305)
+ int(307)
[1]=>
string(1) "2"
}
@@ -714,21 +714,21 @@
[37]=>
array(2) {
[0]=>
- int(370)
+ int(372)
[1]=>
string(1) " "
}
[38]=>
array(2) {
[0]=>
- int(309)
+ int(311)
[1]=>
string(2) "$c"
}
[39]=>
array(2) {
[0]=>
- int(370)
+ int(372)
[1]=>
string(1) " "
}
@@ -737,14 +737,14 @@
[41]=>
array(2) {
[0]=>
- int(370)
+ int(372)
[1]=>
string(1) " "
}
[42]=>
array(2) {
[0]=>
- int(305)
+ int(307)
[1]=>
string(1) "4"
}
@@ -753,7 +753,7 @@
[44]=>
array(2) {
[0]=>
- int(305)
+ int(307)
[1]=>
string(1) "2"
}
@@ -762,14 +762,14 @@
[46]=>
array(2) {
[0]=>
- int(370)
+ int(372)
[1]=>
string(1) " "
}
[47]=>
array(2) {
[0]=>
- int(369)
+ int(371)
[1]=>
string(2) "?>"
}
@@ -778,7 +778,7 @@
[0]=>
array(2) {
[0]=>
- int(311)
+ int(313)
[1]=>
string(17) "wrong syntax here"
}
http://cvs.php.net/viewcvs.cgi/php-src/ext/tokenizer/tests/003.phpt?r1=1.3&r2=1.4&diff_format=u
Index: php-src/ext/tokenizer/tests/003.phpt
diff -u php-src/ext/tokenizer/tests/003.phpt:1.3
php-src/ext/tokenizer/tests/003.phpt:1.4
--- php-src/ext/tokenizer/tests/003.phpt:1.3 Wed Dec 21 11:43:24 2005
+++ php-src/ext/tokenizer/tests/003.phpt Fri Dec 23 13:24:17 2005
@@ -14,10 +14,10 @@
echo "Done\n";
?>
--EXPECTF--
-Warning: token_get_all() expects parameter 1 to be string, array given in %s
on line %d
+Warning: token_get_all() expects parameter 1 to be native string, array given
in %s on line %d
NULL
-Warning: token_get_all() expects parameter 1 to be string, object given in %s
on line %d
+Warning: token_get_all() expects parameter 1 to be native string, object given
in %s on line %d
NULL
array(0) {
}
@@ -25,7 +25,7 @@
[0]=>
array(2) {
[0]=>
- int(311)
+ int(313)
[1]=>
string(1) "0"
}
@@ -34,7 +34,7 @@
[0]=>
array(2) {
[0]=>
- int(311)
+ int(313)
[1]=>
string(2) "-1"
}
http://cvs.php.net/viewcvs.cgi/php-src/ext/tokenizer/tests/bug26463.phpt?r1=1.4&r2=1.5&diff_format=u
Index: php-src/ext/tokenizer/tests/bug26463.phpt
diff -u php-src/ext/tokenizer/tests/bug26463.phpt:1.4
php-src/ext/tokenizer/tests/bug26463.phpt:1.5
--- php-src/ext/tokenizer/tests/bug26463.phpt:1.4 Wed Dec 21 11:43:24 2005
+++ php-src/ext/tokenizer/tests/bug26463.phpt Fri Dec 23 13:24:17 2005
@@ -20,7 +20,7 @@
[0]=>
array(2) {
[0]=>
- int(367)
+ int(369)
[1]=>
string(6) "<?php
"
@@ -28,7 +28,7 @@
[1]=>
array(2) {
[0]=>
- int(309)
+ int(311)
[1]=>
string(2) "$x"
}
@@ -37,7 +37,7 @@
[3]=>
array(2) {
[0]=>
- int(371)
+ int(373)
[1]=>
string(6) "<<<DD
"
@@ -45,7 +45,7 @@
[4]=>
array(2) {
[0]=>
- int(307)
+ int(309)
[1]=>
string(13) "jhdsjkfhjdsh
"
@@ -53,14 +53,14 @@
[5]=>
array(2) {
[0]=>
- int(372)
+ int(374)
[1]=>
string(2) "DD"
}
[6]=>
array(2) {
[0]=>
- int(370)
+ int(372)
[1]=>
string(1) "
"
@@ -70,7 +70,7 @@
[8]=>
array(2) {
[0]=>
- int(315)
+ int(317)
[1]=>
string(2) """"
}
@@ -79,7 +79,7 @@
[10]=>
array(2) {
[0]=>
- int(370)
+ int(372)
[1]=>
string(1) "
"
@@ -87,7 +87,7 @@
[11]=>
array(2) {
[0]=>
- int(309)
+ int(311)
[1]=>
string(2) "$a"
}
@@ -96,7 +96,7 @@
[13]=>
array(2) {
[0]=>
- int(371)
+ int(373)
[1]=>
string(8) "<<<DDDD
"
@@ -104,7 +104,7 @@
[14]=>
array(2) {
[0]=>
- int(307)
+ int(309)
[1]=>
string(13) "jhdsjkfhjdsh
"
@@ -112,7 +112,7 @@
[15]=>
array(2) {
[0]=>
- int(372)
+ int(374)
[1]=>
string(4) "DDDD"
}
@@ -121,7 +121,7 @@
[17]=>
array(2) {
[0]=>
- int(370)
+ int(372)
[1]=>
string(1) "
"
@@ -129,7 +129,7 @@
[18]=>
array(2) {
[0]=>
- int(369)
+ int(371)
[1]=>
string(2) "?>"
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
