cvs: php-src(PHP_5_1) /ext/tokenizer/tests 002.phpt 003.phpt bug26463.phpt

iliaa Thu Apr 20 01:06:58 2006 UTC Modified files: (Branch: PHP_5_1) /php-src/ext/tokenizer/tests 002.phpt 003.phpt bug26463.phpt Log: Fixed tokenizer tests

http://cvs.php.net/viewcvs.cgi/php-src/ext/tokenizer/tests/002.phpt?r1=1.1.2.3&r2=1.1.2.4&diff_format=u Index: php-src/ext/tokenizer/tests/002.phpt diff -u php-src/ext/tokenizer/tests/002.phpt:1.1.2.3 php-src/ext/tokenizer/tests/002.phpt:1.1.2.4 --- php-src/ext/tokenizer/tests/002.phpt:1.1.2.3 Wed Jan 4 10:31:58 2006 +++ php-src/ext/tokenizer/tests/002.phpt Thu Apr 20 01:06:58 2006 @@ -21,40 +21,40 @@ echo "Done\n"; ?> ---EXPECT-- +--EXPECTF-- array(49) { [0]=> array(2) { [0]=> - int(367) + int(%d) [1]=> string(2) "<?" } [1]=> array(2) { [0]=> - int(370) + int(%d) [1]=> string(1) " " } [2]=> array(2) { [0]=> - int(316) + int(%d) [1]=> string(4) "echo" } [3]=> array(2) { [0]=> - int(370) + int(%d) [1]=> string(1) " " } [4]=> array(2) { [0]=> - int(305) + int(%d) [1]=> string(1) "1" } @@ -63,21 +63,21 @@ [6]=> array(2) { [0]=> - int(370) + int(%d) [1]=> string(1) " " } [7]=> array(2) { [0]=> - int(301) + int(%d) [1]=> string(2) "if" } [8]=> array(2) { [0]=> - int(370) + int(%d) [1]=> string(1) " " } @@ -86,7 +86,7 @@ [10]=> array(2) { [0]=> - int(349) + int(%d) [1]=> string(5) "isset" } @@ -95,7 +95,7 @@ [12]=> array(2) { [0]=> - int(309) + int(%d) [1]=> string(2) "$a" } @@ -106,28 +106,28 @@ [15]=> array(2) { [0]=> - int(370) + int(%d) [1]=> string(1) " " } [16]=> array(2) { [0]=> - int(266) + int(%d) [1]=> string(5) "print" } [17]=> array(2) { [0]=> - int(370) + int(%d) [1]=> string(1) " " } [18]=> array(2) { [0]=> - int(309) + int(%d) [1]=> string(2) "$a" } @@ -136,7 +136,7 @@ [20]=> array(2) { [0]=> - int(305) + int(%d) [1]=> string(1) "1" } @@ -145,21 +145,21 @@ [22]=> array(2) { [0]=> - int(370) + int(%d) [1]=> string(1) " " } [23]=> array(2) { [0]=> - int(309) + int(%d) [1]=> string(2) "$a" } [24]=> array(2) { [0]=> - int(297) + int(%d) [1]=> string(2) "++" } @@ -168,21 +168,21 @@ [26]=> array(2) { [0]=> - int(370) + int(%d) [1]=> string(1) " " } [27]=> array(2) { [0]=> - int(309) + int(%d) [1]=> string(2) "$a" } [28]=> array(2) { [0]=> - int(296) + int(%d) [1]=> string(2) "--" } @@ -191,42 +191,42 @@ [30]=> array(2) { [0]=> - int(370) + int(%d) [1]=> string(1) " " } [31]=> array(2) { [0]=> - int(309) + int(%d) [1]=> string(2) "$a" } [32]=> array(2) { [0]=> - int(370) + int(%d) [1]=> string(1) " " } [33]=> array(2) { [0]=> - int(283) + int(%d) [1]=> string(2) "==" } [34]=> array(2) { [0]=> - int(370) + int(%d) [1]=> string(1) " " } [35]=> array(2) { [0]=> - int(305) + int(%d) [1]=> string(1) "2" } @@ -235,42 +235,42 @@ [37]=> array(2) { [0]=> - int(370) + int(%d) [1]=> string(1) " " } [38]=> array(2) { [0]=> - int(309) + int(%d) [1]=> string(2) "$a" } [39]=> array(2) { [0]=> - int(370) + int(%d) [1]=> string(1) " " } [40]=> array(2) { [0]=> - int(281) + int(%d) [1]=> string(3) "===" } [41]=> array(2) { [0]=> - int(370) + int(%d) [1]=> string(1) " " } [42]=> array(2) { [0]=> - int(305) + int(%d) [1]=> string(1) "2" } @@ -279,14 +279,14 @@ [44]=> array(2) { [0]=> - int(370) + int(%d) [1]=> string(1) " " } [45]=> array(2) { [0]=> - int(304) + int(%d) [1]=> string(5) "endif" } @@ -295,14 +295,14 @@ [47]=> array(2) { [0]=> - int(370) + int(%d) [1]=> string(1) " " } [48]=> array(2) { [0]=> - int(369) + int(%d) [1]=> string(2) "?>" } @@ -311,14 +311,14 @@ [0]=> array(2) { [0]=> - int(367) + int(%d) [1]=> string(6) "<?php " } [1]=> array(2) { [0]=> - int(327) + int(%d) [1]=> string(6) "switch" } @@ -327,7 +327,7 @@ [3]=> array(2) { [0]=> - int(309) + int(%d) [1]=> string(2) "$a" } @@ -336,7 +336,7 @@ [5]=> array(2) { [0]=> - int(370) + int(%d) [1]=> string(1) " " } @@ -345,28 +345,28 @@ [7]=> array(2) { [0]=> - int(370) + int(%d) [1]=> string(1) " " } [8]=> array(2) { [0]=> - int(329) + int(%d) [1]=> string(4) "case" } [9]=> array(2) { [0]=> - int(370) + int(%d) [1]=> string(1) " " } [10]=> array(2) { [0]=> - int(305) + int(%d) [1]=> string(1) "1" } @@ -375,14 +375,14 @@ [12]=> array(2) { [0]=> - int(370) + int(%d) [1]=> string(1) " " } [13]=> array(2) { [0]=> - int(331) + int(%d) [1]=> string(5) "break" } @@ -391,14 +391,14 @@ [15]=> array(2) { [0]=> - int(370) + int(%d) [1]=> string(1) " " } [16]=> array(2) { [0]=> - int(330) + int(%d) [1]=> string(7) "default" } @@ -407,14 +407,14 @@ [18]=> array(2) { [0]=> - int(370) + int(%d) [1]=> string(1) " " } [19]=> array(2) { [0]=> - int(331) + int(%d) [1]=> string(5) "break" } @@ -423,7 +423,7 @@ [21]=> array(2) { [0]=> - int(370) + int(%d) [1]=> string(1) " " } @@ -432,14 +432,14 @@ [23]=> array(2) { [0]=> - int(370) + int(%d) [1]=> string(1) " " } [24]=> array(2) { [0]=> - int(318) + int(%d) [1]=> string(5) "while" } @@ -448,7 +448,7 @@ [26]=> array(2) { [0]=> - int(309) + int(%d) [1]=> string(2) "$a" } @@ -457,7 +457,7 @@ [28]=> array(2) { [0]=> - int(370) + int(%d) [1]=> string(1) " " } @@ -466,14 +466,14 @@ [30]=> array(2) { [0]=> - int(370) + int(%d) [1]=> string(1) " " } [31]=> array(2) { [0]=> - int(300) + int(%d) [1]=> string(4) "exit" } @@ -482,7 +482,7 @@ [33]=> array(2) { [0]=> - int(370) + int(%d) [1]=> string(1) " " } @@ -491,14 +491,14 @@ [35]=> array(2) { [0]=> - int(370) + int(%d) [1]=> string(1) " " } [36]=> array(2) { [0]=> - int(369) + int(%d) [1]=> string(2) "?>" } @@ -507,42 +507,42 @@ [0]=> array(2) { [0]=> - int(367) + int(%d) [1]=> string(2) "<?" } [1]=> array(2) { [0]=> - int(370) + int(%d) [1]=> string(1) " " } [2]=> array(2) { [0]=> - int(365) + int(%d) [1]=> string(13) "/* comment */" } [3]=> array(2) { [0]=> - int(370) + int(%d) [1]=> string(1) " " } [4]=> array(2) { [0]=> - int(301) + int(%d) [1]=> string(2) "if" } [5]=> array(2) { [0]=> - int(370) + int(%d) [1]=> string(1) " " } @@ -551,35 +551,35 @@ [7]=> array(2) { [0]=> - int(305) + int(%d) [1]=> string(1) "1" } [8]=> array(2) { [0]=> - int(370) + int(%d) [1]=> string(1) " " } [9]=> array(2) { [0]=> - int(278) + int(%d) [1]=> string(2) "||" } [10]=> array(2) { [0]=> - int(370) + int(%d) [1]=> string(1) " " } [11]=> array(2) { [0]=> - int(305) + int(%d) [1]=> string(1) "2" } @@ -588,7 +588,7 @@ [13]=> array(2) { [0]=> - int(370) + int(%d) [1]=> string(1) " " } @@ -597,7 +597,7 @@ [15]=> array(2) { [0]=> - int(370) + int(%d) [1]=> string(1) " " } @@ -606,21 +606,21 @@ [17]=> array(2) { [0]=> - int(370) + int(%d) [1]=> string(1) " " } [18]=> array(2) { [0]=> - int(309) + int(%d) [1]=> string(2) "$a" } [19]=> array(2) { [0]=> - int(370) + int(%d) [1]=> string(1) " " } @@ -629,21 +629,21 @@ [21]=> array(2) { [0]=> - int(370) + int(%d) [1]=> string(1) " " } [22]=> array(2) { [0]=> - int(305) + int(%d) [1]=> string(1) "2" } [23]=> array(2) { [0]=> - int(370) + int(%d) [1]=> string(1) " " } @@ -652,14 +652,14 @@ [25]=> array(2) { [0]=> - int(370) + int(%d) [1]=> string(1) " " } [26]=> array(2) { [0]=> - int(305) + int(%d) [1]=> string(1) "1" } @@ -668,21 +668,21 @@ [28]=> array(2) { [0]=> - int(370) + int(%d) [1]=> string(1) " " } [29]=> array(2) { [0]=> - int(309) + int(%d) [1]=> string(2) "$b" } [30]=> array(2) { [0]=> - int(370) + int(%d) [1]=> string(1) " " } @@ -691,14 +691,14 @@ [32]=> array(2) { [0]=> - int(370) + int(%d) [1]=> string(1) " " } [33]=> array(2) { [0]=> - int(305) + int(%d) [1]=> string(1) "3" } @@ -707,7 +707,7 @@ [35]=> array(2) { [0]=> - int(305) + int(%d) [1]=> string(1) "2" } @@ -716,21 +716,21 @@ [37]=> array(2) { [0]=> - int(370) + int(%d) [1]=> string(1) " " } [38]=> array(2) { [0]=> - int(309) + int(%d) [1]=> string(2) "$c" } [39]=> array(2) { [0]=> - int(370) + int(%d) [1]=> string(1) " " } @@ -739,14 +739,14 @@ [41]=> array(2) { [0]=> - int(370) + int(%d) [1]=> string(1) " " } [42]=> array(2) { [0]=> - int(305) + int(%d) [1]=> string(1) "4" } @@ -755,7 +755,7 @@ [44]=> array(2) { [0]=> - int(305) + int(%d) [1]=> string(1) "2" } @@ -764,14 +764,14 @@ [46]=> array(2) { [0]=> - int(370) + int(%d) [1]=> string(1) " " } [47]=> array(2) { [0]=> - int(369) + int(%d) [1]=> string(2) "?>" } @@ -780,7 +780,7 @@ [0]=> array(2) { [0]=> - int(311) + int(%d) [1]=> string(17) "wrong syntax here" } http://cvs.php.net/viewcvs.cgi/php-src/ext/tokenizer/tests/003.phpt?r1=1.1.2.2&r2=1.1.2.3&diff_format=u Index: php-src/ext/tokenizer/tests/003.phpt diff -u php-src/ext/tokenizer/tests/003.phpt:1.1.2.2 php-src/ext/tokenizer/tests/003.phpt:1.1.2.3 --- php-src/ext/tokenizer/tests/003.phpt:1.1.2.2 Wed Dec 21 11:42:06 2005 +++ php-src/ext/tokenizer/tests/003.phpt Thu Apr 20 01:06:58 2006 @@ -25,7 +25,7 @@ [0]=> array(2) { [0]=> - int(311) + int(%d) [1]=> string(1) "0" } @@ -34,7 +34,7 @@ [0]=> array(2) { [0]=> - int(311) + int(%d) [1]=> string(2) "-1" } http://cvs.php.net/viewcvs.cgi/php-src/ext/tokenizer/tests/bug26463.phpt?r1=1.2.4.2&r2=1.2.4.3&diff_format=u Index: php-src/ext/tokenizer/tests/bug26463.phpt diff -u php-src/ext/tokenizer/tests/bug26463.phpt:1.2.4.2 php-src/ext/tokenizer/tests/bug26463.phpt:1.2.4.3 --- php-src/ext/tokenizer/tests/bug26463.phpt:1.2.4.2 Wed Dec 21 11:42:06 2005 +++ php-src/ext/tokenizer/tests/bug26463.phpt Thu Apr 20 01:06:58 2006 @@ -20,7 +20,7 @@ [0]=> array(2) { [0]=> - int(367) + int(%d) [1]=> string(6) "<?php " @@ -28,7 +28,7 @@ [1]=> array(2) { [0]=> - int(309) + int(%d) [1]=> string(2) "$x" } @@ -37,7 +37,7 @@ [3]=> array(2) { [0]=> - int(371) + int(%d) [1]=> string(6) "<<<DD " @@ -45,7 +45,7 @@ [4]=> array(2) { [0]=> - int(307) + int(%d) [1]=> string(13) "jhdsjkfhjdsh " @@ -53,14 +53,14 @@ [5]=> array(2) { [0]=> - int(372) + int(%d) [1]=> string(2) "DD" } [6]=> array(2) { [0]=> - int(370) + int(%d) [1]=> string(1) " " @@ -70,7 +70,7 @@ [8]=> array(2) { [0]=> - int(315) + int(%d) [1]=> string(2) """" } @@ -79,7 +79,7 @@ [10]=> array(2) { [0]=> - int(370) + int(%d) [1]=> string(1) " " @@ -87,7 +87,7 @@ [11]=> array(2) { [0]=> - int(309) + int(%d) [1]=> string(2) "$a" } @@ -96,7 +96,7 @@ [13]=> array(2) { [0]=> - int(371) + int(%d) [1]=> string(8) "<<<DDDD " @@ -104,7 +104,7 @@ [14]=> array(2) { [0]=> - int(307) + int(%d) [1]=> string(13) "jhdsjkfhjdsh " @@ -112,7 +112,7 @@ [15]=> array(2) { [0]=> - int(372) + int(%d) [1]=> string(4) "DDDD" } @@ -121,7 +121,7 @@ [17]=> array(2) { [0]=> - int(370) + int(%d) [1]=> string(1) " " @@ -129,7 +129,7 @@ [18]=> array(2) { [0]=> - int(369) + int(%d) [1]=> string(2) "?>" }