From: Antony Dovgal Date: Tue, 20 Jun 2006 18:14:12 +0000 (+0000) Subject: fix tests X-Git-Tag: RELEASE_1_0_0RC1~2685 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=438d74568dac8e936f5d4975a2fc7b0978c9d213;p=php fix tests --- diff --git a/ext/tokenizer/tests/001.phpt b/ext/tokenizer/tests/001.phpt index b1c8db1909..a8ab6bd523 100644 --- a/ext/tokenizer/tests/001.phpt +++ b/ext/tokenizer/tests/001.phpt @@ -255,7 +255,136 @@ T_HALT_COMPILER UNKNOWN UNKNOWN -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, string given in %s on line %d + + +Warning: token_name() expects parameter 1 to be long, array given in %s on line %d + +Done +--UEXPECTF-- +T_INCLUDE +T_INCLUDE_ONCE +T_EVAL +T_REQUIRE +T_REQUIRE_ONCE +T_LOGICAL_OR +T_LOGICAL_XOR +T_LOGICAL_AND +T_PRINT +T_PLUS_EQUAL +T_MINUS_EQUAL +T_MUL_EQUAL +T_DIV_EQUAL +T_CONCAT_EQUAL +T_MOD_EQUAL +T_AND_EQUAL +T_OR_EQUAL +T_XOR_EQUAL +T_SL_EQUAL +T_SR_EQUAL +T_BOOLEAN_OR +T_BOOLEAN_AND +T_IS_EQUAL +T_IS_NOT_EQUAL +T_IS_IDENTICAL +T_IS_NOT_IDENTICAL +T_IS_SMALLER_OR_EQUAL +T_IS_GREATER_OR_EQUAL +T_SL +T_SR +T_INC +T_DEC +T_INT_CAST +T_DOUBLE_CAST +T_STRING_CAST +T_ARRAY_CAST +T_OBJECT_CAST +T_BOOL_CAST +T_UNSET_CAST +T_NEW +T_EXIT +T_IF +T_ELSEIF +T_ELSE +T_ENDIF +T_LNUMBER +T_DNUMBER +T_STRING +T_STRING_VARNAME +T_VARIABLE +T_NUM_STRING +T_INLINE_HTML +T_CHARACTER +T_BAD_CHARACTER +T_ENCAPSED_AND_WHITESPACE +T_CONSTANT_ENCAPSED_STRING +T_ECHO +T_DO +T_WHILE +T_ENDWHILE +T_FOR +T_ENDFOR +T_FOREACH +T_ENDFOREACH +T_DECLARE +T_ENDDECLARE +T_AS +T_SWITCH +T_ENDSWITCH +T_CASE +T_DEFAULT +T_BREAK +T_CONTINUE +T_FUNCTION +T_CONST +T_RETURN +T_USE +T_GLOBAL +T_STATIC +T_VAR +T_UNSET +T_ISSET +T_EMPTY +T_CLASS +T_EXTENDS +T_INTERFACE +T_IMPLEMENTS +T_OBJECT_OPERATOR +T_DOUBLE_ARROW +T_LIST +T_ARRAY +T_CLASS_C +T_FUNC_C +T_METHOD_C +T_LINE +T_FILE +T_COMMENT +T_DOC_COMMENT +T_OPEN_TAG +T_OPEN_TAG_WITH_ECHO +T_CLOSE_TAG +T_WHITESPACE +T_START_HEREDOC +T_END_HEREDOC +T_DOLLAR_OPEN_CURLY_BRACES +T_CURLY_OPEN +T_DOUBLE_COLON +T_DOUBLE_COLON +T_ABSTRACT +T_CATCH +T_FINAL +T_INSTANCEOF +T_PRIVATE +T_PROTECTED +T_PUBLIC +T_THROW +T_TRY +T_CLONE +T_HALT_COMPILER +UNKNOWN +UNKNOWN + +Warning: token_name() expects parameter 1 to be long, Unicode string given in %s on line %d Warning: token_name() expects parameter 1 to be long, array given in %s on line %d diff --git a/ext/tokenizer/tests/002.phpt b/ext/tokenizer/tests/002.phpt index 15769ecabb..510153208e 100644 --- a/ext/tokenizer/tests/002.phpt +++ b/ext/tokenizer/tests/002.phpt @@ -24,35 +24,35 @@ array(49) { [0]=> array(2) { [0]=> - int(369) + int(370) [1]=> string(2) " array(2) { [0]=> - int(372) + int(373) [1]=> string(1) " " } [2]=> array(2) { [0]=> - int(317) + int(318) [1]=> string(4) "echo" } [3]=> array(2) { [0]=> - int(372) + int(373) [1]=> string(1) " " } [4]=> array(2) { [0]=> - int(306) + int(307) [1]=> string(1) "1" } @@ -61,21 +61,21 @@ array(49) { [6]=> array(2) { [0]=> - int(372) + int(373) [1]=> string(1) " " } [7]=> array(2) { [0]=> - int(302) + int(303) [1]=> string(2) "if" } [8]=> array(2) { [0]=> - int(372) + int(373) [1]=> string(1) " " } @@ -84,7 +84,7 @@ array(49) { [10]=> array(2) { [0]=> - int(351) + int(352) [1]=> string(5) "isset" } @@ -93,7 +93,7 @@ array(49) { [12]=> array(2) { [0]=> - int(310) + int(311) [1]=> string(2) "$a" } @@ -104,7 +104,7 @@ array(49) { [15]=> array(2) { [0]=> - int(372) + int(373) [1]=> string(1) " " } @@ -118,14 +118,14 @@ array(49) { [17]=> array(2) { [0]=> - int(372) + int(373) [1]=> string(1) " " } [18]=> array(2) { [0]=> - int(310) + int(311) [1]=> string(2) "$a" } @@ -134,7 +134,7 @@ array(49) { [20]=> array(2) { [0]=> - int(306) + int(307) [1]=> string(1) "1" } @@ -143,21 +143,21 @@ array(49) { [22]=> array(2) { [0]=> - int(372) + int(373) [1]=> string(1) " " } [23]=> array(2) { [0]=> - int(310) + int(311) [1]=> string(2) "$a" } [24]=> array(2) { [0]=> - int(298) + int(299) [1]=> string(2) "++" } @@ -166,21 +166,21 @@ array(49) { [26]=> array(2) { [0]=> - int(372) + int(373) [1]=> string(1) " " } [27]=> array(2) { [0]=> - int(310) + int(311) [1]=> string(2) "$a" } [28]=> array(2) { [0]=> - int(297) + int(298) [1]=> string(2) "--" } @@ -189,21 +189,21 @@ array(49) { [30]=> array(2) { [0]=> - int(372) + int(373) [1]=> string(1) " " } [31]=> array(2) { [0]=> - int(310) + int(311) [1]=> string(2) "$a" } [32]=> array(2) { [0]=> - int(372) + int(373) [1]=> string(1) " " } @@ -217,14 +217,14 @@ array(49) { [34]=> array(2) { [0]=> - int(372) + int(373) [1]=> string(1) " " } [35]=> array(2) { [0]=> - int(306) + int(307) [1]=> string(1) "2" } @@ -233,21 +233,21 @@ array(49) { [37]=> array(2) { [0]=> - int(372) + int(373) [1]=> string(1) " " } [38]=> array(2) { [0]=> - int(310) + int(311) [1]=> string(2) "$a" } [39]=> array(2) { [0]=> - int(372) + int(373) [1]=> string(1) " " } @@ -261,14 +261,14 @@ array(49) { [41]=> array(2) { [0]=> - int(372) + int(373) [1]=> string(1) " " } [42]=> array(2) { [0]=> - int(306) + int(307) [1]=> string(1) "2" } @@ -277,14 +277,14 @@ array(49) { [44]=> array(2) { [0]=> - int(372) + int(373) [1]=> string(1) " " } [45]=> array(2) { [0]=> - int(305) + int(306) [1]=> string(5) "endif" } @@ -293,14 +293,14 @@ array(49) { [47]=> array(2) { [0]=> - int(372) + int(373) [1]=> string(1) " " } [48]=> array(2) { [0]=> - int(371) + int(372) [1]=> string(2) "?>" } @@ -309,14 +309,14 @@ array(37) { [0]=> array(2) { [0]=> - int(369) + int(370) [1]=> string(6) " array(2) { [0]=> - int(328) + int(329) [1]=> string(6) "switch" } @@ -325,7 +325,7 @@ array(37) { [3]=> array(2) { [0]=> - int(310) + int(311) [1]=> string(2) "$a" } @@ -334,7 +334,7 @@ array(37) { [5]=> array(2) { [0]=> - int(372) + int(373) [1]=> string(1) " " } @@ -343,28 +343,28 @@ array(37) { [7]=> array(2) { [0]=> - int(372) + int(373) [1]=> string(1) " " } [8]=> array(2) { [0]=> - int(330) + int(331) [1]=> string(4) "case" } [9]=> array(2) { [0]=> - int(372) + int(373) [1]=> string(1) " " } [10]=> array(2) { [0]=> - int(306) + int(307) [1]=> string(1) "1" } @@ -373,14 +373,14 @@ array(37) { [12]=> array(2) { [0]=> - int(372) + int(373) [1]=> string(1) " " } [13]=> array(2) { [0]=> - int(332) + int(333) [1]=> string(5) "break" } @@ -389,14 +389,14 @@ array(37) { [15]=> array(2) { [0]=> - int(372) + int(373) [1]=> string(1) " " } [16]=> array(2) { [0]=> - int(331) + int(332) [1]=> string(7) "default" } @@ -405,14 +405,14 @@ array(37) { [18]=> array(2) { [0]=> - int(372) + int(373) [1]=> string(1) " " } [19]=> array(2) { [0]=> - int(332) + int(333) [1]=> string(5) "break" } @@ -421,7 +421,7 @@ array(37) { [21]=> array(2) { [0]=> - int(372) + int(373) [1]=> string(1) " " } @@ -430,14 +430,14 @@ array(37) { [23]=> array(2) { [0]=> - int(372) + int(373) [1]=> string(1) " " } [24]=> array(2) { [0]=> - int(319) + int(320) [1]=> string(5) "while" } @@ -446,7 +446,7 @@ array(37) { [26]=> array(2) { [0]=> - int(310) + int(311) [1]=> string(2) "$a" } @@ -455,7 +455,7 @@ array(37) { [28]=> array(2) { [0]=> - int(372) + int(373) [1]=> string(1) " " } @@ -464,14 +464,14 @@ array(37) { [30]=> array(2) { [0]=> - int(372) + int(373) [1]=> string(1) " " } [31]=> array(2) { [0]=> - int(301) + int(302) [1]=> string(4) "exit" } @@ -480,7 +480,7 @@ array(37) { [33]=> array(2) { [0]=> - int(372) + int(373) [1]=> string(1) " " } @@ -489,14 +489,14 @@ array(37) { [35]=> array(2) { [0]=> - int(372) + int(373) [1]=> string(1) " " } [36]=> array(2) { [0]=> - int(371) + int(372) [1]=> string(2) "?>" } @@ -505,42 +505,42 @@ array(48) { [0]=> array(2) { [0]=> - int(369) + int(370) [1]=> string(2) " array(2) { [0]=> - int(372) + int(373) [1]=> string(1) " " } [2]=> array(2) { [0]=> - int(367) + int(368) [1]=> string(13) "/* comment */" } [3]=> array(2) { [0]=> - int(372) + int(373) [1]=> string(1) " " } [4]=> array(2) { [0]=> - int(302) + int(303) [1]=> string(2) "if" } [5]=> array(2) { [0]=> - int(372) + int(373) [1]=> string(1) " " } @@ -549,14 +549,14 @@ array(48) { [7]=> array(2) { [0]=> - int(306) + int(307) [1]=> string(1) "1" } [8]=> array(2) { [0]=> - int(372) + int(373) [1]=> string(1) " " } @@ -570,14 +570,14 @@ array(48) { [10]=> array(2) { [0]=> - int(372) + int(373) [1]=> string(1) " " } [11]=> array(2) { [0]=> - int(306) + int(307) [1]=> string(1) "2" } @@ -586,7 +586,7 @@ array(48) { [13]=> array(2) { [0]=> - int(372) + int(373) [1]=> string(1) " " } @@ -595,7 +595,7 @@ array(48) { [15]=> array(2) { [0]=> - int(372) + int(373) [1]=> string(1) " " } @@ -604,21 +604,21 @@ array(48) { [17]=> array(2) { [0]=> - int(372) + int(373) [1]=> string(1) " " } [18]=> array(2) { [0]=> - int(310) + int(311) [1]=> string(2) "$a" } [19]=> array(2) { [0]=> - int(372) + int(373) [1]=> string(1) " " } @@ -627,21 +627,21 @@ array(48) { [21]=> array(2) { [0]=> - int(372) + int(373) [1]=> string(1) " " } [22]=> array(2) { [0]=> - int(306) + int(307) [1]=> string(1) "2" } [23]=> array(2) { [0]=> - int(372) + int(373) [1]=> string(1) " " } @@ -650,14 +650,14 @@ array(48) { [25]=> array(2) { [0]=> - int(372) + int(373) [1]=> string(1) " " } [26]=> array(2) { [0]=> - int(306) + int(307) [1]=> string(1) "1" } @@ -666,21 +666,21 @@ array(48) { [28]=> array(2) { [0]=> - int(372) + int(373) [1]=> string(1) " " } [29]=> array(2) { [0]=> - int(310) + int(311) [1]=> string(2) "$b" } [30]=> array(2) { [0]=> - int(372) + int(373) [1]=> string(1) " " } @@ -689,14 +689,14 @@ array(48) { [32]=> array(2) { [0]=> - int(372) + int(373) [1]=> string(1) " " } [33]=> array(2) { [0]=> - int(306) + int(307) [1]=> string(1) "3" } @@ -705,7 +705,7 @@ array(48) { [35]=> array(2) { [0]=> - int(306) + int(307) [1]=> string(1) "2" } @@ -714,21 +714,21 @@ array(48) { [37]=> array(2) { [0]=> - int(372) + int(373) [1]=> string(1) " " } [38]=> array(2) { [0]=> - int(310) + int(311) [1]=> string(2) "$c" } [39]=> array(2) { [0]=> - int(372) + int(373) [1]=> string(1) " " } @@ -737,14 +737,14 @@ array(48) { [41]=> array(2) { [0]=> - int(372) + int(373) [1]=> string(1) " " } [42]=> array(2) { [0]=> - int(306) + int(307) [1]=> string(1) "4" } @@ -753,7 +753,7 @@ array(48) { [44]=> array(2) { [0]=> - int(306) + int(307) [1]=> string(1) "2" } @@ -762,14 +762,14 @@ array(48) { [46]=> array(2) { [0]=> - int(372) + int(373) [1]=> string(1) " " } [47]=> array(2) { [0]=> - int(371) + int(372) [1]=> string(2) "?>" } @@ -778,7 +778,7 @@ array(1) { [0]=> array(2) { [0]=> - int(312) + int(313) [1]=> string(17) "wrong syntax here" } diff --git a/ext/tokenizer/tests/003.phpt b/ext/tokenizer/tests/003.phpt index 88b458a720..fc34308634 100644 --- a/ext/tokenizer/tests/003.phpt +++ b/ext/tokenizer/tests/003.phpt @@ -14,10 +14,10 @@ var_dump(token_get_all(-1)); echo "Done\n"; ?> --EXPECTF-- -Warning: token_get_all() expects parameter 1 to be native string, array given in %s on line %d +Warning: token_get_all() expects parameter 1 to be string, array given in %s on line %d NULL -Warning: token_get_all() expects parameter 1 to be native string, object given in %s on line %d +Warning: token_get_all() expects parameter 1 to be string, object given in %s on line %d NULL array(0) { } @@ -25,7 +25,7 @@ array(1) { [0]=> array(2) { [0]=> - int(312) + int(313) [1]=> string(1) "0" } @@ -34,7 +34,34 @@ array(1) { [0]=> array(2) { [0]=> - int(312) + int(313) + [1]=> + string(2) "-1" + } +} +Done +--UEXPECTF-- +Warning: token_get_all() expects parameter 1 to be binary string, array given in %s on line %d +NULL + +Warning: token_get_all() expects parameter 1 to be binary string, object given in %s on line %d +NULL +array(0) { +} +array(1) { + [0]=> + array(2) { + [0]=> + int(313) + [1]=> + string(1) "0" + } +} +array(1) { + [0]=> + array(2) { + [0]=> + int(313) [1]=> string(2) "-1" } diff --git a/ext/tokenizer/tests/bug26463.phpt b/ext/tokenizer/tests/bug26463.phpt index 598fa7d122..3c53a404e1 100644 --- a/ext/tokenizer/tests/bug26463.phpt +++ b/ext/tokenizer/tests/bug26463.phpt @@ -20,7 +20,7 @@ array(19) { [0]=> array(2) { [0]=> - int(369) + int(370) [1]=> string(6) " array(2) { [0]=> - int(310) + int(311) [1]=> string(2) "$x" } @@ -37,7 +37,7 @@ array(19) { [3]=> array(2) { [0]=> - int(373) + int(374) [1]=> string(6) "<<
array(2) { [0]=> - int(308) + int(309) [1]=> string(13) "jhdsjkfhjdsh " @@ -53,14 +53,14 @@ array(19) { [5]=> array(2) { [0]=> - int(374) + int(375) [1]=> string(2) "DD" } [6]=> array(2) { [0]=> - int(372) + int(373) [1]=> string(1) " " @@ -70,7 +70,7 @@ array(19) { [8]=> array(2) { [0]=> - int(316) + int(317) [1]=> string(2) """" } @@ -79,7 +79,7 @@ array(19) { [10]=> array(2) { [0]=> - int(372) + int(373) [1]=> string(1) " " @@ -87,7 +87,7 @@ array(19) { [11]=> array(2) { [0]=> - int(310) + int(311) [1]=> string(2) "$a" } @@ -96,7 +96,7 @@ array(19) { [13]=> array(2) { [0]=> - int(373) + int(374) [1]=> string(8) "<< array(2) { [0]=> - int(308) + int(309) [1]=> string(13) "jhdsjkfhjdsh " @@ -112,24 +112,143 @@ array(19) { [15]=> array(2) { [0]=> - int(374) + int(375) [1]=> string(4) "DDDD" } [16]=> string(1) ";" [17]=> + array(2) { + [0]=> + int(373) + [1]=> + string(1) " +" + } + [18]=> array(2) { [0]=> int(372) [1]=> + string(2) "?>" + } +} +--UEXPECTF-- +array(19) { + [0]=> + array(2) { + [0]=> + int(370) + [1]=> + string(6) " + array(2) { + [0]=> + int(311) + [1]=> + string(2) "$x" + } + [2]=> + string(1) "=" + [3]=> + array(2) { + [0]=> + int(374) + [1]=> + string(6) "<<
+ array(2) { + [0]=> + int(309) + [1]=> + string(13) "jhdsjkfhjdsh +" + } + [5]=> + array(2) { + [0]=> + int(375) + [1]=> + string(2) "DD" + } + [6]=> + array(2) { + [0]=> + int(373) + [1]=> + string(1) " +" + } + [7]=> + string(1) "." + [8]=> + array(2) { + [0]=> + int(317) + [1]=> + string(2) """" + } + [9]=> + string(1) ";" + [10]=> + array(2) { + [0]=> + int(373) + [1]=> + string(1) " +" + } + [11]=> + array(2) { + [0]=> + int(311) + [1]=> + string(2) "$a" + } + [12]=> + string(1) "=" + [13]=> + array(2) { + [0]=> + int(374) + [1]=> + string(8) "<< + array(2) { + [0]=> + int(309) + [1]=> + string(13) "jhdsjkfhjdsh +" + } + [15]=> + array(2) { + [0]=> + int(375) + [1]=> + string(4) "DDDD" + } + [16]=> + string(1) ";" + [17]=> + array(2) { + [0]=> + int(373) + [1]=> string(1) " " } [18]=> array(2) { [0]=> - int(371) + int(372) [1]=> string(2) "?>" }