diff options
author | Máté Kocsis <kocsismate@woohoolabs.com> | 2020-01-31 17:20:00 +0100 |
---|---|---|
committer | Máté Kocsis <kocsismate@woohoolabs.com> | 2020-01-31 17:47:14 +0100 |
commit | 8b36be268d2ac2ab77162ed540db6aab9c819a83 (patch) | |
tree | 2d9ba44cceb13b3576909576709f0ba8b00dbdaf | |
parent | ee87e86d0afcecd8f604229e810e0e2df22bdeeb (diff) | |
download | php-git-8b36be268d2ac2ab77162ed540db6aab9c819a83.tar.gz |
Fix indentation and whitespaces in tests
In preparation for GH-5074
20 files changed, 174 insertions, 171 deletions
diff --git a/ext/ctype/tests/ctype_space_variation1.phpt b/ext/ctype/tests/ctype_space_variation1.phpt index 73da03ad3d..d3920b69c2 100644 --- a/ext/ctype/tests/ctype_space_variation1.phpt +++ b/ext/ctype/tests/ctype_space_variation1.phpt @@ -31,7 +31,7 @@ class classA // heredoc string $heredoc = <<<EOT - +\t EOT; // get a resource variable @@ -92,7 +92,7 @@ foreach($inputs as $input) { echo "\n-- Iteration $iterator --\n"; var_dump( ctype_space($input) ); $iterator++; -}; +} fclose($fp); diff --git a/ext/intl/tests/msgfmt_format_simple_types_numeric_strings.phpt b/ext/intl/tests/msgfmt_format_simple_types_numeric_strings.phpt index 2c3e3ef8e7..b24ae829bc 100644 --- a/ext/intl/tests/msgfmt_format_simple_types_numeric_strings.phpt +++ b/ext/intl/tests/msgfmt_format_simple_types_numeric_strings.phpt @@ -12,17 +12,17 @@ ini_set("intl.error_level", E_WARNING); //ini_set("intl.default_locale", "nl"); $mf = new MessageFormatter('en_US'," - none {a} - number {b,number} - number integer {c,number,integer} - number currency {d,number,currency} - number percent {e,number,percent} - date {f,date} - time {g,time} - spellout {h,spellout} - ordinal {i,ordinal} - duration {j,duration} - "); + none {a} + number {b,number} + number integer {c,number,integer} + number currency {d,number,currency} + number percent {e,number,percent} + date {f,date} + time {g,time} + spellout {h,spellout} + ordinal {i,ordinal} + duration {j,duration} +"); $ex = "1336317965.5 str"; var_dump($mf->format(array( @@ -41,14 +41,14 @@ var_dump($mf->format(array( ?> --EXPECTF-- string(%d) " - none 1336317965.5 str - number 1,336,317,965.5 - number integer 1,336,317,965 - number currency $1,336,317,965.50 - number percent 133,631,796,550% - date May %d, 2012 - time %d:%d:05 PM - spellout one billion three hundred thirty-six million three hundred seventeen thousand nine hundred sixty-five point five - ordinal 1,336,317,966th - duration 371,199:26:06 - " + none 1336317965.5 str + number 1,336,317,965.5 + number integer 1,336,317,965 + number currency $1,336,317,965.50 + number percent 133,631,796,550% + date May %d, 2012 + time %d:%d:05 PM + spellout one billion three hundred thirty-six million three hundred seventeen thousand nine hundred sixty-five point five + ordinal 1,336,317,966th + duration 371,199:26:06 +" diff --git a/ext/reflection/tests/ReflectionClass_getDocComment_001.phpt b/ext/reflection/tests/ReflectionClass_getDocComment_001.phpt index 9171a8dd25..d4f3ed27f2 100644 --- a/ext/reflection/tests/ReflectionClass_getDocComment_001.phpt +++ b/ext/reflection/tests/ReflectionClass_getDocComment_001.phpt @@ -10,9 +10,9 @@ opcache.save_comments=1 /** - My + My Doc - * Comment + * Comment for A * */ @@ -60,9 +60,9 @@ foreach ($classes as $class) { string(%d) "/** - My + My Doc - * Comment + * Comment for A * */" diff --git a/ext/simplexml/tests/bug38354.phpt b/ext/simplexml/tests/bug38354.phpt index 7bd18fe649..c1147c5d09 100644 --- a/ext/simplexml/tests/bug38354.phpt +++ b/ext/simplexml/tests/bug38354.phpt @@ -7,7 +7,7 @@ Bug #38354 (Unwanted reformatting of XML when using AsXML) $xml = simplexml_load_string( '<code> - <a href="javascript:alert(\'1\');"><strong>Item Two</strong></a> + <a href="javascript:alert(\'1\');"><strong>Item Two</strong></a> </code>' ); @@ -18,9 +18,9 @@ foreach ($xml->xpath("//*") as $element) { echo "Done\n"; ?> --EXPECT-- -string(101) "<?xml version="1.0"?> +string(104) "<?xml version="1.0"?> <code> - <a href="javascript:alert('1');"><strong>Item Two</strong></a> + <a href="javascript:alert('1');"><strong>Item Two</strong></a> </code> " string(62) "<a href="javascript:alert('1');"><strong>Item Two</strong></a>" diff --git a/ext/standard/tests/file/flock_variation.phpt b/ext/standard/tests/file/flock_variation.phpt index 49c4a53a3d..a912fce3c9 100644 --- a/ext/standard/tests/file/flock_variation.phpt +++ b/ext/standard/tests/file/flock_variation.phpt @@ -9,7 +9,7 @@ Description: PHP supports a portable way of locking complete files */ echo "*** Testing flock() fun with the various operation and - wouldblock values ***\n"; + wouldblock values ***\n"; $file = preg_replace("~\.phpt?$~", null, __FILE__); $fp = fopen($file, "w"); @@ -67,7 +67,7 @@ echo "\n*** Done ***\n"; ?> --EXPECT-- *** Testing flock() fun with the various operation and - wouldblock values *** + wouldblock values *** --- Outer iteration 0 --- bool(true) -- Inner iteration 0 in 0 -- diff --git a/ext/standard/tests/file/fpassthru_basic.phpt b/ext/standard/tests/file/fpassthru_basic.phpt index 9376714368..f453a484f9 100644 --- a/ext/standard/tests/file/fpassthru_basic.phpt +++ b/ext/standard/tests/file/fpassthru_basic.phpt @@ -11,7 +11,7 @@ Description: Reads to EOF on the given file pointer from the current position $file_name = __DIR__."/passthru.tmp"; $write_handle = fopen($file_name, "w"); -$string = "Hello, world\n, abcdefg\tadsdsfdf\n8u2394723947\t$%$%#$%#$%#^#%^ +$string = "Hello, world\n, abcdefg\tadsdsfdf\n8u2394723947\t$%$%#$%#$%#^#%^ Hello, world\n, abcdefg\tadsdsfdf\n8u2394723947\t$%$%#$%#$%#^#%^\n"; if(substr(PHP_OS, 0, 3) == "WIN") { $string = str_replace("\r",'', $string); @@ -68,60 +68,60 @@ unlink(__DIR__."/passthru.tmp"); -- Before seek operation -- Hello, world , abcdefg adsdsfdf -8u2394723947 $%$%#$%#$%#^#%^ +8u2394723947 $%$%#$%#$%#^#%^ Hello, world , abcdefg adsdsfdf 8u2394723947 $%$%#$%#$%#^#%^ -int(133) +int(132) -- After seeking position to 0 -- Hello, world , abcdefg adsdsfdf -8u2394723947 $%$%#$%#$%#^#%^ +8u2394723947 $%$%#$%#$%#^#%^ Hello, world , abcdefg adsdsfdf 8u2394723947 $%$%#$%#$%#^#%^ -int(133) +int(132) -- After seeking position to 3 -- lo, world , abcdefg adsdsfdf -8u2394723947 $%$%#$%#$%#^#%^ +8u2394723947 $%$%#$%#$%#^#%^ Hello, world , abcdefg adsdsfdf 8u2394723947 $%$%#$%#$%#^#%^ -int(130) +int(129) -- After seeking position to 13 -- , abcdefg adsdsfdf -8u2394723947 $%$%#$%#$%#^#%^ +8u2394723947 $%$%#$%#$%#^#%^ Hello, world , abcdefg adsdsfdf 8u2394723947 $%$%#$%#$%#^#%^ -int(120) +int(119) -- After seeking position to 14 -- abcdefg adsdsfdf -8u2394723947 $%$%#$%#$%#^#%^ +8u2394723947 $%$%#$%#$%#^#%^ Hello, world , abcdefg adsdsfdf 8u2394723947 $%$%#$%#$%#^#%^ -int(119) +int(118) -- After seeking position to 23 -- adsdsfdf -8u2394723947 $%$%#$%#$%#^#%^ +8u2394723947 $%$%#$%#$%#^#%^ Hello, world , abcdefg adsdsfdf 8u2394723947 $%$%#$%#$%#^#%^ -int(110) +int(109) -- After seeking position to 34 -- -2394723947 $%$%#$%#$%#^#%^ +2394723947 $%$%#$%#$%#^#%^ Hello, world , abcdefg adsdsfdf 8u2394723947 $%$%#$%#$%#^#%^ -int(99) +int(98) -- After seeking position to 1000 -- int(0) diff --git a/ext/standard/tests/general_functions/print_r.phpt b/ext/standard/tests/general_functions/print_r.phpt index f0afa64289..3f24a5bc9d 100644 --- a/ext/standard/tests/general_functions/print_r.phpt +++ b/ext/standard/tests/general_functions/print_r.phpt @@ -101,7 +101,7 @@ $strings = array ( 'PHP', "abcd\x0n1234\x0005678\x0000efgh\xijkl", // strings with hexadecimal NULL "abcd\0efgh\0ijkl\x00mnop\x000qrst\00uvwx\0000yz", // strings with octal NULL - "1234\t\n5678\n\t9100\rabcda" // strings with escape characters + "1234\t\n5678\n\t9100\"abcda" // strings with escape characters ); /* calling check_printr() to display contents of strings using print_r() */ check_printr($strings); @@ -240,8 +240,8 @@ $resources = array ( using print_r() */ check_printr($resources); -echo "\n*** Testing print_r() on different combinations of scalar - and non-scalar variables ***\n"; +echo "\n*** Testing print_r() on different combinations of scalar + and non-scalar variables ***\n"; /* a variable which is unset */ $unset_var = 10.5; unset($unset_var); @@ -604,13 +604,13 @@ abcd -- Iteration 14 -- 1234 5678 - 9100
abcda + 9100"abcda 1234 5678 - 9100
abcda + 9100"abcda 1234 5678 - 9100
abcda + 9100"abcda *** Testing print_r() on boolean variables *** -- Iteration 1 -- @@ -1462,15 +1462,15 @@ object_class Object *** Testing print_r() on resources *** -- Iteration 1 -- -Resource id #%d -Resource id #%d -Resource id #%d +Resource id #5 +Resource id #5 +Resource id #5 -- Iteration 2 -- -Resource id #%d -Resource id #%d -Resource id #%d -*** Testing print_r() on different combinations of scalar - and non-scalar variables *** +Resource id #6 +Resource id #6 +Resource id #6 +*** Testing print_r() on different combinations of scalar + and non-scalar variables *** -- Iteration 1 -- Array diff --git a/ext/standard/tests/general_functions/print_r_64bit.phpt b/ext/standard/tests/general_functions/print_r_64bit.phpt index 17b829231f..a0e9e148c6 100644 --- a/ext/standard/tests/general_functions/print_r_64bit.phpt +++ b/ext/standard/tests/general_functions/print_r_64bit.phpt @@ -105,7 +105,7 @@ $strings = array ( 'PHP', "abcd\x0n1234\x0005678\x0000efgh\xijkl", // strings with hexadecimal NULL "abcd\0efgh\0ijkl\x00mnop\x000qrst\00uvwx\0000yz", // strings with octal NULL - "1234\t\n5678\n\t9100\rabcda" // strings with escape characters + "1234\t\n5678\n\t9100\"abcda" // strings with escape characters ); /* calling check_printr() to display contents of strings using print_r() */ check_printr($strings); @@ -244,8 +244,8 @@ $resources = array ( using print_r() */ check_printr($resources); -echo "\n*** Testing print_r() on different combinations of scalar - and non-scalar variables ***\n"; +echo "\n*** Testing print_r() on different combinations of scalar + and non-scalar variables ***\n"; /* a variable which is unset */ $unset_var = 10.5; unset($unset_var); @@ -608,13 +608,13 @@ abcd -- Iteration 14 -- 1234 5678 - 9100
abcda + 9100"abcda 1234 5678 - 9100
abcda + 9100"abcda 1234 5678 - 9100
abcda + 9100"abcda *** Testing print_r() on boolean variables *** -- Iteration 1 -- @@ -1473,8 +1473,8 @@ Resource id #5 Resource id #6 Resource id #6 Resource id #6 -*** Testing print_r() on different combinations of scalar - and non-scalar variables *** +*** Testing print_r() on different combinations of scalar + and non-scalar variables *** -- Iteration 1 -- Array diff --git a/ext/standard/tests/general_functions/var_dump.phpt b/ext/standard/tests/general_functions/var_dump.phpt index 08807191cb..889b2b1fc2 100644 --- a/ext/standard/tests/general_functions/var_dump.phpt +++ b/ext/standard/tests/general_functions/var_dump.phpt @@ -239,8 +239,8 @@ $resources = array ( using var_dump() */ check_vardump($resources); -echo "\n*** Testing var_dump() on different combinations of scalar - and non-scalar variables ***\n"; +echo "\n*** Testing var_dump() on different combinations of scalar + and non-scalar variables ***\n"; /* a variable which is unset */ $unset_var = 10.5; unset($unset_var); @@ -448,9 +448,10 @@ string(29) "abcd -- Iteration 13 -- string(34) "abcd -- Iteration 14 -- -string(22) "1234 +string(22) "1234 5678 - 9100
abcda" + 9100 +abcda" *** Testing var_dump() on boolean variables *** -- Iteration 1 -- @@ -836,8 +837,8 @@ resource(%d) of type (stream) -- Iteration 2 -- resource(%d) of type (stream) -*** Testing var_dump() on different combinations of scalar - and non-scalar variables *** +*** Testing var_dump() on different combinations of scalar + and non-scalar variables *** -- Iteration 1 -- array(3) { [0]=> @@ -1102,9 +1103,10 @@ array(14) { [12]=> string(34) "abcd [13]=> - string(22) "1234 + string(22) "1234 5678 - 9100
abcda" + 9100 +abcda" } array(15) { [0]=> diff --git a/ext/standard/tests/general_functions/var_dump_64bit.phpt b/ext/standard/tests/general_functions/var_dump_64bit.phpt index 630b1ee8b3..0600775f58 100644 --- a/ext/standard/tests/general_functions/var_dump_64bit.phpt +++ b/ext/standard/tests/general_functions/var_dump_64bit.phpt @@ -99,7 +99,7 @@ $strings = array ( 'PHP', "abcd\x0n1234\x0005678\x0000efgh\xijkl", // strings with hexadecimal NULL "abcd\0efgh\0ijkl\x00mnop\x000qrst\00uvwx\0000yz", // strings with octal NULL - "1234\t\n5678\n\t9100\rabcda" // strings with escape characters + "1234\t\n5678\n\t9100\"abcda" // strings with escape characters ); /* calling check_vardump() to display contents of strings using var_dump() */ @@ -239,8 +239,8 @@ $resources = array ( using var_dump() */ check_vardump($resources); -echo "\n*** Testing var_dump() on different combinations of scalar - and non-scalar variables ***\n"; +echo "\n*** Testing var_dump() on different combinations of scalar + and non-scalar variables ***\n"; /* a variable which is unset */ $unset_var = 10.5; unset($unset_var); @@ -450,7 +450,7 @@ string(34) "abcd -- Iteration 14 -- string(22) "1234 5678 - 9100
abcda" + 9100"abcda" *** Testing var_dump() on boolean variables *** -- Iteration 1 -- @@ -836,8 +836,8 @@ resource(5) of type (stream) -- Iteration 2 -- resource(6) of type (stream) -*** Testing var_dump() on different combinations of scalar - and non-scalar variables *** +*** Testing var_dump() on different combinations of scalar + and non-scalar variables *** -- Iteration 1 -- array(3) { [0]=> @@ -1104,7 +1104,7 @@ array(14) { [13]=> string(22) "1234 5678 - 9100
abcda" + 9100"abcda" } array(15) { [0]=> diff --git a/ext/standard/tests/strings/bug21453.phpt b/ext/standard/tests/strings/bug21453.phpt index 61547c48f3..cf563dfaf3 100644 --- a/ext/standard/tests/strings/bug21453.phpt +++ b/ext/standard/tests/strings/bug21453.phpt @@ -4,15 +4,15 @@ Bug #21453 (handling of non-encoded <) <?php $test = " <table> - <tr><td>first cell before < first cell after</td></tr> - <tr><td>second cell before < second cell after</td></tr> + <tr><td>first cell before < first cell after</td></tr> + <tr><td>second cell before < second cell after</td></tr> </table>"; - var_dump(strip_tags($test)); +var_dump(strip_tags($test)); ?> --EXPECTF-- string(8%d) " - first cell before < first cell after - second cell before < second cell after + first cell before < first cell after + second cell before < second cell after " diff --git a/ext/standard/tests/strings/str_ireplace.phpt b/ext/standard/tests/strings/str_ireplace.phpt index 71a9d1e127..a5a35769e4 100644 --- a/ext/standard/tests/strings/str_ireplace.phpt +++ b/ext/standard/tests/strings/str_ireplace.phpt @@ -36,8 +36,8 @@ var_dump(str_ireplace(array("t"=>"tt", "y"=>"y"), array("a"=>"aaa", "b"=>"bbb"), /* separate testcase for str_ireplace() off-by-one */ $Data = "Change tracking and management software designed to watch - for abnormal system behavior.\nSuggest features, report bugs, or ask - questions here."; + for abnormal system behavior.\nSuggest features, report bugs, or ask + questions here."; var_dump($Data = str_ireplace("\r\n", "<br>", $Data)); var_dump($Data = str_ireplace("\n", "<br>", $Data)); @@ -82,9 +82,9 @@ array(2) { ["test"]=> string(36) "aabbbbbbaabbbasdabbbbbbahsdbbbbbbbbb" } -string(143) "Change tracking and management software designed to watch - for abnormal system behavior. +string(149) "Change tracking and management software designed to watch + for abnormal system behavior. Suggest features, report bugs, or ask - questions here." -string(152) "Change tracking and management software designed to watch<br> for abnormal system behavior.<br>Suggest features, report bugs, or ask<br> questions here." + questions here." +string(158) "Change tracking and management software designed to watch<br> for abnormal system behavior.<br>Suggest features, report bugs, or ask<br> questions here." Done diff --git a/ext/standard/tests/strings/str_replace_variation2.phpt b/ext/standard/tests/strings/str_replace_variation2.phpt Binary files differindex 79d50d40ff..ecda3e3920 100644 --- a/ext/standard/tests/strings/str_replace_variation2.phpt +++ b/ext/standard/tests/strings/str_replace_variation2.phpt diff --git a/ext/standard/tests/strings/str_word_count.phpt b/ext/standard/tests/strings/str_word_count.phpt index 480ee5b64a..fda1678daa 100644 --- a/ext/standard/tests/strings/str_word_count.phpt +++ b/ext/standard/tests/strings/str_word_count.phpt @@ -2,7 +2,7 @@ str_word_count() --FILE-- <?php -$str = "Hello friend, you're +$str = "Hello friend, you're looking good today!"; $b =& $str; var_dump(str_word_count($str, 1)); @@ -79,11 +79,11 @@ array(6) { string(6) "friend" [14]=> string(6) "you're" - [27]=> + [25]=> string(7) "looking" - [44]=> + [42]=> string(4) "good" - [49]=> + [47]=> string(5) "today" } int(6) @@ -91,7 +91,7 @@ Invalid format value 3 Invalid format value 123 Invalid format value -1 Invalid format value 999999999 -string(55) "Hello friend, you're +string(53) "Hello friend, you're looking good today!" int(5) int(6) diff --git a/ext/standard/tests/strings/strncasecmp_variation9.phpt b/ext/standard/tests/strings/strncasecmp_variation9.phpt index 9841bb4e47..caa2deccf2 100644 --- a/ext/standard/tests/strings/strncasecmp_variation9.phpt +++ b/ext/standard/tests/strings/strncasecmp_variation9.phpt @@ -22,7 +22,7 @@ EOD; $identifier_str1 = <<<identifier_str1 Example of heredoc string, whose identifier -having underscore("_") +having underscore("_") & numeric value. identifier_str1; @@ -78,7 +78,7 @@ echo "*** Done ***\n"; int(0) int(63) int(0) -int(84) +int(83) int(0) int(-1) int(0) diff --git a/ext/standard/tests/strings/strstr.phpt b/ext/standard/tests/strings/strstr.phpt Binary files differindex afe065ff60..4fa6165d97 100644 --- a/ext/standard/tests/strings/strstr.phpt +++ b/ext/standard/tests/strings/strstr.phpt diff --git a/ext/standard/tests/strings/vfprintf_variation4_64bit.phpt b/ext/standard/tests/strings/vfprintf_variation4_64bit.phpt index fea15a9552..c03e38e40c 100644 --- a/ext/standard/tests/strings/vfprintf_variation4_64bit.phpt +++ b/ext/standard/tests/strings/vfprintf_variation4_64bit.phpt @@ -20,11 +20,11 @@ echo "*** Testing vfprintf() : int formats and non-integer values ***\n"; // defining array of int formats $formats = - '%d %+d %-d - %ld %Ld %4d %-4d - %10.4d %-10.4d %.4d %04.4d - %\'#2d %\'2d %\'$2d %\'_2d - %3$d %4$d %1$d %2$d'; + '%d %+d %-d + %ld %Ld %4d %-4d + %10.4d %-10.4d %.4d %04.4d + %\'#2d %\'2d %\'$2d %\'_2d + %3$d %4$d %1$d %2$d'; // Arrays of non int values for the format defined in $format. // Each sub array contains non int values which correspond to each format in $format @@ -35,7 +35,8 @@ $args_array = array( 123456.234, 123456.234, -1234.6789, +1234.6789, 2e10, +2e5, 4e3, 22e+6, 12345.780, 12.000000011111, -12.00000111111, -123456.234, - 3.33, +4.44, 1.11,-2.22 ), + 3.33, +4.44, 1.11,-2.22 + ), // array of strings array(" ", ' ', 'hello', @@ -86,26 +87,26 @@ unlink($data_file); *** Testing vfprintf() : int formats and non-integer values *** -- Iteration 1 -- -2 +0 10 - 123456 d -1234 1234 - 20000000000 200000 4000 22000000 - 12345 12 -12 -123456 - 10 123456 2 0 +2 +0 10 + 123456 d -1234 1234 + 20000000000 200000 4000 22000000 + 12345 12 -12 -123456 + 10 123456 2 0 -- Iteration 2 -- -0 +0 0 - 123 d -123 123 - 0 0 123456 0000 - 1234 0 $0 _0 - 0 123 0 0 +0 +0 0 + 123 d -123 123 + 0 0 123456 0000 + 1234 0 $0 _0 + 0 123 0 0 -- Iteration 3 -- -1 +1 1 - 1 d 1 1 - 1 1 1 0001 - #1 1 $1 _1 - 1 1 1 1 +1 +1 1 + 1 d 1 1 + 1 1 1 0001 + #1 1 $1 _1 + 1 1 1 1 -- Iteration 4 -- -1 +1 0 - 1 d 0 1 - 1 0 1 0000 - #0 1 $1 _0 - 0 1 1 1 +1 +1 0 + 1 d 0 1 + 1 0 1 0000 + #0 1 $1 _0 + 0 1 1 1 diff --git a/ext/standard/tests/strings/vprintf_variation4_64bit.phpt b/ext/standard/tests/strings/vprintf_variation4_64bit.phpt index 9172644dd1..0e5f4d6d6d 100644 --- a/ext/standard/tests/strings/vprintf_variation4_64bit.phpt +++ b/ext/standard/tests/strings/vprintf_variation4_64bit.phpt @@ -21,10 +21,10 @@ echo "*** Testing vprintf() : int formats and non-integer values ***\n"; // defining array of int formats $formats = '%d %+d %-d - %ld %Ld %4d %-4d - %10.4d %-10.4d %.4d %04.4d - %\'#2d %\'2d %\'$2d %\'_2d - %3$d %4$d %1$d %2$d'; + %ld %Ld %4d %-4d + %10.4d %-10.4d %.4d %04.4d + %\'#2d %\'2d %\'$2d %\'_2d + %3$d %4$d %1$d %2$d'; // Arrays of non int values for the format defined in $format. // Each sub array contains non int values which correspond to each format in $format @@ -77,32 +77,32 @@ foreach($args_array as $args) { -- Iteration 1 -- 2 +0 10 - 123456 d -1234 1234 - 20000000000 200000 4000 22000000 - 12345 12 -12 -123456 - 10 123456 2 0 -int(112) + 123456 d -1234 1234 + 20000000000 200000 4000 22000000 + 12345 12 -12 -123456 + 10 123456 2 0 +int(116) -- Iteration 2 -- 0 +0 0 - 123 d -123 123 - 0 0 123456 0000 - 1234 0 $0 _0 - 0 123 0 0 -int(92) + 123 d -123 123 + 0 0 123456 0000 + 1234 0 $0 _0 + 0 123 0 0 +int(96) -- Iteration 3 -- 1 +1 1 - 1 d 1 1 - 1 1 1 0001 - #1 1 $1 _1 - 1 1 1 1 -int(81) + 1 d 1 1 + 1 1 1 0001 + #1 1 $1 _1 + 1 1 1 1 +int(85) -- Iteration 4 -- 1 +1 0 - 1 d 0 1 - 1 0 1 0000 - #0 1 $1 _0 - 0 1 1 1 -int(81) + 1 d 0 1 + 1 0 1 0000 + #0 1 $1 _0 + 0 1 1 1 +int(85) diff --git a/ext/tokenizer/tests/token_get_all_variation18.phpt b/ext/tokenizer/tests/token_get_all_variation18.phpt index 7535d15b11..b057856950 100644 --- a/ext/tokenizer/tests/token_get_all_variation18.phpt +++ b/ext/tokenizer/tests/token_get_all_variation18.phpt @@ -19,12 +19,12 @@ echo "*** Testing token_get_all() : 'source' string with HTML tags ***\n"; $source = ' <html> <body> - Testing HTML + Testing HTML </body> </html>" -<?php - echo "php code with HTML"; +<?php + echo "php code with HTML"; ?>'; var_dump( token_get_all($source)); @@ -38,10 +38,10 @@ array(9) { [0]=> int(%d) [1]=> - string(48) " + string(50) " <html> <body> - Testing HTML + Testing HTML </body> </html>" @@ -54,7 +54,8 @@ array(9) { [0]=> int(%d) [1]=> - string(6) "<?php " + string(6) "<?php +" [2]=> int(8) } @@ -63,10 +64,9 @@ array(9) { [0]=> int(%d) [1]=> - string(3) " - " + string(4) " " [2]=> - int(8) + int(9) } [3]=> array(3) { diff --git a/ext/tokenizer/tests/token_get_all_variation19.phpt b/ext/tokenizer/tests/token_get_all_variation19.phpt index 6f4f7b68b3..a853dd2e2f 100644 --- a/ext/tokenizer/tests/token_get_all_variation19.phpt +++ b/ext/tokenizer/tests/token_get_all_variation19.phpt @@ -16,16 +16,16 @@ comment */ // a class class TestClass { - public function foo() { - echo "Called foo()\n"; - } + public function foo() { + echo "Called foo()\n"; + } } $a = new TestClass(); $a->foo(); for ($i = 0; $i < 10; $i++) { - echo "Loop iteration $i\n"; + echo "Loop iteration $i\n"; } ?>'; @@ -54,7 +54,7 @@ eval($script); ?> --EXPECT-- -string(259) " +string(274) " // A php script to test token_get_all() @@ -64,16 +64,16 @@ comment */ // a class class TestClass { - public function foo() { - echo "Called foo()\n"; - } + public function foo() { + echo "Called foo()\n"; + } } $a = new TestClass(); $a->foo(); for ($i = 0; $i < 10; $i++) { - echo "Loop iteration $i\n"; + echo "Loop iteration $i\n"; } " |