diff --git a/ext/dom/tests/DOMDocument_savexml_basic.phpt b/ext/dom/tests/DOMDocument_savexml_basic.phpt
index f08fc4e5824..e7f47e952c1 100644
--- a/ext/dom/tests/DOMDocument_savexml_basic.phpt
+++ b/ext/dom/tests/DOMDocument_savexml_basic.phpt
@@ -13,12 +13,12 @@ require_once('skipif.inc');
$xml = <<< EOXML
-
-
-
-
-
-
+
+
+
+
+
+
EOXML;
@@ -34,5 +34,5 @@ var_dump($result == $dom->saveXML());
unlink($filename);
--EXPECT--
-int(151)
+int(181)
bool(true)
diff --git a/ext/dom/tests/DOMNode_cloneNode_basic.phpt b/ext/dom/tests/DOMNode_cloneNode_basic.phpt
index 538ba968f40..d0503630f3b 100644
--- a/ext/dom/tests/DOMNode_cloneNode_basic.phpt
+++ b/ext/dom/tests/DOMNode_cloneNode_basic.phpt
@@ -12,18 +12,18 @@ Simon Hughes
$xml = <<< EOXML
-
-
- c1n1
- c1n2
-
-
-
-
- c2n1
- c2n2
-
-
+
+
+ c1n1
+ c1n2
+
+
+
+
+ c2n1
+ c2n2
+
+
EOXML;
@@ -75,31 +75,31 @@ for ($index = 0; $index < $children->length; $index++) {
Start cloneNode test
node 0
Course: new title3:DOMElement
-~string(24) "
-
- c1n1
- c1n2
-
- "
+~string(57) "
+
+ c1n1
+ c1n2
+
+ "
node 1
Course: two:DOMElement
-~string(24) "
-
- c2n1
- c2n2
-
- "
+~string(57) "
+
+ c2n1
+ c2n2
+
+ "
node 2
Course: new title default:DOMElement
~string(0) ""
node 3
Course: new title true:DOMElement
-~string(24) "
-
- c1n1
- c1n2
-
- "
+~string(57) "
+
+ c1n1
+ c1n2
+
+ "
node 4
Course: new title false:DOMElement
~string(0) ""
diff --git a/ext/dom/tests/DOMNode_removeChild_basic.phpt b/ext/dom/tests/DOMNode_removeChild_basic.phpt
index a4b3917d297..8dcecb52c85 100644
--- a/ext/dom/tests/DOMNode_removeChild_basic.phpt
+++ b/ext/dom/tests/DOMNode_removeChild_basic.phpt
@@ -12,18 +12,18 @@ Simon Hughes
$xml = <<< EOXML
-
-
- c1n1
- c1n2
-
-
-
-
- c2n1
- c2n2
-
-
+
+
+ c1n1
+ c1n2
+
+
+
+
+ c2n1
+ c2n2
+
+
EOXML;
@@ -64,42 +64,42 @@ Course: no title:DOMText
"
node 3
Course: two:DOMElement
-~string(24) "
-
- c2n1
- c2n2
-
- "
+~string(57) "
+
+ c2n1
+ c2n2
+
+ "
node 2
Course: no title:DOMText
-~string(2) "
- "
+~string(5) "
+ "
node 1
Course: one:DOMElement
-~string(24) "
-
- c1n1
- c1n2
-
- "
+~string(57) "
+
+ c1n1
+ c1n2
+
+ "
node 0
Course: no title:DOMText
-~string(2) "
- "
+~string(5) "
+ "
after text removed it now has 2 nodes
node 0
Course: one:DOMElement
-~string(24) "
-
- c1n1
- c1n2
-
- "
+~string(57) "
+
+ c1n1
+ c1n2
+
+ "
node 1
Course: two:DOMElement
-~string(24) "
-
- c2n1
- c2n2
-
- "
+~string(57) "
+
+ c2n1
+ c2n2
+
+ "
diff --git a/ext/dom/tests/dom_comment_basic.phpt b/ext/dom/tests/dom_comment_basic.phpt
index e9d0f89bf89..7c436a747a3 100644
--- a/ext/dom/tests/dom_comment_basic.phpt
+++ b/ext/dom/tests/dom_comment_basic.phpt
@@ -10,7 +10,7 @@ require_once('skipif.inc');
$xml = <<< EOXML
-
+
EOXML;
@@ -30,8 +30,8 @@ for ($index = 0; $index < $children->length; $index++) {
bool(true)
--- child 0 ---
DOMText
-string(2) "
- "
+string(5) "
+ "
--- child 1 ---
DOMComment
string(14) " Hello World! "
diff --git a/ext/dom/tests/domobject_debug_handler.phpt b/ext/dom/tests/domobject_debug_handler.phpt
index 57d4a66ebb4..d2834e815cf 100644
--- a/ext/dom/tests/domobject_debug_handler.phpt
+++ b/ext/dom/tests/domobject_debug_handler.phpt
@@ -6,7 +6,7 @@ Objects of DOM extension: debug info object handler.
- foobar
+ foobar
XML;
$d = new domdocument;
@@ -55,6 +55,6 @@ DOMDocument Object
[localName] =>
[baseURI] => %s
[textContent] =>
- foobar
+ foobar
)
diff --git a/ext/standard/tests/strings/highlight_file.phpt b/ext/standard/tests/strings/highlight_file.phpt
index ac78aa38fd7..4f82bfd949e 100644
--- a/ext/standard/tests/strings/highlight_file.phpt
+++ b/ext/standard/tests/strings/highlight_file.phpt
@@ -20,12 +20,12 @@ var_dump(highlight_file('data:,'));
var_dump(highlight_file('data:,'));
$data = '
-';
file_put_contents($filename, $data);
@@ -51,7 +51,7 @@ bool(false)
bool(true)
-
<?php
class test {
public $var = 1;
private function foo() { echo "foo"; }
public function bar() { var_dump(test::foo()); }
}
?>
+
<?php
class test {
public $var = 1;
private function foo() { echo "foo"; }
public function bar() { var_dump(test::foo()); }
}
?>
bool(true)
Done
diff --git a/ext/standard/tests/strings/vfprintf_variation12_64bit.phpt b/ext/standard/tests/strings/vfprintf_variation12_64bit.phpt
index 60c3614dec5..d6c28bc78e6 100644
--- a/ext/standard/tests/strings/vfprintf_variation12_64bit.phpt
+++ b/ext/standard/tests/strings/vfprintf_variation12_64bit.phpt
@@ -20,11 +20,11 @@ echo "*** Testing vfprintf() : octal formats and non-octal values ***\n";
// defining array of octal formats
$formats =
- '%o %+o %-o
- %lo %Lo %4o %-4o
- %10.4o %-10.4o %.4o
- %\'#2o %\'2o %\'$2o %\'_2o
- %3$o %4$o %1$o %2$o';
+ '%o %+o %-o
+ %lo %Lo %4o %-4o
+ %10.4o %-10.4o %.4o
+ %\'#2o %\'2o %\'$2o %\'_2o
+ %3$o %4$o %1$o %2$o';
// Arrays of non octal values for the format defined in $format.
// Each sub array contains non octal values which correspond to each format in $format
@@ -93,31 +93,31 @@ unlink($data_file);
-- Iteration 1 --
2 0 12
- 361100 o 1777777777777777775456 2322
+ 361100 o 1777777777777777775456 2322
- 30071 14 1777777777777777777764 1777777777777777416700
- 12 361100 2 0
+ 30071 14 1777777777777777777764 1777777777777777416700
+ 12 361100 2 0
-- Iteration 2 --
2 1777777777777777777776 2
- 361100 o 1777777777777720715133 57062645
+ 361100 o 1777777777777720715133 57062645
- 57060664 4475347 1777777777777721631371 1777777777777720717336
- 2 361100 2 1777777777777777777776
+ 57060664 4475347 1777777777777721631371 1777777777777720717336
+ 2 361100 2 1777777777777777777776
-- Iteration 3 --
0 0 0
- 173 o 1777777777777777777605 173
+ 173 o 1777777777777777777605 173
- 2322 0 $0 _0
- 0 173 0 0
+ 2322 0 $0 _0
+ 0 173 0 0
-- Iteration 4 --
1 1 1
- 1 o 1 1
+ 1 o 1 1
- #1 1 $1 _1
- 1 1 1 1
+ #1 1 $1 _1
+ 1 1 1 1
-- Iteration 5 --
1 1 0
- 1 o 0 1
+ 1 o 0 1
- #0 1 $1 _0
- 0 1 1 1
+ #0 1 $1 _0
+ 0 1 1 1
diff --git a/ext/standard/tests/strings/vfprintf_variation14_64bit.phpt b/ext/standard/tests/strings/vfprintf_variation14_64bit.phpt
index a763b1c89f2..c7443a1544e 100644
--- a/ext/standard/tests/strings/vfprintf_variation14_64bit.phpt
+++ b/ext/standard/tests/strings/vfprintf_variation14_64bit.phpt
@@ -20,11 +20,11 @@ echo "*** Testing vfprintf() : hexa formats and non-hexa values ***\n";
// defining array of different hexa formats
$formats =
- '%x %+x %-x
- %lx %Lx %4x %-4x
- %10.4x %-10.4x %.4x
- %\'#2x %\'2x %\'$2x %\'_2x
- %3$x %4$x %1$x %2$x';
+ '%x %+x %-x
+ %lx %Lx %4x %-4x
+ %10.4x %-10.4x %.4x
+ %\'#2x %\'2x %\'$2x %\'_2x
+ %3$x %4$x %1$x %2$x';
// Arrays of non hexa values for the format defined in $format.
// Each sub array contains non hexa values which correspond to each format in $format
@@ -93,31 +93,31 @@ unlink($data_file);
-- Iteration 1 --
2 0 a
- 1e240 x fffffffffffffb2e 4d2
+ 1e240 x fffffffffffffb2e 4d2
- 3039 c fffffffffffffff4 fffffffffffe1dc0
- a 1e240 2 0
+ 3039 c fffffffffffffff4 fffffffffffe1dc0
+ a 1e240 2 0
-- Iteration 2 --
2 fffffffffffffffe 2
- 1e240 x ffffffffff439a5b bc65a5
+ 1e240 x ffffffffff439a5b bc65a5
- bc61b4 127ae7 ffffffffff4732f9 ffffffffff439ede
- 2 1e240 2 fffffffffffffffe
+ bc61b4 127ae7 ffffffffff4732f9 ffffffffff439ede
+ 2 1e240 2 fffffffffffffffe
-- Iteration 3 --
0 0 0
- 7b x ffffffffffffff85 7b
+ 7b x ffffffffffffff85 7b
- 4d2 0 $0 _0
- 0 7b 0 0
+ 4d2 0 $0 _0
+ 0 7b 0 0
-- Iteration 4 --
1 1 1
- 1 x 1 1
+ 1 x 1 1
- #1 1 $1 _1
- 1 1 1 1
+ #1 1 $1 _1
+ 1 1 1 1
-- Iteration 5 --
1 1 0
- 1 x 0 1
+ 1 x 0 1
- #0 1 $1 _0
- 0 1 1 1
+ #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 0e5f4d6d6dc..35f0663b522 100644
--- a/ext/standard/tests/strings/vprintf_variation4_64bit.phpt
+++ b/ext/standard/tests/strings/vprintf_variation4_64bit.phpt
@@ -20,7 +20,7 @@ echo "*** Testing vprintf() : int formats and non-integer values ***\n";
// defining array of int formats
$formats =
- '%d %+d %-d
+ '%d %+d %-d
%ld %Ld %4d %-4d
%10.4d %-10.4d %.4d %04.4d
%\'#2d %\'2d %\'$2d %\'_2d
@@ -76,33 +76,33 @@ foreach($args_array as $args) {
*** Testing vprintf() : int formats and non-integer values ***
-- Iteration 1 --
-2 +0 10
+2 +0 10
123456 d -1234 1234
20000000000 200000 4000 22000000
12345 12 -12 -123456
10 123456 2 0
-int(116)
+int(115)
-- Iteration 2 --
-0 +0 0
+0 +0 0
123 d -123 123
0 0 123456 0000
1234 0 $0 _0
0 123 0 0
-int(96)
+int(95)
-- Iteration 3 --
-1 +1 1
+1 +1 1
1 d 1 1
1 1 1 0001
#1 1 $1 _1
1 1 1 1
-int(85)
+int(84)
-- Iteration 4 --
-1 +1 0
+1 +1 0
1 d 0 1
1 0 1 0000
#0 1 $1 _0
0 1 1 1
-int(85)
+int(84)
diff --git a/ext/standard/tests/strings/vsprintf_variation16_64bit.phpt b/ext/standard/tests/strings/vsprintf_variation16_64bit.phpt
index 112276654c3..e6cbd844842 100644
--- a/ext/standard/tests/strings/vsprintf_variation16_64bit.phpt
+++ b/ext/standard/tests/strings/vsprintf_variation16_64bit.phpt
@@ -20,11 +20,11 @@ echo "*** Testing vsprintf() : unsigned formats and signed & other types of valu
// defining array of unsigned formats
$formats =
- '%u %+u %-u
- %lu %Lu %4u %-4u
- %10.4u %-10.4u %.4u
- %\'#2u %\'2u %\'$2u %\'_2u
- %3$u %4$u %1$u %2$u';
+ '%u %+u %-u
+ %lu %Lu %4u %-4u
+ %10.4u %-10.4u %.4u
+ %\'#2u %\'2u %\'$2u %\'_2u
+ %3$u %4$u %1$u %2$u';
// Arrays of signed and other type of values for the format defined in $format.
// Each sub array contains signed values which correspond to each format in $format
@@ -75,30 +75,30 @@ echo "Done";
*** Testing vsprintf() : unsigned formats and signed & other types of values ***
-- Iteration 1 --
-string(142) "2 0 10
- 123456 u 1234 20000000000
- 2000000000000 22000000000000 12345
- 12 18446744073709551604 18446744073709428160 _3
- 10 123456 2 0"
+string(145) "2 0 10
+ 123456 u 1234 20000000000
+ 2000000000000 22000000000000 12345
+ 12 18446744073709551604 18446744073709428160 _3
+ 10 123456 2 0"
-- Iteration 2 --
-string(97) "0 0 0
- 123 u 18446744073709551493 123
- 0 0 0
- 1234 0 $0 _0
- 0 123 0 0"
+string(100) "0 0 0
+ 123 u 18446744073709551493 123
+ 0 0 0
+ 1234 0 $0 _0
+ 0 123 0 0"
-- Iteration 3 --
-string(75) "1 1 1
- 1 u 1 1
- 1 1 1
- #1 1 $1 _1
- 1 1 1 1"
+string(78) "1 1 1
+ 1 u 1 1
+ 1 1 1
+ #1 1 $1 _1
+ 1 1 1 1"
-- Iteration 4 --
-string(75) "1 1 0
- 1 u 0 1
- 1 1 0
- #0 1 $1 _0
- 0 1 1 1"
+string(78) "1 1 0
+ 1 u 0 1
+ 1 1 0
+ #0 1 $1 _0
+ 0 1 1 1"
Done
diff --git a/ext/standard/tests/strings/vsprintf_variation8.phpt b/ext/standard/tests/strings/vsprintf_variation8.phpt
index 5eba0074238..061e628c023 100644
--- a/ext/standard/tests/strings/vsprintf_variation8.phpt
+++ b/ext/standard/tests/strings/vsprintf_variation8.phpt
@@ -16,11 +16,11 @@ echo "*** Testing vsprintf() : string formats and non-string values ***\n";
// defining array of string formats
$formats =
- '%s %+s %-s
- %ls %4s %-4s
- %10.4s %-10.4s %04s %04.4s
- %\'#2s %\'2s %\'$2s %\'_2s
- %3$s %4$s %1$s %2$s';
+ '%s %+s %-s
+ %ls %4s %-4s
+ %10.4s %-10.4s %04s %04.4s
+ %\'#2s %\'2s %\'$2s %\'_2s
+ %3$s %4$s %1$s %2$s';
// Arrays of non string values for the format defined in $format.
// Each sub array contains non string values which correspond to each format in $format
@@ -71,18 +71,18 @@ foreach($args_array as $args) {
*** Testing vsprintf() : string formats and non-string values ***
-- Iteration 1 --
-string(173) "2.2 0.2 10.2
- 123456.234 -1234.6789 1234.6789
- 2123 2765 -27654321000 2123
- 12345.78 12.000000011111 -12.00000111111 -123456.234
- 10.2 123456.234 2.2 0.2"
+string(177) "2.2 0.2 10.2
+ 123456.234 -1234.6789 1234.6789
+ 2123 2765 -27654321000 2123
+ 12345.78 12.000000011111 -12.00000111111 -123456.234
+ 10.2 123456.234 2.2 0.2"
-- Iteration 2 --
-string(129) "2 -2 2
- 123456 -12346789 12346789
- 1232 2000 -40000 2221
- 12345780 1211111 -12111111 -12345634
- 2 123456 2 -2"
+string(133) "2 -2 2
+ 123456 -12346789 12346789
+ 1232 2000 -40000 2221
+ 12345780 1211111 -12111111 -12345634
+ 2 123456 2 -2"
-- Iteration 3 --
@@ -121,15 +121,15 @@ Warning: Array to string conversion in %s on line %d
Warning: Array to string conversion in %s on line %d
Warning: Array to string conversion in %s on line %d
-string(128) "Array Array Array
- Array Array Array
- Arra Arra Array Arra
- Array Array Array Array
- Array Array Array Array"
+string(132) "Array Array Array
+ Array Array Array
+ Arra Arra Array Arra
+ Array Array Array Array
+ Array Array Array Array"
-- Iteration 4 --
-string(78) "1 1
- 1 1
- 1 0001 0000
- #0 1 $1 _0
- 1 1 1"
+string(82) "1 1
+ 1 1
+ 1 0001 0000
+ #0 1 $1 _0
+ 1 1 1"
diff --git a/ext/tokenizer/tests/token_get_all_variation11.phpt b/ext/tokenizer/tests/token_get_all_variation11.phpt
index e3add6ed3a9..3a22a194b7e 100644
--- a/ext/tokenizer/tests/token_get_all_variation11.phpt
+++ b/ext/tokenizer/tests/token_get_all_variation11.phpt
@@ -26,7 +26,7 @@ echo "*** Testing token_get_all() : for control structure tokens ***\n";
// if..elseif....else
echo "-- with if..elseif..else..tokens --\n";
-$source = '
array(3) {
[0]=>
int(%d)
[1]=>
- string(6) "
int(1)
}
[1]=>
- array(3) {
- [0]=>
- int(%d)
- [1]=>
- string(1) "
-"
- [2]=>
- int(1)
- }
- [2]=>
array(3) {
[0]=>
int(%d)
@@ -107,9 +98,9 @@ array(49) {
[2]=>
int(2)
}
- [3]=>
+ [2]=>
string(1) "("
- [4]=>
+ [3]=>
array(3) {
[0]=>
int(%d)
@@ -118,7 +109,7 @@ array(49) {
[2]=>
int(2)
}
- [5]=>
+ [4]=>
array(3) {
[0]=>
int(%d)
@@ -127,7 +118,7 @@ array(49) {
[2]=>
int(2)
}
- [6]=>
+ [5]=>
array(3) {
[0]=>
int(%d)
@@ -136,7 +127,7 @@ array(49) {
[2]=>
int(2)
}
- [7]=>
+ [6]=>
array(3) {
[0]=>
int(%d)
@@ -145,7 +136,7 @@ array(49) {
[2]=>
int(2)
}
- [8]=>
+ [7]=>
array(3) {
[0]=>
int(%d)
@@ -154,9 +145,9 @@ array(49) {
[2]=>
int(2)
}
- [9]=>
+ [8]=>
string(1) ")"
- [10]=>
+ [9]=>
array(3) {
[0]=>
int(%d)
@@ -165,9 +156,9 @@ array(49) {
[2]=>
int(2)
}
- [11]=>
+ [10]=>
string(1) "{"
- [12]=>
+ [11]=>
array(3) {
[0]=>
int(%d)
@@ -177,7 +168,7 @@ array(49) {
[2]=>
int(2)
}
- [13]=>
+ [12]=>
array(3) {
[0]=>
int(%d)
@@ -186,7 +177,7 @@ array(49) {
[2]=>
int(%d)
}
- [14]=>
+ [13]=>
array(3) {
[0]=>
int(%d)
@@ -195,9 +186,9 @@ array(49) {
[2]=>
int(%d)
}
- [15]=>
+ [14]=>
string(1) """
- [16]=>
+ [15]=>
array(3) {
[0]=>
int(%d)
@@ -206,7 +197,7 @@ array(49) {
[2]=>
int(%d)
}
- [17]=>
+ [16]=>
array(3) {
[0]=>
int(%d)
@@ -215,11 +206,11 @@ array(49) {
[2]=>
int(%d)
}
- [18]=>
+ [17]=>
string(1) """
- [19]=>
+ [18]=>
string(1) ";"
- [20]=>
+ [19]=>
array(3) {
[0]=>
int(%d)
@@ -229,9 +220,9 @@ array(49) {
[2]=>
int(%d)
}
- [21]=>
+ [20]=>
string(1) "}"
- [22]=>
+ [21]=>
array(3) {
[0]=>
int(%d)
@@ -241,7 +232,7 @@ array(49) {
[2]=>
int(4)
}
- [23]=>
+ [22]=>
array(3) {
[0]=>
int(%d)
@@ -250,9 +241,9 @@ array(49) {
[2]=>
int(5)
}
- [24]=>
+ [23]=>
string(1) "("
- [25]=>
+ [24]=>
array(3) {
[0]=>
int(%d)
@@ -261,7 +252,7 @@ array(49) {
[2]=>
int(5)
}
- [26]=>
+ [25]=>
array(3) {
[0]=>
int(%d)
@@ -270,7 +261,7 @@ array(49) {
[2]=>
int(5)
}
- [27]=>
+ [26]=>
array(3) {
[0]=>
int(%d)
@@ -279,7 +270,7 @@ array(49) {
[2]=>
int(5)
}
- [28]=>
+ [27]=>
array(3) {
[0]=>
int(%d)
@@ -288,7 +279,7 @@ array(49) {
[2]=>
int(5)
}
- [29]=>
+ [28]=>
array(3) {
[0]=>
int(%d)
@@ -297,9 +288,9 @@ array(49) {
[2]=>
int(5)
}
- [30]=>
+ [29]=>
string(1) ")"
- [31]=>
+ [30]=>
array(3) {
[0]=>
int(%d)
@@ -308,9 +299,9 @@ array(49) {
[2]=>
int(5)
}
- [32]=>
+ [31]=>
string(1) "{"
- [33]=>
+ [32]=>
array(3) {
[0]=>
int(%d)
@@ -320,7 +311,7 @@ array(49) {
[2]=>
int(5)
}
- [34]=>
+ [33]=>
array(3) {
[0]=>
int(%d)
@@ -329,7 +320,7 @@ array(49) {
[2]=>
int(6)
}
- [35]=>
+ [34]=>
array(3) {
[0]=>
int(%d)
@@ -338,7 +329,7 @@ array(49) {
[2]=>
int(6)
}
- [36]=>
+ [35]=>
array(3) {
[0]=>
int(%d)
@@ -347,9 +338,9 @@ array(49) {
[2]=>
int(6)
}
- [37]=>
+ [36]=>
string(1) ";"
- [38]=>
+ [37]=>
array(3) {
[0]=>
int(%d)
@@ -359,9 +350,9 @@ array(49) {
[2]=>
int(6)
}
- [39]=>
+ [38]=>
string(1) "}"
- [40]=>
+ [39]=>
array(3) {
[0]=>
int(%d)
@@ -371,7 +362,7 @@ array(49) {
[2]=>
int(7)
}
- [41]=>
+ [40]=>
array(3) {
[0]=>
int(%d)
@@ -380,7 +371,7 @@ array(49) {
[2]=>
int(8)
}
- [42]=>
+ [41]=>
array(3) {
[0]=>
int(%d)
@@ -390,7 +381,7 @@ array(49) {
[2]=>
int(8)
}
- [43]=>
+ [42]=>
array(3) {
[0]=>
int(%d)
@@ -399,7 +390,7 @@ array(49) {
[2]=>
int(9)
}
- [44]=>
+ [43]=>
array(3) {
[0]=>
int(%d)
@@ -408,7 +399,7 @@ array(49) {
[2]=>
int(9)
}
- [45]=>
+ [44]=>
array(3) {
[0]=>
int(%d)
@@ -417,9 +408,9 @@ array(49) {
[2]=>
int(9)
}
- [46]=>
+ [45]=>
string(1) ";"
- [47]=>
+ [46]=>
array(3) {
[0]=>
int(%d)
@@ -429,7 +420,7 @@ array(49) {
[2]=>
int(9)
}
- [48]=>
+ [47]=>
array(3) {
[0]=>
int(%d)
diff --git a/ext/tokenizer/tests/token_get_all_variation12.phpt b/ext/tokenizer/tests/token_get_all_variation12.phpt
index 368fb0867cb..4684edf7f7b 100644
--- a/ext/tokenizer/tests/token_get_all_variation12.phpt
+++ b/ext/tokenizer/tests/token_get_all_variation12.phpt
@@ -23,7 +23,7 @@ echo "*** Testing token_get_all() : with language constants ***\n";
// parsing __FILE__ token
echo "-- with FILE --\n";
-$source = "";
var_dump( token_get_all($source));
@@ -54,27 +54,18 @@ echo "Done"
--EXPECTF--
*** Testing token_get_all() : with language constants ***
-- with FILE --
-array(16) {
+array(15) {
[0]=>
array(3) {
[0]=>
int(%d)
[1]=>
- string(6) "
int(1)
}
[1]=>
- array(3) {
- [0]=>
- int(%d)
- [1]=>
- string(1) "
-"
- [2]=>
- int(1)
- }
- [2]=>
array(3) {
[0]=>
int(%d)
@@ -83,7 +74,7 @@ array(16) {
[2]=>
int(2)
}
- [3]=>
+ [2]=>
array(3) {
[0]=>
int(%d)
@@ -92,9 +83,9 @@ array(16) {
[2]=>
int(2)
}
- [4]=>
+ [3]=>
string(1) "="
- [5]=>
+ [4]=>
array(3) {
[0]=>
int(%d)
@@ -103,7 +94,7 @@ array(16) {
[2]=>
int(2)
}
- [6]=>
+ [5]=>
array(3) {
[0]=>
int(%d)
@@ -112,9 +103,9 @@ array(16) {
[2]=>
int(2)
}
- [7]=>
+ [6]=>
string(1) "("
- [8]=>
+ [7]=>
array(3) {
[0]=>
int(%d)
@@ -123,9 +114,9 @@ array(16) {
[2]=>
int(2)
}
- [9]=>
+ [8]=>
string(1) ","
- [10]=>
+ [9]=>
array(3) {
[0]=>
int(%d)
@@ -134,7 +125,7 @@ array(16) {
[2]=>
int(2)
}
- [11]=>
+ [10]=>
array(3) {
[0]=>
int(%d)
@@ -143,11 +134,11 @@ array(16) {
[2]=>
int(2)
}
- [12]=>
+ [11]=>
string(1) ")"
- [13]=>
+ [12]=>
string(1) ";"
- [14]=>
+ [13]=>
array(3) {
[0]=>
int(%d)
@@ -157,7 +148,7 @@ array(16) {
[2]=>
int(2)
}
- [15]=>
+ [14]=>
array(3) {
[0]=>
int(%d)
diff --git a/ext/tokenizer/tests/token_get_all_variation13.phpt b/ext/tokenizer/tests/token_get_all_variation13.phpt
index 9f3fcd82405..6779048cf01 100644
--- a/ext/tokenizer/tests/token_get_all_variation13.phpt
+++ b/ext/tokenizer/tests/token_get_all_variation13.phpt
@@ -35,7 +35,7 @@ abstract class MyClass
protected var $c;
static $d;
final $e = 10;
-
+
abstract public function myFunction($a);
}
class ChildClass extends MyClass implements MyInterface
@@ -573,8 +573,8 @@ array(145) {
[0]=>
int(%d)
[1]=>
- string(6) "
-
+ string(4) "
+
"
[2]=>
int(12)
diff --git a/ext/tokenizer/tests/token_get_all_variation14.phpt b/ext/tokenizer/tests/token_get_all_variation14.phpt
index 9c1d16a44e0..aa41f066fda 100644
--- a/ext/tokenizer/tests/token_get_all_variation14.phpt
+++ b/ext/tokenizer/tests/token_get_all_variation14.phpt
@@ -18,7 +18,7 @@ echo "*** Testing token_get_all() : with invalid/unknown tokens ***\n";
// with valid php tags and invalid tokens
echo "-- with valid PHP tags & invlid tokens --\n";
-$source = '';
var_dump( token_get_all($source));
@@ -42,13 +42,14 @@ echo "Done"
--EXPECTF--
*** Testing token_get_all() : with invalid/unknown tokens ***
-- with valid PHP tags & invlid tokens --
-array(29) {
+array(28) {
[0]=>
array(3) {
[0]=>
int(%d)
[1]=>
- string(6) "
int(1)
}
@@ -57,17 +58,16 @@ array(29) {
[0]=>
int(%d)
[1]=>
- string(1) "
-"
+ string(6) "struct"
[2]=>
- int(1)
+ int(2)
}
[2]=>
array(3) {
[0]=>
int(%d)
[1]=>
- string(6) "struct"
+ string(1) " "
[2]=>
int(2)
}
@@ -76,20 +76,11 @@ array(29) {
[0]=>
int(%d)
[1]=>
- string(1) " "
+ string(8) "myStruct"
[2]=>
int(2)
}
[4]=>
- array(3) {
- [0]=>
- int(%d)
- [1]=>
- string(8) "myStruct"
- [2]=>
- int(2)
- }
- [5]=>
array(3) {
[0]=>
int(%d)
@@ -98,9 +89,9 @@ array(29) {
[2]=>
int(2)
}
- [6]=>
+ [5]=>
string(1) "{"
- [7]=>
+ [6]=>
array(3) {
[0]=>
int(%d)
@@ -110,7 +101,7 @@ array(29) {
[2]=>
int(2)
}
- [8]=>
+ [7]=>
array(3) {
[0]=>
int(%d)
@@ -119,7 +110,7 @@ array(29) {
[2]=>
int(%d)
}
- [9]=>
+ [8]=>
array(3) {
[0]=>
int(%d)
@@ -128,7 +119,7 @@ array(29) {
[2]=>
int(%d)
}
- [10]=>
+ [9]=>
array(3) {
[0]=>
int(%d)
@@ -137,9 +128,9 @@ array(29) {
[2]=>
int(%d)
}
- [11]=>
+ [10]=>
string(1) ";"
- [12]=>
+ [11]=>
array(3) {
[0]=>
int(%d)
@@ -149,7 +140,7 @@ array(29) {
[2]=>
int(%d)
}
- [13]=>
+ [12]=>
array(3) {
[0]=>
int(%d)
@@ -158,22 +149,22 @@ array(29) {
[2]=>
int(4)
}
- [14]=>
+ [13]=>
string(1) "("
- [15]=>
+ [14]=>
string(1) ")"
+ [15]=>
+ array(3) {
+ [0]=>
+ int(%d)
+ [1]=>
+ string(1) " "
+ [2]=>
+ int(4)
+ }
[16]=>
- array(3) {
- [0]=>
- int(%d)
- [1]=>
- string(1) " "
- [2]=>
- int(4)
- }
- [17]=>
string(1) "{"
- [18]=>
+ [17]=>
array(3) {
[0]=>
int(%d)
@@ -182,7 +173,7 @@ array(29) {
[2]=>
int(4)
}
- [19]=>
+ [18]=>
array(3) {
[0]=>
int(%d)
@@ -191,7 +182,7 @@ array(29) {
[2]=>
int(4)
}
- [20]=>
+ [19]=>
array(3) {
[0]=>
int(%d)
@@ -200,7 +191,7 @@ array(29) {
[2]=>
int(4)
}
- [21]=>
+ [20]=>
array(3) {
[0]=>
int(%d)
@@ -209,9 +200,9 @@ array(29) {
[2]=>
int(4)
}
- [22]=>
+ [21]=>
string(1) ";"
- [23]=>
+ [22]=>
array(3) {
[0]=>
int(%d)
@@ -220,9 +211,9 @@ array(29) {
[2]=>
int(4)
}
- [24]=>
+ [23]=>
string(1) "}"
- [25]=>
+ [24]=>
array(3) {
[0]=>
int(%d)
@@ -232,9 +223,9 @@ array(29) {
[2]=>
int(4)
}
- [26]=>
+ [25]=>
string(1) "}"
- [27]=>
+ [26]=>
array(3) {
[0]=>
int(%d)
@@ -244,7 +235,7 @@ array(29) {
[2]=>
int(5)
}
- [28]=>
+ [27]=>
array(3) {
[0]=>
int(%d)
@@ -261,7 +252,7 @@ array(1) {
[0]=>
int(%d)
[1]=>
- string(28) ""
[2]=>
int(1)
diff --git a/ext/tokenizer/tests/token_get_all_variation15.phpt b/ext/tokenizer/tests/token_get_all_variation15.phpt
index 5b7fcec66af..c72bbe41b96 100644
--- a/ext/tokenizer/tests/token_get_all_variation15.phpt
+++ b/ext/tokenizer/tests/token_get_all_variation15.phpt
@@ -18,11 +18,11 @@ Test token_get_all() function : usage variations - heredoc string for 'source'
echo "*** Testing token_get_all() : with heredoc source string ***\n";
$source = <<
int(%d)
[1]=>
- string(4) "
+ string(3) "
"
[2]=>
int(1)
@@ -212,7 +212,7 @@ array(103) {
[0]=>
int(%d)
[1]=>
- string(36) " This is to test
+ string(35) " This is to test
heredoc string
"
[2]=>
diff --git a/ext/tokenizer/tests/token_get_all_variation4.phpt b/ext/tokenizer/tests/token_get_all_variation4.phpt
index 3bd05295fe7..66e3cb413d2 100644
--- a/ext/tokenizer/tests/token_get_all_variation4.phpt
+++ b/ext/tokenizer/tests/token_get_all_variation4.phpt
@@ -19,8 +19,8 @@ Test token_get_all() function : usage variations - with comparison operators
echo "*** Testing token_get_all() : 'source' string with different comparison operators ***\n";
// comparison operators : '==', '===', '>=', '<=', '!=', '!==', '<>'
-$source = '
--EXPECTF--
*** Testing token_get_all() : 'source' string with different comparison operators ***
-array(89) {
+array(88) {
[0]=>
array(3) {
[0]=>
int(%d)
[1]=>
- string(6) "
int(1)
}
[1]=>
- array(3) {
- [0]=>
- int(%d)
- [1]=>
- string(1) "
-"
- [2]=>
- int(1)
- }
- [2]=>
array(3) {
[0]=>
int(%d)
@@ -66,9 +57,9 @@ array(89) {
[2]=>
int(2)
}
- [3]=>
+ [2]=>
string(1) "("
- [4]=>
+ [3]=>
array(3) {
[0]=>
int(%d)
@@ -77,7 +68,7 @@ array(89) {
[2]=>
int(2)
}
- [5]=>
+ [4]=>
array(3) {
[0]=>
int(%d)
@@ -86,25 +77,25 @@ array(89) {
[2]=>
int(2)
}
+ [5]=>
+ array(3) {
+ [0]=>
+ int(286)
+ [1]=>
+ string(2) "=="
+ [2]=>
+ int(2)
+ }
[6]=>
array(3) {
[0]=>
int(%d)
[1]=>
- string(2) "=="
+ string(1) " "
[2]=>
int(2)
}
[7]=>
- array(3) {
- [0]=>
- int(%d)
- [1]=>
- string(1) " "
- [2]=>
- int(2)
- }
- [8]=>
array(3) {
[0]=>
int(%d)
@@ -113,37 +104,37 @@ array(89) {
[2]=>
int(2)
}
- [9]=>
+ [8]=>
string(1) ")"
+ [9]=>
+ array(3) {
+ [0]=>
+ int(%d)
+ [1]=>
+ string(3) "
+ "
+ [2]=>
+ int(2)
+ }
[10]=>
array(3) {
[0]=>
int(%d)
[1]=>
- string(4) "
- "
+ string(4) "echo"
[2]=>
- int(2)
+ int(%d)
}
[11]=>
array(3) {
[0]=>
int(%d)
[1]=>
- string(4) "echo"
+ string(1) " "
[2]=>
int(%d)
}
[12]=>
- array(3) {
- [0]=>
- int(%d)
- [1]=>
- string(1) " "
- [2]=>
- int(%d)
- }
- [13]=>
array(3) {
[0]=>
int(%d)
@@ -152,9 +143,9 @@ array(89) {
[2]=>
int(%d)
}
- [14]=>
+ [13]=>
string(1) ";"
- [15]=>
+ [14]=>
array(3) {
[0]=>
int(%d)
@@ -164,7 +155,7 @@ array(89) {
[2]=>
int(%d)
}
- [16]=>
+ [15]=>
array(3) {
[0]=>
int(%d)
@@ -173,9 +164,9 @@ array(89) {
[2]=>
int(4)
}
- [17]=>
+ [16]=>
string(1) "("
- [18]=>
+ [17]=>
array(3) {
[0]=>
int(%d)
@@ -184,12 +175,21 @@ array(89) {
[2]=>
int(4)
}
+ [18]=>
+ array(3) {
+ [0]=>
+ int(%d)
+ [1]=>
+ string(1) " "
+ [2]=>
+ int(4)
+ }
[19]=>
array(3) {
[0]=>
int(%d)
[1]=>
- string(1) " "
+ string(3) "==="
[2]=>
int(4)
}
@@ -198,20 +198,11 @@ array(89) {
[0]=>
int(%d)
[1]=>
- string(3) "==="
+ string(1) " "
[2]=>
int(4)
}
[21]=>
- array(3) {
- [0]=>
- int(%d)
- [1]=>
- string(1) " "
- [2]=>
- int(4)
- }
- [22]=>
array(3) {
[0]=>
int(%d)
@@ -220,9 +211,9 @@ array(89) {
[2]=>
int(4)
}
- [23]=>
+ [22]=>
string(1) ")"
- [24]=>
+ [23]=>
array(3) {
[0]=>
int(%d)
@@ -232,7 +223,7 @@ array(89) {
[2]=>
int(4)
}
- [25]=>
+ [24]=>
array(3) {
[0]=>
int(%d)
@@ -241,16 +232,16 @@ array(89) {
[2]=>
int(5)
}
+ [25]=>
+ array(3) {
+ [0]=>
+ int(%d)
+ [1]=>
+ string(1) " "
+ [2]=>
+ int(5)
+ }
[26]=>
- array(3) {
- [0]=>
- int(%d)
- [1]=>
- string(1) " "
- [2]=>
- int(5)
- }
- [27]=>
array(3) {
[0]=>
int(%d)
@@ -259,9 +250,9 @@ array(89) {
[2]=>
int(5)
}
- [28]=>
+ [27]=>
string(1) ";"
- [29]=>
+ [28]=>
array(3) {
[0]=>
int(%d)
@@ -271,7 +262,7 @@ array(89) {
[2]=>
int(5)
}
- [30]=>
+ [29]=>
array(3) {
[0]=>
int(%d)
@@ -280,9 +271,9 @@ array(89) {
[2]=>
int(6)
}
- [31]=>
+ [30]=>
string(1) "("
- [32]=>
+ [31]=>
array(3) {
[0]=>
int(%d)
@@ -291,12 +282,21 @@ array(89) {
[2]=>
int(6)
}
+ [32]=>
+ array(3) {
+ [0]=>
+ int(%d)
+ [1]=>
+ string(1) " "
+ [2]=>
+ int(6)
+ }
[33]=>
array(3) {
[0]=>
int(%d)
[1]=>
- string(1) " "
+ string(2) ">="
[2]=>
int(6)
}
@@ -305,7 +305,7 @@ array(89) {
[0]=>
int(%d)
[1]=>
- string(2) ">="
+ string(1) " "
[2]=>
int(6)
}
@@ -314,7 +314,7 @@ array(89) {
[0]=>
int(%d)
[1]=>
- string(1) " "
+ string(2) "10"
[2]=>
int(6)
}
@@ -323,7 +323,7 @@ array(89) {
[0]=>
int(%d)
[1]=>
- string(2) "10"
+ string(1) " "
[2]=>
int(6)
}
@@ -332,7 +332,7 @@ array(89) {
[0]=>
int(%d)
[1]=>
- string(1) " "
+ string(2) "&&"
[2]=>
int(6)
}
@@ -341,7 +341,7 @@ array(89) {
[0]=>
int(%d)
[1]=>
- string(2) "&&"
+ string(1) " "
[2]=>
int(6)
}
@@ -350,7 +350,7 @@ array(89) {
[0]=>
int(%d)
[1]=>
- string(1) " "
+ string(2) "$a"
[2]=>
int(6)
}
@@ -359,7 +359,7 @@ array(89) {
[0]=>
int(%d)
[1]=>
- string(2) "$a"
+ string(1) " "
[2]=>
int(6)
}
@@ -368,7 +368,7 @@ array(89) {
[0]=>
int(%d)
[1]=>
- string(1) " "
+ string(2) "<="
[2]=>
int(6)
}
@@ -377,20 +377,11 @@ array(89) {
[0]=>
int(%d)
[1]=>
- string(2) "<="
+ string(1) " "
[2]=>
int(6)
}
[43]=>
- array(3) {
- [0]=>
- int(%d)
- [1]=>
- string(1) " "
- [2]=>
- int(6)
- }
- [44]=>
array(3) {
[0]=>
int(%d)
@@ -399,9 +390,9 @@ array(89) {
[2]=>
int(6)
}
- [45]=>
+ [44]=>
string(1) ")"
- [46]=>
+ [45]=>
array(3) {
[0]=>
int(%d)
@@ -411,7 +402,7 @@ array(89) {
[2]=>
int(6)
}
- [47]=>
+ [46]=>
array(3) {
[0]=>
int(%d)
@@ -420,16 +411,16 @@ array(89) {
[2]=>
int(7)
}
+ [47]=>
+ array(3) {
+ [0]=>
+ int(%d)
+ [1]=>
+ string(1) " "
+ [2]=>
+ int(7)
+ }
[48]=>
- array(3) {
- [0]=>
- int(%d)
- [1]=>
- string(1) " "
- [2]=>
- int(7)
- }
- [49]=>
array(3) {
[0]=>
int(%d)
@@ -438,9 +429,9 @@ array(89) {
[2]=>
int(7)
}
- [50]=>
+ [49]=>
string(1) ";"
- [51]=>
+ [50]=>
array(3) {
[0]=>
int(%d)
@@ -450,7 +441,7 @@ array(89) {
[2]=>
int(7)
}
- [52]=>
+ [51]=>
array(3) {
[0]=>
int(%d)
@@ -459,9 +450,9 @@ array(89) {
[2]=>
int(8)
}
- [53]=>
+ [52]=>
string(1) "("
- [54]=>
+ [53]=>
array(3) {
[0]=>
int(%d)
@@ -470,12 +461,21 @@ array(89) {
[2]=>
int(8)
}
+ [54]=>
+ array(3) {
+ [0]=>
+ int(%d)
+ [1]=>
+ string(1) " "
+ [2]=>
+ int(8)
+ }
[55]=>
array(3) {
[0]=>
int(%d)
[1]=>
- string(1) " "
+ string(2) "!="
[2]=>
int(8)
}
@@ -484,7 +484,7 @@ array(89) {
[0]=>
int(%d)
[1]=>
- string(2) "!="
+ string(1) " "
[2]=>
int(8)
}
@@ -493,7 +493,7 @@ array(89) {
[0]=>
int(%d)
[1]=>
- string(1) " "
+ string(1) "1"
[2]=>
int(8)
}
@@ -502,7 +502,7 @@ array(89) {
[0]=>
int(%d)
[1]=>
- string(1) "1"
+ string(1) " "
[2]=>
int(8)
}
@@ -511,7 +511,7 @@ array(89) {
[0]=>
int(%d)
[1]=>
- string(1) " "
+ string(2) "||"
[2]=>
int(8)
}
@@ -520,7 +520,7 @@ array(89) {
[0]=>
int(%d)
[1]=>
- string(2) "||"
+ string(1) " "
[2]=>
int(8)
}
@@ -529,7 +529,7 @@ array(89) {
[0]=>
int(%d)
[1]=>
- string(1) " "
+ string(2) "$a"
[2]=>
int(8)
}
@@ -538,7 +538,7 @@ array(89) {
[0]=>
int(%d)
[1]=>
- string(2) "$a"
+ string(1) " "
[2]=>
int(8)
}
@@ -547,7 +547,7 @@ array(89) {
[0]=>
int(%d)
[1]=>
- string(1) " "
+ string(2) "<>"
[2]=>
int(8)
}
@@ -556,20 +556,11 @@ array(89) {
[0]=>
int(%d)
[1]=>
- string(2) "<>"
+ string(1) " "
[2]=>
int(8)
}
[65]=>
- array(3) {
- [0]=>
- int(%d)
- [1]=>
- string(1) " "
- [2]=>
- int(8)
- }
- [66]=>
array(3) {
[0]=>
int(%d)
@@ -578,9 +569,9 @@ array(89) {
[2]=>
int(8)
}
- [67]=>
+ [66]=>
string(1) ")"
- [68]=>
+ [67]=>
array(3) {
[0]=>
int(%d)
@@ -590,7 +581,7 @@ array(89) {
[2]=>
int(8)
}
- [69]=>
+ [68]=>
array(3) {
[0]=>
int(%d)
@@ -599,16 +590,16 @@ array(89) {
[2]=>
int(9)
}
+ [69]=>
+ array(3) {
+ [0]=>
+ int(%d)
+ [1]=>
+ string(1) " "
+ [2]=>
+ int(9)
+ }
[70]=>
- array(3) {
- [0]=>
- int(%d)
- [1]=>
- string(1) " "
- [2]=>
- int(9)
- }
- [71]=>
array(3) {
[0]=>
int(%d)
@@ -617,9 +608,9 @@ array(89) {
[2]=>
int(9)
}
- [72]=>
+ [71]=>
string(1) ";"
- [73]=>
+ [72]=>
array(3) {
[0]=>
int(%d)
@@ -629,7 +620,7 @@ array(89) {
[2]=>
int(9)
}
- [74]=>
+ [73]=>
array(3) {
[0]=>
int(%d)
@@ -638,9 +629,9 @@ array(89) {
[2]=>
int(10)
}
- [75]=>
+ [74]=>
string(1) "("
- [76]=>
+ [75]=>
array(3) {
[0]=>
int(%d)
@@ -649,7 +640,7 @@ array(89) {
[2]=>
int(10)
}
- [77]=>
+ [76]=>
array(3) {
[0]=>
int(%d)
@@ -658,7 +649,7 @@ array(89) {
[2]=>
int(10)
}
- [78]=>
+ [77]=>
array(3) {
[0]=>
int(%d)
@@ -667,7 +658,7 @@ array(89) {
[2]=>
int(10)
}
- [79]=>
+ [78]=>
array(3) {
[0]=>
int(%d)
@@ -676,7 +667,7 @@ array(89) {
[2]=>
int(10)
}
- [80]=>
+ [79]=>
array(3) {
[0]=>
int(%d)
@@ -685,9 +676,9 @@ array(89) {
[2]=>
int(10)
}
- [81]=>
+ [80]=>
string(1) ")"
- [82]=>
+ [81]=>
array(3) {
[0]=>
int(%d)
@@ -697,7 +688,7 @@ array(89) {
[2]=>
int(10)
}
- [83]=>
+ [82]=>
array(3) {
[0]=>
int(%d)
@@ -706,7 +697,7 @@ array(89) {
[2]=>
int(11)
}
- [84]=>
+ [83]=>
array(3) {
[0]=>
int(%d)
@@ -715,7 +706,7 @@ array(89) {
[2]=>
int(11)
}
- [85]=>
+ [84]=>
array(3) {
[0]=>
int(%d)
@@ -724,9 +715,9 @@ array(89) {
[2]=>
int(11)
}
- [86]=>
+ [85]=>
string(1) ";"
- [87]=>
+ [86]=>
array(3) {
[0]=>
int(%d)
@@ -736,7 +727,7 @@ array(89) {
[2]=>
int(11)
}
- [88]=>
+ [87]=>
array(3) {
[0]=>
int(%d)
diff --git a/ext/tokenizer/tests/token_get_all_variation5.phpt b/ext/tokenizer/tests/token_get_all_variation5.phpt
index d81562060a6..3eed7676658 100644
--- a/ext/tokenizer/tests/token_get_all_variation5.phpt
+++ b/ext/tokenizer/tests/token_get_all_variation5.phpt
@@ -21,7 +21,7 @@ Test token_get_all() function : usage variations - with assignment operators
echo "*** Testing token_get_all() : 'source' string with different assignment operators ***\n";
// assignment operators : '+=', '-=', '*=', '/=', '%=', '&=', '|=', '^=', '>>=', '<<=', '.='
-$source = '
--EXPECTF--
*** Testing token_get_all() : 'source' string with different assignment operators ***
-array(94) {
+array(93) {
[0]=>
array(3) {
[0]=>
int(%d)
[1]=>
- string(6) "
int(1)
}
@@ -56,32 +57,22 @@ array(94) {
[0]=>
int(%d)
[1]=>
- string(1) "
-"
+ string(2) "$a"
[2]=>
- int(1)
+ int(2)
}
[2]=>
array(3) {
[0]=>
int(%d)
[1]=>
- string(2) "$a"
+ string(1) " "
[2]=>
int(2)
}
[3]=>
- array(3) {
- [0]=>
- int(%d)
- [1]=>
- string(1) " "
- [2]=>
- int(2)
- }
- [4]=>
string(1) "="
- [5]=>
+ [4]=>
array(3) {
[0]=>
int(%d)
@@ -90,7 +81,7 @@ array(94) {
[2]=>
int(2)
}
- [6]=>
+ [5]=>
array(3) {
[0]=>
int(%d)
@@ -99,9 +90,9 @@ array(94) {
[2]=>
int(2)
}
- [7]=>
+ [6]=>
string(1) ","
- [8]=>
+ [7]=>
array(3) {
[0]=>
int(%d)
@@ -110,27 +101,27 @@ array(94) {
[2]=>
int(2)
}
+ [8]=>
+ array(3) {
+ [0]=>
+ int(%d)
+ [1]=>
+ string(2) "$b"
+ [2]=>
+ int(2)
+ }
[9]=>
array(3) {
[0]=>
int(%d)
[1]=>
- string(2) "$b"
+ string(1) " "
[2]=>
int(2)
}
[10]=>
- array(3) {
- [0]=>
- int(%d)
- [1]=>
- string(1) " "
- [2]=>
- int(2)
- }
- [11]=>
string(1) "="
- [12]=>
+ [11]=>
array(3) {
[0]=>
int(%d)
@@ -139,7 +130,7 @@ array(94) {
[2]=>
int(2)
}
- [13]=>
+ [12]=>
array(3) {
[0]=>
int(%d)
@@ -148,9 +139,9 @@ array(94) {
[2]=>
int(2)
}
- [14]=>
+ [13]=>
string(1) ";"
- [15]=>
+ [14]=>
array(3) {
[0]=>
int(%d)
@@ -160,7 +151,7 @@ array(94) {
[2]=>
int(2)
}
- [16]=>
+ [15]=>
array(3) {
[0]=>
int(%d)
@@ -169,12 +160,21 @@ array(94) {
[2]=>
int(%d)
}
+ [16]=>
+ array(3) {
+ [0]=>
+ int(%d)
+ [1]=>
+ string(1) " "
+ [2]=>
+ int(%d)
+ }
[17]=>
array(3) {
[0]=>
int(%d)
[1]=>
- string(1) " "
+ string(2) "+="
[2]=>
int(%d)
}
@@ -183,20 +183,11 @@ array(94) {
[0]=>
int(%d)
[1]=>
- string(2) "+="
+ string(1) " "
[2]=>
int(%d)
}
[19]=>
- array(3) {
- [0]=>
- int(%d)
- [1]=>
- string(1) " "
- [2]=>
- int(%d)
- }
- [20]=>
array(3) {
[0]=>
int(%d)
@@ -205,9 +196,9 @@ array(94) {
[2]=>
int(%d)
}
- [21]=>
+ [20]=>
string(1) ";"
- [22]=>
+ [21]=>
array(3) {
[0]=>
int(%d)
@@ -217,7 +208,7 @@ array(94) {
[2]=>
int(%d)
}
- [23]=>
+ [22]=>
array(3) {
[0]=>
int(%d)
@@ -226,12 +217,21 @@ array(94) {
[2]=>
int(4)
}
+ [23]=>
+ array(3) {
+ [0]=>
+ int(%d)
+ [1]=>
+ string(1) " "
+ [2]=>
+ int(4)
+ }
[24]=>
array(3) {
[0]=>
int(%d)
[1]=>
- string(1) " "
+ string(2) "-="
[2]=>
int(4)
}
@@ -240,20 +240,11 @@ array(94) {
[0]=>
int(%d)
[1]=>
- string(2) "-="
+ string(1) " "
[2]=>
int(4)
}
[26]=>
- array(3) {
- [0]=>
- int(%d)
- [1]=>
- string(1) " "
- [2]=>
- int(4)
- }
- [27]=>
array(3) {
[0]=>
int(%d)
@@ -262,9 +253,9 @@ array(94) {
[2]=>
int(4)
}
- [28]=>
+ [27]=>
string(1) ";"
- [29]=>
+ [28]=>
array(3) {
[0]=>
int(%d)
@@ -274,7 +265,7 @@ array(94) {
[2]=>
int(4)
}
- [30]=>
+ [29]=>
array(3) {
[0]=>
int(%d)
@@ -283,12 +274,21 @@ array(94) {
[2]=>
int(5)
}
+ [30]=>
+ array(3) {
+ [0]=>
+ int(%d)
+ [1]=>
+ string(1) " "
+ [2]=>
+ int(5)
+ }
[31]=>
array(3) {
[0]=>
int(%d)
[1]=>
- string(1) " "
+ string(2) "*="
[2]=>
int(5)
}
@@ -297,20 +297,11 @@ array(94) {
[0]=>
int(%d)
[1]=>
- string(2) "*="
+ string(1) " "
[2]=>
int(5)
}
[33]=>
- array(3) {
- [0]=>
- int(%d)
- [1]=>
- string(1) " "
- [2]=>
- int(5)
- }
- [34]=>
array(3) {
[0]=>
int(%d)
@@ -319,9 +310,9 @@ array(94) {
[2]=>
int(5)
}
- [35]=>
+ [34]=>
string(1) ";"
- [36]=>
+ [35]=>
array(3) {
[0]=>
int(%d)
@@ -331,7 +322,7 @@ array(94) {
[2]=>
int(5)
}
- [37]=>
+ [36]=>
array(3) {
[0]=>
int(%d)
@@ -340,12 +331,21 @@ array(94) {
[2]=>
int(6)
}
+ [37]=>
+ array(3) {
+ [0]=>
+ int(%d)
+ [1]=>
+ string(1) " "
+ [2]=>
+ int(6)
+ }
[38]=>
array(3) {
[0]=>
int(%d)
[1]=>
- string(1) " "
+ string(2) "/="
[2]=>
int(6)
}
@@ -354,20 +354,11 @@ array(94) {
[0]=>
int(%d)
[1]=>
- string(2) "/="
+ string(1) " "
[2]=>
int(6)
}
[40]=>
- array(3) {
- [0]=>
- int(%d)
- [1]=>
- string(1) " "
- [2]=>
- int(6)
- }
- [41]=>
array(3) {
[0]=>
int(%d)
@@ -376,9 +367,9 @@ array(94) {
[2]=>
int(6)
}
- [42]=>
+ [41]=>
string(1) ";"
- [43]=>
+ [42]=>
array(3) {
[0]=>
int(%d)
@@ -388,7 +379,7 @@ array(94) {
[2]=>
int(6)
}
- [44]=>
+ [43]=>
array(3) {
[0]=>
int(%d)
@@ -397,12 +388,21 @@ array(94) {
[2]=>
int(7)
}
+ [44]=>
+ array(3) {
+ [0]=>
+ int(%d)
+ [1]=>
+ string(1) " "
+ [2]=>
+ int(7)
+ }
[45]=>
array(3) {
[0]=>
int(%d)
[1]=>
- string(1) " "
+ string(2) "%="
[2]=>
int(7)
}
@@ -411,20 +411,11 @@ array(94) {
[0]=>
int(%d)
[1]=>
- string(2) "%="
+ string(1) " "
[2]=>
int(7)
}
[47]=>
- array(3) {
- [0]=>
- int(%d)
- [1]=>
- string(1) " "
- [2]=>
- int(7)
- }
- [48]=>
array(3) {
[0]=>
int(%d)
@@ -433,9 +424,9 @@ array(94) {
[2]=>
int(7)
}
- [49]=>
+ [48]=>
string(1) ";"
- [50]=>
+ [49]=>
array(3) {
[0]=>
int(%d)
@@ -445,7 +436,7 @@ array(94) {
[2]=>
int(7)
}
- [51]=>
+ [50]=>
array(3) {
[0]=>
int(%d)
@@ -454,12 +445,21 @@ array(94) {
[2]=>
int(8)
}
+ [51]=>
+ array(3) {
+ [0]=>
+ int(%d)
+ [1]=>
+ string(1) " "
+ [2]=>
+ int(8)
+ }
[52]=>
array(3) {
[0]=>
int(%d)
[1]=>
- string(1) " "
+ string(2) "&="
[2]=>
int(8)
}
@@ -468,20 +468,11 @@ array(94) {
[0]=>
int(%d)
[1]=>
- string(2) "&="
+ string(1) " "
[2]=>
int(8)
}
[54]=>
- array(3) {
- [0]=>
- int(%d)
- [1]=>
- string(1) " "
- [2]=>
- int(8)
- }
- [55]=>
array(3) {
[0]=>
int(%d)
@@ -490,9 +481,9 @@ array(94) {
[2]=>
int(8)
}
- [56]=>
+ [55]=>
string(1) ";"
- [57]=>
+ [56]=>
array(3) {
[0]=>
int(%d)
@@ -502,7 +493,7 @@ array(94) {
[2]=>
int(8)
}
- [58]=>
+ [57]=>
array(3) {
[0]=>
int(%d)
@@ -511,12 +502,21 @@ array(94) {
[2]=>
int(9)
}
+ [58]=>
+ array(3) {
+ [0]=>
+ int(%d)
+ [1]=>
+ string(1) " "
+ [2]=>
+ int(9)
+ }
[59]=>
array(3) {
[0]=>
int(%d)
[1]=>
- string(1) " "
+ string(2) "|="
[2]=>
int(9)
}
@@ -525,20 +525,11 @@ array(94) {
[0]=>
int(%d)
[1]=>
- string(2) "|="
+ string(1) " "
[2]=>
int(9)
}
[61]=>
- array(3) {
- [0]=>
- int(%d)
- [1]=>
- string(1) " "
- [2]=>
- int(9)
- }
- [62]=>
array(3) {
[0]=>
int(%d)
@@ -547,9 +538,9 @@ array(94) {
[2]=>
int(9)
}
- [63]=>
+ [62]=>
string(1) ";"
- [64]=>
+ [63]=>
array(3) {
[0]=>
int(%d)
@@ -559,7 +550,7 @@ array(94) {
[2]=>
int(9)
}
- [65]=>
+ [64]=>
array(3) {
[0]=>
int(%d)
@@ -568,12 +559,21 @@ array(94) {
[2]=>
int(10)
}
+ [65]=>
+ array(3) {
+ [0]=>
+ int(%d)
+ [1]=>
+ string(1) " "
+ [2]=>
+ int(10)
+ }
[66]=>
array(3) {
[0]=>
int(%d)
[1]=>
- string(1) " "
+ string(2) "^="
[2]=>
int(10)
}
@@ -582,20 +582,11 @@ array(94) {
[0]=>
int(%d)
[1]=>
- string(2) "^="
+ string(1) " "
[2]=>
int(10)
}
[68]=>
- array(3) {
- [0]=>
- int(%d)
- [1]=>
- string(1) " "
- [2]=>
- int(10)
- }
- [69]=>
array(3) {
[0]=>
int(%d)
@@ -604,9 +595,9 @@ array(94) {
[2]=>
int(10)
}
- [70]=>
+ [69]=>
string(1) ";"
- [71]=>
+ [70]=>
array(3) {
[0]=>
int(%d)
@@ -616,7 +607,7 @@ array(94) {
[2]=>
int(10)
}
- [72]=>
+ [71]=>
array(3) {
[0]=>
int(%d)
@@ -625,7 +616,7 @@ array(94) {
[2]=>
int(11)
}
- [73]=>
+ [72]=>
array(3) {
[0]=>
int(%d)
@@ -634,7 +625,7 @@ array(94) {
[2]=>
int(11)
}
- [74]=>
+ [73]=>
array(3) {
[0]=>
int(%d)
@@ -643,7 +634,7 @@ array(94) {
[2]=>
int(11)
}
- [75]=>
+ [74]=>
array(3) {
[0]=>
int(%d)
@@ -652,7 +643,7 @@ array(94) {
[2]=>
int(11)
}
- [76]=>
+ [75]=>
array(3) {
[0]=>
int(%d)
@@ -661,9 +652,9 @@ array(94) {
[2]=>
int(11)
}
- [77]=>
+ [76]=>
string(1) ";"
- [78]=>
+ [77]=>
array(3) {
[0]=>
int(%d)
@@ -673,7 +664,7 @@ array(94) {
[2]=>
int(11)
}
- [79]=>
+ [78]=>
array(3) {
[0]=>
int(%d)
@@ -682,7 +673,7 @@ array(94) {
[2]=>
int(12)
}
- [80]=>
+ [79]=>
array(3) {
[0]=>
int(%d)
@@ -691,7 +682,7 @@ array(94) {
[2]=>
int(12)
}
- [81]=>
+ [80]=>
array(3) {
[0]=>
int(%d)
@@ -700,7 +691,7 @@ array(94) {
[2]=>
int(12)
}
- [82]=>
+ [81]=>
array(3) {
[0]=>
int(%d)
@@ -709,7 +700,7 @@ array(94) {
[2]=>
int(12)
}
- [83]=>
+ [82]=>
array(3) {
[0]=>
int(%d)
@@ -718,9 +709,9 @@ array(94) {
[2]=>
int(12)
}
- [84]=>
+ [83]=>
string(1) ";"
- [85]=>
+ [84]=>
array(3) {
[0]=>
int(%d)
@@ -730,7 +721,7 @@ array(94) {
[2]=>
int(12)
}
- [86]=>
+ [85]=>
array(3) {
[0]=>
int(%d)
@@ -739,7 +730,7 @@ array(94) {
[2]=>
int(13)
}
- [87]=>
+ [86]=>
array(3) {
[0]=>
int(%d)
@@ -748,7 +739,7 @@ array(94) {
[2]=>
int(13)
}
- [88]=>
+ [87]=>
array(3) {
[0]=>
int(%d)
@@ -757,7 +748,7 @@ array(94) {
[2]=>
int(13)
}
- [89]=>
+ [88]=>
array(3) {
[0]=>
int(%d)
@@ -766,7 +757,7 @@ array(94) {
[2]=>
int(13)
}
- [90]=>
+ [89]=>
array(3) {
[0]=>
int(%d)
@@ -775,9 +766,9 @@ array(94) {
[2]=>
int(13)
}
- [91]=>
+ [90]=>
string(1) ";"
- [92]=>
+ [91]=>
array(3) {
[0]=>
int(%d)
@@ -787,7 +778,7 @@ array(94) {
[2]=>
int(13)
}
- [93]=>
+ [92]=>
array(3) {
[0]=>
int(%d)
diff --git a/ext/tokenizer/tests/token_get_all_variation7.phpt b/ext/tokenizer/tests/token_get_all_variation7.phpt
index 8ba8db8b7e3..6d976a40549 100644
--- a/ext/tokenizer/tests/token_get_all_variation7.phpt
+++ b/ext/tokenizer/tests/token_get_all_variation7.phpt
@@ -18,25 +18,26 @@ Test token_get_all() function : usage variations - with increment/decrement oper
echo "*** Testing token_get_all() : 'source' string with different increment/decrement operators ***\n";
// increment/decrement operators : '++' , '--'
-$source = '';
-var_dump( token_get_all($source));
+var_dump(token_get_all($source));
echo "Done"
?>
--EXPECTF--
*** Testing token_get_all() : 'source' string with different increment/decrement operators ***
-array(30) {
+array(29) {
[0]=>
array(3) {
[0]=>
int(%d)
[1]=>
- string(6) "
int(1)
}
@@ -45,32 +46,22 @@ array(30) {
[0]=>
int(%d)
[1]=>
- string(1) "
-"
+ string(2) "$a"
[2]=>
- int(1)
+ int(2)
}
[2]=>
array(3) {
[0]=>
int(%d)
[1]=>
- string(2) "$a"
+ string(1) " "
[2]=>
int(2)
}
[3]=>
- array(3) {
- [0]=>
- int(%d)
- [1]=>
- string(1) " "
- [2]=>
- int(2)
- }
- [4]=>
string(1) "="
- [5]=>
+ [4]=>
array(3) {
[0]=>
int(%d)
@@ -79,7 +70,7 @@ array(30) {
[2]=>
int(2)
}
- [6]=>
+ [5]=>
array(3) {
[0]=>
int(%d)
@@ -88,9 +79,9 @@ array(30) {
[2]=>
int(2)
}
- [7]=>
+ [6]=>
string(1) ","
- [8]=>
+ [7]=>
array(3) {
[0]=>
int(%d)
@@ -99,27 +90,27 @@ array(30) {
[2]=>
int(2)
}
+ [8]=>
+ array(3) {
+ [0]=>
+ int(%d)
+ [1]=>
+ string(2) "$b"
+ [2]=>
+ int(2)
+ }
[9]=>
array(3) {
[0]=>
int(%d)
[1]=>
- string(2) "$b"
+ string(1) " "
[2]=>
int(2)
}
[10]=>
- array(3) {
- [0]=>
- int(%d)
- [1]=>
- string(1) " "
- [2]=>
- int(2)
- }
- [11]=>
string(1) "="
- [12]=>
+ [11]=>
array(3) {
[0]=>
int(%d)
@@ -128,7 +119,7 @@ array(30) {
[2]=>
int(2)
}
- [13]=>
+ [12]=>
array(3) {
[0]=>
int(%d)
@@ -137,9 +128,9 @@ array(30) {
[2]=>
int(2)
}
- [14]=>
+ [13]=>
string(1) ";"
- [15]=>
+ [14]=>
array(3) {
[0]=>
int(%d)
@@ -149,7 +140,7 @@ array(30) {
[2]=>
int(2)
}
- [16]=>
+ [15]=>
array(3) {
[0]=>
int(%d)
@@ -158,7 +149,7 @@ array(30) {
[2]=>
int(%d)
}
- [17]=>
+ [16]=>
array(3) {
[0]=>
int(%d)
@@ -167,9 +158,9 @@ array(30) {
[2]=>
int(%d)
}
- [18]=>
+ [17]=>
string(1) ";"
- [19]=>
+ [18]=>
array(3) {
[0]=>
int(%d)
@@ -179,7 +170,7 @@ array(30) {
[2]=>
int(%d)
}
- [20]=>
+ [19]=>
array(3) {
[0]=>
int(%d)
@@ -188,7 +179,7 @@ array(30) {
[2]=>
int(4)
}
- [21]=>
+ [20]=>
array(3) {
[0]=>
int(%d)
@@ -197,9 +188,9 @@ array(30) {
[2]=>
int(4)
}
- [22]=>
+ [21]=>
string(1) ";"
- [23]=>
+ [22]=>
array(3) {
[0]=>
int(%d)
@@ -209,7 +200,7 @@ array(30) {
[2]=>
int(4)
}
- [24]=>
+ [23]=>
array(3) {
[0]=>
int(%d)
@@ -218,7 +209,7 @@ array(30) {
[2]=>
int(5)
}
- [25]=>
+ [24]=>
array(3) {
[0]=>
int(%d)
@@ -227,7 +218,7 @@ array(30) {
[2]=>
int(5)
}
- [26]=>
+ [25]=>
array(3) {
[0]=>
int(%d)
@@ -236,9 +227,9 @@ array(30) {
[2]=>
int(5)
}
- [27]=>
+ [26]=>
string(1) ";"
- [28]=>
+ [27]=>
array(3) {
[0]=>
int(%d)
@@ -248,7 +239,7 @@ array(30) {
[2]=>
int(5)
}
- [29]=>
+ [28]=>
array(3) {
[0]=>
int(%d)
diff --git a/ext/tokenizer/tests/token_get_all_variation8.phpt b/ext/tokenizer/tests/token_get_all_variation8.phpt
index f1c3ff15e0a..015e60d6e33 100644
--- a/ext/tokenizer/tests/token_get_all_variation8.phpt
+++ b/ext/tokenizer/tests/token_get_all_variation8.phpt
@@ -19,7 +19,7 @@ Test token_get_all() function : usage variations - with type casting operators
echo "*** Testing token_get_all() : 'source' string with different type casting operators ***\n";
// type casting operators : (int), (integer), (float), (real), (double), (string), (array), (object), (bool), (boolean),(unset)
-$source = '
--EXPECTF--
*** Testing token_get_all() : 'source' string with different type casting operators ***
-array(108) {
+array(107) {
[0]=>
array(3) {
[0]=>
int(%d)
[1]=>
- string(6) "
int(1)
}
@@ -51,32 +52,22 @@ array(108) {
[0]=>
int(%d)
[1]=>
- string(1) "
-"
+ string(2) "$a"
[2]=>
- int(1)
+ int(2)
}
[2]=>
array(3) {
[0]=>
int(%d)
[1]=>
- string(2) "$a"
+ string(1) " "
[2]=>
int(2)
}
[3]=>
- array(3) {
- [0]=>
- int(%d)
- [1]=>
- string(1) " "
- [2]=>
- int(2)
- }
- [4]=>
string(1) "="
- [5]=>
+ [4]=>
array(3) {
[0]=>
int(%d)
@@ -85,7 +76,7 @@ array(108) {
[2]=>
int(2)
}
- [6]=>
+ [5]=>
array(3) {
[0]=>
int(%d)
@@ -94,9 +85,9 @@ array(108) {
[2]=>
int(2)
}
- [7]=>
+ [6]=>
string(1) ","
- [8]=>
+ [7]=>
array(3) {
[0]=>
int(%d)
@@ -105,27 +96,27 @@ array(108) {
[2]=>
int(2)
}
+ [8]=>
+ array(3) {
+ [0]=>
+ int(%d)
+ [1]=>
+ string(2) "$b"
+ [2]=>
+ int(2)
+ }
[9]=>
array(3) {
[0]=>
int(%d)
[1]=>
- string(2) "$b"
+ string(1) " "
[2]=>
int(2)
}
[10]=>
- array(3) {
- [0]=>
- int(%d)
- [1]=>
- string(1) " "
- [2]=>
- int(2)
- }
- [11]=>
string(1) "="
- [12]=>
+ [11]=>
array(3) {
[0]=>
int(%d)
@@ -134,7 +125,7 @@ array(108) {
[2]=>
int(2)
}
- [13]=>
+ [12]=>
array(3) {
[0]=>
int(%d)
@@ -143,7 +134,7 @@ array(108) {
[2]=>
int(2)
}
- [14]=>
+ [13]=>
array(3) {
[0]=>
int(%d)
@@ -153,7 +144,7 @@ array(108) {
[2]=>
int(2)
}
- [15]=>
+ [14]=>
array(3) {
[0]=>
int(%d)
@@ -162,18 +153,18 @@ array(108) {
[2]=>
int(%d)
}
+ [15]=>
+ array(3) {
+ [0]=>
+ int(%d)
+ [1]=>
+ string(1) " "
+ [2]=>
+ int(%d)
+ }
[16]=>
- array(3) {
- [0]=>
- int(%d)
- [1]=>
- string(1) " "
- [2]=>
- int(%d)
- }
- [17]=>
string(1) "="
- [18]=>
+ [17]=>
array(3) {
[0]=>
int(%d)
@@ -182,7 +173,7 @@ array(108) {
[2]=>
int(%d)
}
- [19]=>
+ [18]=>
array(3) {
[0]=>
int(%d)
@@ -191,7 +182,7 @@ array(108) {
[2]=>
int(%d)
}
- [20]=>
+ [19]=>
array(3) {
[0]=>
int(%d)
@@ -200,18 +191,18 @@ array(108) {
[2]=>
int(%d)
}
+ [20]=>
+ array(3) {
+ [0]=>
+ int(%d)
+ [1]=>
+ string(1) " "
+ [2]=>
+ int(%d)
+ }
[21]=>
- array(3) {
- [0]=>
- int(%d)
- [1]=>
- string(1) " "
- [2]=>
- int(%d)
- }
- [22]=>
string(1) "+"
- [23]=>
+ [22]=>
array(3) {
[0]=>
int(%d)
@@ -220,7 +211,7 @@ array(108) {
[2]=>
int(%d)
}
- [24]=>
+ [23]=>
array(3) {
[0]=>
int(%d)
@@ -229,9 +220,9 @@ array(108) {
[2]=>
int(%d)
}
- [25]=>
+ [24]=>
string(1) ";"
- [26]=>
+ [25]=>
array(3) {
[0]=>
int(%d)
@@ -241,7 +232,7 @@ array(108) {
[2]=>
int(%d)
}
- [27]=>
+ [26]=>
array(3) {
[0]=>
int(%d)
@@ -250,18 +241,18 @@ array(108) {
[2]=>
int(4)
}
+ [27]=>
+ array(3) {
+ [0]=>
+ int(%d)
+ [1]=>
+ string(1) " "
+ [2]=>
+ int(4)
+ }
[28]=>
- array(3) {
- [0]=>
- int(%d)
- [1]=>
- string(1) " "
- [2]=>
- int(4)
- }
- [29]=>
string(1) "="
- [30]=>
+ [29]=>
array(3) {
[0]=>
int(%d)
@@ -270,7 +261,7 @@ array(108) {
[2]=>
int(4)
}
- [31]=>
+ [30]=>
array(3) {
[0]=>
int(%d)
@@ -279,7 +270,7 @@ array(108) {
[2]=>
int(4)
}
- [32]=>
+ [31]=>
array(3) {
[0]=>
int(%d)
@@ -288,18 +279,18 @@ array(108) {
[2]=>
int(4)
}
+ [32]=>
+ array(3) {
+ [0]=>
+ int(%d)
+ [1]=>
+ string(1) " "
+ [2]=>
+ int(4)
+ }
[33]=>
- array(3) {
- [0]=>
- int(%d)
- [1]=>
- string(1) " "
- [2]=>
- int(4)
- }
- [34]=>
string(1) "+"
- [35]=>
+ [34]=>
array(3) {
[0]=>
int(%d)
@@ -308,7 +299,7 @@ array(108) {
[2]=>
int(4)
}
- [36]=>
+ [35]=>
array(3) {
[0]=>
int(%d)
@@ -317,9 +308,9 @@ array(108) {
[2]=>
int(4)
}
- [37]=>
+ [36]=>
string(1) ";"
- [38]=>
+ [37]=>
array(3) {
[0]=>
int(%d)
@@ -329,7 +320,7 @@ array(108) {
[2]=>
int(4)
}
- [39]=>
+ [38]=>
array(3) {
[0]=>
int(%d)
@@ -338,7 +329,7 @@ array(108) {
[2]=>
int(5)
}
- [40]=>
+ [39]=>
array(3) {
[0]=>
int(%d)
@@ -347,9 +338,9 @@ array(108) {
[2]=>
int(5)
}
- [41]=>
+ [40]=>
string(1) "="
- [42]=>
+ [41]=>
array(3) {
[0]=>
int(%d)
@@ -358,16 +349,16 @@ array(108) {
[2]=>
int(5)
}
+ [42]=>
+ array(3) {
+ [0]=>
+ int(%d)
+ [1]=>
+ string(8) "(string)"
+ [2]=>
+ int(5)
+ }
[43]=>
- array(3) {
- [0]=>
- int(%d)
- [1]=>
- string(8) "(string)"
- [2]=>
- int(5)
- }
- [44]=>
array(3) {
[0]=>
int(%d)
@@ -376,9 +367,9 @@ array(108) {
[2]=>
int(5)
}
- [45]=>
+ [44]=>
string(1) "."
- [46]=>
+ [45]=>
array(3) {
[0]=>
int(%d)
@@ -387,7 +378,7 @@ array(108) {
[2]=>
int(5)
}
- [47]=>
+ [46]=>
array(3) {
[0]=>
int(%d)
@@ -396,9 +387,9 @@ array(108) {
[2]=>
int(5)
}
- [48]=>
+ [47]=>
string(1) ";"
- [49]=>
+ [48]=>
array(3) {
[0]=>
int(%d)
@@ -408,7 +399,7 @@ array(108) {
[2]=>
int(5)
}
- [50]=>
+ [49]=>
array(3) {
[0]=>
int(%d)
@@ -417,9 +408,9 @@ array(108) {
[2]=>
int(6)
}
- [51]=>
+ [50]=>
string(1) "("
- [52]=>
+ [51]=>
array(3) {
[0]=>
int(%d)
@@ -428,7 +419,7 @@ array(108) {
[2]=>
int(6)
}
- [53]=>
+ [52]=>
array(3) {
[0]=>
int(%d)
@@ -437,9 +428,9 @@ array(108) {
[2]=>
int(6)
}
- [54]=>
+ [53]=>
string(1) ")"
- [55]=>
+ [54]=>
array(3) {
[0]=>
int(%d)
@@ -448,25 +439,25 @@ array(108) {
[2]=>
int(6)
}
+ [55]=>
+ array(3) {
+ [0]=>
+ int(%d)
+ [1]=>
+ string(4) "echo"
+ [2]=>
+ int(6)
+ }
[56]=>
array(3) {
[0]=>
int(%d)
[1]=>
- string(4) "echo"
+ string(1) " "
[2]=>
int(6)
}
[57]=>
- array(3) {
- [0]=>
- int(%d)
- [1]=>
- string(1) " "
- [2]=>
- int(6)
- }
- [58]=>
array(3) {
[0]=>
int(%d)
@@ -475,9 +466,9 @@ array(108) {
[2]=>
int(6)
}
- [59]=>
+ [58]=>
string(1) ";"
- [60]=>
+ [59]=>
array(3) {
[0]=>
int(%d)
@@ -487,7 +478,7 @@ array(108) {
[2]=>
int(6)
}
- [61]=>
+ [60]=>
array(3) {
[0]=>
int(%d)
@@ -496,11 +487,11 @@ array(108) {
[2]=>
int(7)
}
- [62]=>
+ [61]=>
string(1) "("
- [63]=>
+ [62]=>
string(1) "!"
- [64]=>
+ [63]=>
array(3) {
[0]=>
int(%d)
@@ -509,7 +500,7 @@ array(108) {
[2]=>
int(7)
}
- [65]=>
+ [64]=>
array(3) {
[0]=>
int(%d)
@@ -518,9 +509,9 @@ array(108) {
[2]=>
int(7)
}
- [66]=>
+ [65]=>
string(1) ")"
- [67]=>
+ [66]=>
array(3) {
[0]=>
int(%d)
@@ -529,7 +520,7 @@ array(108) {
[2]=>
int(7)
}
- [68]=>
+ [67]=>
array(3) {
[0]=>
int(%d)
@@ -538,7 +529,7 @@ array(108) {
[2]=>
int(7)
}
- [69]=>
+ [68]=>
array(3) {
[0]=>
int(%d)
@@ -547,7 +538,7 @@ array(108) {
[2]=>
int(7)
}
- [70]=>
+ [69]=>
array(3) {
[0]=>
int(%d)
@@ -556,9 +547,9 @@ array(108) {
[2]=>
int(7)
}
- [71]=>
+ [70]=>
string(1) ";"
- [72]=>
+ [71]=>
array(3) {
[0]=>
int(%d)
@@ -568,7 +559,7 @@ array(108) {
[2]=>
int(7)
}
- [73]=>
+ [72]=>
array(3) {
[0]=>
int(%d)
@@ -577,7 +568,7 @@ array(108) {
[2]=>
int(8)
}
- [74]=>
+ [73]=>
array(3) {
[0]=>
int(%d)
@@ -586,9 +577,9 @@ array(108) {
[2]=>
int(8)
}
- [75]=>
+ [74]=>
string(1) "="
- [76]=>
+ [75]=>
array(3) {
[0]=>
int(%d)
@@ -597,27 +588,27 @@ array(108) {
[2]=>
int(8)
}
+ [76]=>
+ array(3) {
+ [0]=>
+ int(%d)
+ [1]=>
+ string(2) "$c"
+ [2]=>
+ int(8)
+ }
[77]=>
array(3) {
[0]=>
int(%d)
[1]=>
- string(2) "$c"
+ string(1) " "
[2]=>
int(8)
}
[78]=>
- array(3) {
- [0]=>
- int(%d)
- [1]=>
- string(1) " "
- [2]=>
- int(8)
- }
- [79]=>
string(1) "+"
- [80]=>
+ [79]=>
array(3) {
[0]=>
int(%d)
@@ -626,7 +617,7 @@ array(108) {
[2]=>
int(8)
}
- [81]=>
+ [80]=>
array(3) {
[0]=>
int(%d)
@@ -635,7 +626,7 @@ array(108) {
[2]=>
int(8)
}
- [82]=>
+ [81]=>
array(3) {
[0]=>
int(%d)
@@ -644,7 +635,7 @@ array(108) {
[2]=>
int(8)
}
- [83]=>
+ [82]=>
array(3) {
[0]=>
int(%d)
@@ -653,9 +644,9 @@ array(108) {
[2]=>
int(8)
}
- [84]=>
+ [83]=>
string(1) ";"
- [85]=>
+ [84]=>
array(3) {
[0]=>
int(%d)
@@ -665,7 +656,7 @@ array(108) {
[2]=>
int(8)
}
- [86]=>
+ [85]=>
array(3) {
[0]=>
int(%d)
@@ -674,18 +665,18 @@ array(108) {
[2]=>
int(9)
}
+ [86]=>
+ array(3) {
+ [0]=>
+ int(%d)
+ [1]=>
+ string(1) " "
+ [2]=>
+ int(9)
+ }
[87]=>
- array(3) {
- [0]=>
- int(%d)
- [1]=>
- string(1) " "
- [2]=>
- int(9)
- }
- [88]=>
string(1) "="
- [89]=>
+ [88]=>
array(3) {
[0]=>
int(%d)
@@ -694,7 +685,7 @@ array(108) {
[2]=>
int(9)
}
- [90]=>
+ [89]=>
array(3) {
[0]=>
int(%d)
@@ -703,18 +694,18 @@ array(108) {
[2]=>
int(9)
}
+ [90]=>
+ array(3) {
+ [0]=>
+ int(%d)
+ [1]=>
+ string(1) " "
+ [2]=>
+ int(9)
+ }
[91]=>
- array(3) {
- [0]=>
- int(%d)
- [1]=>
- string(1) " "
- [2]=>
- int(9)
- }
- [92]=>
string(1) "-"
- [93]=>
+ [92]=>
array(3) {
[0]=>
int(%d)
@@ -723,7 +714,7 @@ array(108) {
[2]=>
int(9)
}
- [94]=>
+ [93]=>
array(3) {
[0]=>
int(%d)
@@ -732,7 +723,7 @@ array(108) {
[2]=>
int(9)
}
- [95]=>
+ [94]=>
array(3) {
[0]=>
int(%d)
@@ -741,7 +732,7 @@ array(108) {
[2]=>
int(9)
}
- [96]=>
+ [95]=>
array(3) {
[0]=>
int(%d)
@@ -750,9 +741,9 @@ array(108) {
[2]=>
int(9)
}
- [97]=>
+ [96]=>
string(1) ";"
- [98]=>
+ [97]=>
array(3) {
[0]=>
int(%d)
@@ -762,7 +753,7 @@ array(108) {
[2]=>
int(9)
}
- [99]=>
+ [98]=>
array(3) {
[0]=>
int(%d)
@@ -771,18 +762,18 @@ array(108) {
[2]=>
int(10)
}
+ [99]=>
+ array(3) {
+ [0]=>
+ int(%d)
+ [1]=>
+ string(1) " "
+ [2]=>
+ int(10)
+ }
[100]=>
- array(3) {
- [0]=>
- int(%d)
- [1]=>
- string(1) " "
- [2]=>
- int(10)
- }
- [101]=>
string(1) "="
- [102]=>
+ [101]=>
array(3) {
[0]=>
int(%d)
@@ -791,7 +782,7 @@ array(108) {
[2]=>
int(10)
}
- [103]=>
+ [102]=>
array(3) {
[0]=>
int(%d)
@@ -800,7 +791,7 @@ array(108) {
[2]=>
int(10)
}
- [104]=>
+ [103]=>
array(3) {
[0]=>
int(%d)
@@ -809,9 +800,9 @@ array(108) {
[2]=>
int(10)
}
- [105]=>
+ [104]=>
string(1) ";"
- [106]=>
+ [105]=>
array(3) {
[0]=>
int(%d)
@@ -821,7 +812,7 @@ array(108) {
[2]=>
int(10)
}
- [107]=>
+ [106]=>
array(3) {
[0]=>
int(%d)
diff --git a/ext/tokenizer/tests/token_get_all_variation9.phpt b/ext/tokenizer/tests/token_get_all_variation9.phpt
index e61093304b6..45660e984cf 100644
--- a/ext/tokenizer/tests/token_get_all_variation9.phpt
+++ b/ext/tokenizer/tests/token_get_all_variation9.phpt
@@ -20,7 +20,7 @@ echo "*** Testing token_get_all() : 'source' string with different comments ***\
// types of comments: '//', '/* */', '#' & /** */
-$source = '
--EXPECTF--
*** Testing token_get_all() : 'source' string with different comments ***
-array(51) {
+array(50) {
[0]=>
array(3) {
[0]=>
int(%d)
[1]=>
- string(6) "
- int(1)
- }
- [1]=>
- array(3) {
- [0]=>
- int(%d)
- [1]=>
- string(1) "
+ string(6) "
int(1)
}
- [2]=>
+ [1]=>
array(3) {
[0]=>
int(%d)
@@ -76,7 +67,7 @@ array(51) {
[2]=>
int(2)
}
- [3]=>
+ [2]=>
array(3) {
[0]=>
int(%d)
@@ -87,7 +78,7 @@ array(51) {
[2]=>
int(4)
}
- [4]=>
+ [3]=>
array(3) {
[0]=>
int(%d)
@@ -97,7 +88,7 @@ array(51) {
[2]=>
int(6)
}
- [5]=>
+ [4]=>
array(3) {
[0]=>
int(%d)
@@ -106,18 +97,18 @@ array(51) {
[2]=>
int(7)
}
+ [5]=>
+ array(3) {
+ [0]=>
+ int(%d)
+ [1]=>
+ string(1) " "
+ [2]=>
+ int(7)
+ }
[6]=>
- array(3) {
- [0]=>
- int(%d)
- [1]=>
- string(1) " "
- [2]=>
- int(7)
- }
- [7]=>
string(1) "="
- [8]=>
+ [7]=>
array(3) {
[0]=>
int(%d)
@@ -126,7 +117,7 @@ array(51) {
[2]=>
int(7)
}
- [9]=>
+ [8]=>
array(3) {
[0]=>
int(%d)
@@ -135,9 +126,9 @@ array(51) {
[2]=>
int(7)
}
- [10]=>
+ [9]=>
string(1) ";"
- [11]=>
+ [10]=>
array(3) {
[0]=>
int(%d)
@@ -147,7 +138,7 @@ array(51) {
[2]=>
int(7)
}
- [12]=>
+ [11]=>
array(3) {
[0]=>
int(%d)
@@ -156,18 +147,18 @@ array(51) {
[2]=>
int(8)
}
+ [12]=>
+ array(3) {
+ [0]=>
+ int(%d)
+ [1]=>
+ string(1) " "
+ [2]=>
+ int(8)
+ }
[13]=>
- array(3) {
- [0]=>
- int(%d)
- [1]=>
- string(1) " "
- [2]=>
- int(8)
- }
- [14]=>
string(1) "="
- [15]=>
+ [14]=>
array(3) {
[0]=>
int(%d)
@@ -176,7 +167,7 @@ array(51) {
[2]=>
int(8)
}
- [16]=>
+ [15]=>
array(3) {
[0]=>
int(%d)
@@ -185,9 +176,9 @@ array(51) {
[2]=>
int(8)
}
- [17]=>
+ [16]=>
string(1) ";"
- [18]=>
+ [17]=>
array(3) {
[0]=>
int(%d)
@@ -197,7 +188,7 @@ array(51) {
[2]=>
int(8)
}
- [19]=>
+ [18]=>
array(3) {
[0]=>
int(%d)
@@ -206,18 +197,18 @@ array(51) {
[2]=>
int(9)
}
+ [19]=>
+ array(3) {
+ [0]=>
+ int(%d)
+ [1]=>
+ string(1) " "
+ [2]=>
+ int(9)
+ }
[20]=>
- array(3) {
- [0]=>
- int(%d)
- [1]=>
- string(1) " "
- [2]=>
- int(9)
- }
- [21]=>
string(1) "="
- [22]=>
+ [21]=>
array(3) {
[0]=>
int(%d)
@@ -226,7 +217,7 @@ array(51) {
[2]=>
int(9)
}
- [23]=>
+ [22]=>
array(3) {
[0]=>
int(%d)
@@ -235,9 +226,9 @@ array(51) {
[2]=>
int(9)
}
- [24]=>
+ [23]=>
string(1) ";"
- [25]=>
+ [24]=>
array(3) {
[0]=>
int(%d)
@@ -246,7 +237,7 @@ array(51) {
[2]=>
int(9)
}
- [26]=>
+ [25]=>
array(3) {
[0]=>
int(%d)
@@ -256,7 +247,7 @@ array(51) {
[2]=>
int(9)
}
- [27]=>
+ [26]=>
array(3) {
[0]=>
int(%d)
@@ -266,19 +257,19 @@ array(51) {
[2]=>
int(10)
}
- [28]=>
+ [27]=>
array(3) {
[0]=>
int(%d)
[1]=>
- string(59) "/*
- * Performing operation on $a,$b
+ string(57) "/*
+ * Performing operation on $a,$b
* display result
*/"
[2]=>
int(11)
}
- [29]=>
+ [28]=>
array(3) {
[0]=>
int(%d)
@@ -288,7 +279,7 @@ array(51) {
[2]=>
int(14)
}
- [30]=>
+ [29]=>
array(3) {
[0]=>
int(%d)
@@ -297,18 +288,18 @@ array(51) {
[2]=>
int(15)
}
+ [30]=>
+ array(3) {
+ [0]=>
+ int(%d)
+ [1]=>
+ string(1) " "
+ [2]=>
+ int(15)
+ }
[31]=>
- array(3) {
- [0]=>
- int(%d)
- [1]=>
- string(1) " "
- [2]=>
- int(15)
- }
- [32]=>
string(1) "="
- [33]=>
+ [32]=>
array(3) {
[0]=>
int(%d)
@@ -317,7 +308,7 @@ array(51) {
[2]=>
int(15)
}
- [34]=>
+ [33]=>
array(3) {
[0]=>
int(%d)
@@ -326,18 +317,18 @@ array(51) {
[2]=>
int(15)
}
+ [34]=>
+ array(3) {
+ [0]=>
+ int(%d)
+ [1]=>
+ string(1) " "
+ [2]=>
+ int(15)
+ }
[35]=>
- array(3) {
- [0]=>
- int(%d)
- [1]=>
- string(1) " "
- [2]=>
- int(15)
- }
- [36]=>
string(1) "+"
- [37]=>
+ [36]=>
array(3) {
[0]=>
int(%d)
@@ -346,7 +337,7 @@ array(51) {
[2]=>
int(15)
}
- [38]=>
+ [37]=>
array(3) {
[0]=>
int(%d)
@@ -355,9 +346,9 @@ array(51) {
[2]=>
int(15)
}
- [39]=>
+ [38]=>
string(1) ";"
- [40]=>
+ [39]=>
array(3) {
[0]=>
int(%d)
@@ -367,7 +358,7 @@ array(51) {
[2]=>
int(15)
}
- [41]=>
+ [40]=>
array(3) {
[0]=>
int(%d)
@@ -376,9 +367,9 @@ array(51) {
[2]=>
int(16)
}
- [42]=>
+ [41]=>
string(1) "("
- [43]=>
+ [42]=>
array(3) {
[0]=>
int(%d)
@@ -387,11 +378,11 @@ array(51) {
[2]=>
int(16)
}
- [44]=>
+ [43]=>
string(1) ")"
- [45]=>
+ [44]=>
string(1) ";"
- [46]=>
+ [45]=>
array(3) {
[0]=>
int(%d)
@@ -400,7 +391,7 @@ array(51) {
[2]=>
int(16)
}
- [47]=>
+ [46]=>
array(3) {
[0]=>
int(%d)
@@ -410,7 +401,7 @@ array(51) {
[2]=>
int(16)
}
- [48]=>
+ [47]=>
array(3) {
[0]=>
int(%d)
@@ -420,7 +411,7 @@ array(51) {
[2]=>
int(17)
}
- [49]=>
+ [48]=>
array(3) {
[0]=>
int(%d)
@@ -430,7 +421,7 @@ array(51) {
[2]=>
int(18)
}
- [50]=>
+ [49]=>
array(3) {
[0]=>
int(%d)
diff --git a/ext/xml/tests/bug26614_libxml.phpt b/ext/xml/tests/bug26614_libxml.phpt
index 3ddd35ed0ea..e479699a8f8 100644
--- a/ext/xml/tests/bug26614_libxml.phpt
+++ b/ext/xml/tests/bug26614_libxml.phpt
@@ -12,7 +12,7 @@ this test works fine with Expat but fails with libxml
which we now use as default
further investigation has shown that not only line count
-is skippet on CDATA sections but that libxml does also
+is skipped on CDATA sections but that libxml does also
show different column numbers and byte positions depending
on context and in opposition to what one would expect to
see and what good old Expat reported just fine ...
@@ -25,7 +25,7 @@ $xmls["CDATA"] ='
@@ -36,7 +36,7 @@ $xmls["Comment"] ='
@@ -47,7 +47,7 @@ $xmls["Text"] ='
-!-- ATA[
multi
-line
+line
CDATA
block
---
@@ -84,10 +84,10 @@ foreach ($xmls as $desc => $xml) {
--EXPECTF--
CDATA
at line 2, col %d (byte 9)
- at line 9, col %d (byte 56)
+ at line 9, col %d (byte 55)
Comment
at line 2, col %d (byte 9)
- at line 9, col %d (byte 56)
+ at line 9, col %d (byte 55)
Text
at line 2, col %d (byte 9)
- at line 9, col %d (byte 56)
+ at line 9, col %d (byte 55)