Fix another batch of indentation in tests

diff --git a/ext/dom/tests/DOMDocument_savexml_basic.phpt b/ext/dom/tests/DOMDocument_savexml_basic.phpt
index f08fc4e58248ff0c0044f26c3eb4cae0b1115abd..e7f47e952c1c4cd9d61e238480d05e27372bcc2f 100644 (file)
--- 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
 <?xml version="1.0" encoding="utf-8"?>
 <courses>
-       <!-- Hello World! -->
-       <aNode>
-               <childNode>
-                       <childlessNode />
-               </childNode>
-       </aNode>
+    <!-- Hello World! -->
+    <aNode>
+        <childNode>
+            <childlessNode />
+        </childNode>
+    </aNode>
 </courses>
 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 538ba968f401d65d0260704f08c72e9814626658..d0503630f3b9b5a8d4895069123631a6b1050762 100644 (file)
--- a/ext/dom/tests/DOMNode_cloneNode_basic.phpt
+++ b/ext/dom/tests/DOMNode_cloneNode_basic.phpt
@@ -12,18 +12,18 @@ Simon Hughes <odbc3@hotmail.com>
 $xml = <<< EOXML
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <courses>
-       <course title="one">
-               <notes>
-                       <note>c1n1</note>
-                       <note>c1n2</note>
-               </notes>
-       </course>
-       <course title="two">
-               <notes>
-                       <note>c2n1</note>
-                       <note>c2n2</note>
-               </notes>
-       </course>
+    <course title="one">
+        <notes>
+            <note>c1n1</note>
+            <note>c1n2</note>
+        </notes>
+    </course>
+    <course title="two">
+        <notes>
+            <note>c2n1</note>
+            <note>c2n2</note>
+        </notes>
+    </course>
 </courses>
 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 a4b3917d297a8ae2462da8ddba4e19aa9e7dedb5..8dcecb52c8505d3cfd43313281172f93bf9ca893 100644 (file)
--- a/ext/dom/tests/DOMNode_removeChild_basic.phpt
+++ b/ext/dom/tests/DOMNode_removeChild_basic.phpt
@@ -12,18 +12,18 @@ Simon Hughes <odbc3@hotmail.com>
 $xml = <<< EOXML
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <courses>
-       <course title="one">
-               <notes>
-                       <note>c1n1</note>
-                       <note>c1n2</note>
-               </notes>
-       </course>
-       <course title="two">
-               <notes>
-                       <note>c2n1</note>
-                       <note>c2n2</note>
-               </notes>
-       </course>
+    <course title="one">
+        <notes>
+            <note>c1n1</note>
+            <note>c1n2</note>
+        </notes>
+    </course>
+    <course title="two">
+        <notes>
+            <note>c2n1</note>
+            <note>c2n2</note>
+        </notes>
+    </course>
 </courses>
 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 e9d0f89bf89746c9213f27a330cfa988d4f6a92f..7c436a747a367b298bf57634f645ff0479fbdc3b 100644 (file)
--- 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
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <courses>
-       <!-- Hello World! -->
+    <!-- Hello World! -->
 </courses>
 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 57d4a66ebb49d6bac513afbdff559b31f00dc224..d2834e815cfec5e8581dbdc878d74d0c452efdcf 100644 (file)
--- 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.
 <?php
 $xml = <<<XML
 <foo>
-       <bar>foobar</bar>
+    <bar>foobar</bar>
 </foo>
 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 ac78aa38fd7b9b5751d8bc281671dcdd9e16c18b..4f82bfd949e5fa565dfcc2dcb2588ec0f6737189 100644 (file)
--- 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:,<?php echo "test"; ?>'));
 var_dump(highlight_file('data:,<?php echo "test ?>'));
 
 $data = '
-<?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()); }
+}
 ?>';
 
 file_put_contents($filename, $data);
@@ -51,7 +51,7 @@ bool(false)
 </span>
 </code>bool(true)
 <code><span style="color: #000000">
-<br /><span style="color: #0000BB">&lt;?php&nbsp;<br />&nbsp;</span><span style="color: #007700">class&nbsp;</span><span style="color: #0000BB">test&nbsp;</span><span style="color: #007700">{&nbsp;<br />&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;public&nbsp;</span><span style="color: #0000BB">$var&nbsp;</span><span style="color: #007700">=&nbsp;</span><span style="color: #0000BB">1</span><span style="color: #007700">;&nbsp;<br />&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;private&nbsp;function&nbsp;</span><span style="color: #0000BB">foo</span><span style="color: #007700">()&nbsp;{&nbsp;echo&nbsp;</span><span style="color: #DD0000">"foo"</span><span style="color: #007700">;&nbsp;}<br />&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;public&nbsp;function&nbsp;</span><span style="color: #0000BB">bar</span><span style="color: #007700">()&nbsp;{&nbsp;</span><span style="color: #0000BB">var_dump</span><span style="color: #007700">(</span><span style="color: #0000BB">test</span><span style="color: #007700">::</span><span style="color: #0000BB">foo</span><span style="color: #007700">());&nbsp;}<br />&nbsp;}&nbsp;&nbsp;<br /></span><span style="color: #0000BB">?&gt;</span>
+<br /><span style="color: #0000BB">&lt;?php<br /></span><span style="color: #007700">class&nbsp;</span><span style="color: #0000BB">test&nbsp;</span><span style="color: #007700">{<br />&nbsp;&nbsp;&nbsp;&nbsp;public&nbsp;</span><span style="color: #0000BB">$var&nbsp;</span><span style="color: #007700">=&nbsp;</span><span style="color: #0000BB">1</span><span style="color: #007700">;&nbsp;<br />&nbsp;&nbsp;&nbsp;&nbsp;private&nbsp;function&nbsp;</span><span style="color: #0000BB">foo</span><span style="color: #007700">()&nbsp;{&nbsp;echo&nbsp;</span><span style="color: #DD0000">"foo"</span><span style="color: #007700">;&nbsp;}<br />&nbsp;&nbsp;&nbsp;&nbsp;public&nbsp;function&nbsp;</span><span style="color: #0000BB">bar</span><span style="color: #007700">()&nbsp;{&nbsp;</span><span style="color: #0000BB">var_dump</span><span style="color: #007700">(</span><span style="color: #0000BB">test</span><span style="color: #007700">::</span><span style="color: #0000BB">foo</span><span style="color: #007700">());&nbsp;}<br />}<br /></span><span style="color: #0000BB">?&gt;</span>
 </span>
 </code>bool(true)
 Done

diff --git a/ext/standard/tests/strings/vfprintf_variation12_64bit.phpt b/ext/standard/tests/strings/vfprintf_variation12_64bit.phpt
index 60c3614dec56b392fc7d0bc629b7e695c430d9f5..d6c28bc78e638cb81f9826ef984a58a2426b1fd4 100644 (file)
--- 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 a763b1c89f2046af7d529f8732ff1bd9e7b0f8d1..c7443a1544eddef03d09ff06fd288c3337601d80 100644 (file)
--- 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 0e5f4d6d6dcd6b910fb39acb3746d81e0113fc12..35f0663b5224d7023304153b11f6b9778fbd20f8 100644 (file)
--- 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 112276654c35519d0a95b967fa35dd65159fb85a..e6cbd844842d5800996a856cbaa57a6d2217cb10 100644 (file)
--- 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 5eba007423848b040baf4efbfd7ef29e3165b854..061e628c023b1b04821c789d91dd7d85e9722306 100644 (file)
--- 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 e3add6ed3a9d8c839c9332eaa769a862c7c8cd1d..3a22a194b7e8a6c0d684e3022d0855662528e49e 100644 (file)
--- 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 = '<?php 
+$source = '<?php
 if($a == true) {
      echo "$a = true";
 }
@@ -78,27 +78,18 @@ echo "Done"
 --EXPECTF--
 *** Testing token_get_all() : for control structure tokens ***
 -- with if..elseif..else..tokens --
-array(49) {
+array(48) {
   [0]=>
   array(3) {
     [0]=>
     int(%d)
     [1]=>
-    string(6) "<?php "
-    [2]=>
-    int(1)
-  }
-  [1]=>
-  array(3) {
-    [0]=>
-    int(%d)
-    [1]=>
-    string(1) "
+    string(6) "<?php
 "
     [2]=>
     int(1)
   }
-  [2]=>
+  [1]=>
   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 368fb0867cb5f05c372a00ba6a300c735af7d143..4684edf7f7b0d6c584930ad948d5a9c9cbfb3964 100644 (file)
--- 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 = "<?php 
+$source = "<?php
 \$fp =  fopen(__FILE__, 'r');
 ?>";
 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) "<?php "
-    [2]=>
-    int(1)
-  }
-  [1]=>
-  array(3) {
-    [0]=>
-    int(%d)
-    [1]=>
-    string(1) "
+    string(6) "<?php
 "
     [2]=>
     int(1)
   }
-  [2]=>
+  [1]=>
   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 9f3fcd82405a96b6cb3d733a4875ee92d6468ad8..6779048cf019e7b4cff07bcb2d63c9fc45880d18 100644 (file)
--- 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 9c1d16a44e0cafb8757e3ec7cd08f6af274c196e..aa41f066fda07b94d91ddf74631765f54a9f0e44 100644 (file)
--- 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 = '<?php 
+$source = '<?php
 struct myStruct {
   variable $a;
   method() { display $a; }
@@ -28,7 +28,7 @@ var_dump( token_get_all($source));
 
 // with invalid open tag for testing entire source to be unknown token
 echo "-- with invlalid PHP open tag & valid tokens --\n";
-$source = '<pli 
+$source = '<pli
 echo "hello world"; ?>';
 var_dump( token_get_all($source));
 
@@ -42,27 +42,18 @@ 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) "<?php "
-    [2]=>
-    int(1)
-  }
-  [1]=>
-  array(3) {
-    [0]=>
-    int(%d)
-    [1]=>
-    string(1) "
+    string(6) "<?php
 "
     [2]=>
     int(1)
   }
-  [2]=>
+  [1]=>
   array(3) {
     [0]=>
     int(%d)
@@ -71,7 +62,7 @@ array(29) {
     [2]=>
     int(2)
   }
-  [3]=>
+  [2]=>
   array(3) {
     [0]=>
     int(%d)
@@ -80,7 +71,7 @@ array(29) {
     [2]=>
     int(2)
   }
-  [4]=>
+  [3]=>
   array(3) {
     [0]=>
     int(%d)
@@ -89,7 +80,7 @@ array(29) {
     [2]=>
     int(2)
   }
-  [5]=>
+  [4]=>
   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,11 +149,11 @@ array(29) {
     [2]=>
     int(4)
   }
-  [14]=>
+  [13]=>
   string(1) "("
-  [15]=>
+  [14]=>
   string(1) ")"
-  [16]=>
+  [15]=>
   array(3) {
     [0]=>
     int(%d)
@@ -171,9 +162,9 @@ array(29) {
     [2]=>
     int(4)
   }
-  [17]=>
+  [16]=>
   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) "<pli 
+    string(27) "<pli
 echo "hello world"; ?>"
     [2]=>
     int(1)

diff --git a/ext/tokenizer/tests/token_get_all_variation15.phpt b/ext/tokenizer/tests/token_get_all_variation15.phpt
index 5b7fcec66afa66c30c783836cd3556aa090d9666..c72bbe41b96a0874867659addac2999918a0473d 100644 (file)
--- 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 = <<<EOT
-<?= 
+<?=
   \$a = 2;
   \$b = 1;
   \$c = <<<EOS
-  This is to test 
+  This is to test
   heredoc string
 EOS;
   echo \$a + \$b;
@@ -63,7 +63,7 @@ array(103) {
     [0]=>
     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 3bd05295fe7bae69d5cc626069991fb894ba75d5..66e3cb413d2c4fbc1e173a39387252d93de16f27 100644 (file)
--- 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 = '<?php 
-if($a == 0) 
+$source = '<?php
+if($a == 0)
   echo "== 0";
 elseif($a === 2)
   echo "=== 2";
@@ -37,27 +37,18 @@ echo "Done"
 ?>
 --EXPECTF--
 *** Testing token_get_all() : 'source' string with different comparison operators ***
-array(89) {
+array(88) {
   [0]=>
   array(3) {
     [0]=>
     int(%d)
     [1]=>
-    string(6) "<?php "
-    [2]=>
-    int(1)
-  }
-  [1]=>
-  array(3) {
-    [0]=>
-    int(%d)
-    [1]=>
-    string(1) "
+    string(6) "<?php
 "
     [2]=>
     int(1)
   }
-  [2]=>
+  [1]=>
   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,16 +77,16 @@ array(89) {
     [2]=>
     int(2)
   }
-  [6]=>
+  [5]=>
   array(3) {
     [0]=>
-    int(%d)
+    int(286)
     [1]=>
     string(2) "=="
     [2]=>
     int(2)
   }
-  [7]=>
+  [6]=>
   array(3) {
     [0]=>
     int(%d)
@@ -104,7 +95,7 @@ array(89) {
     [2]=>
     int(2)
   }
-  [8]=>
+  [7]=>
   array(3) {
     [0]=>
     int(%d)
@@ -113,19 +104,19 @@ array(89) {
     [2]=>
     int(2)
   }
-  [9]=>
+  [8]=>
   string(1) ")"
-  [10]=>
+  [9]=>
   array(3) {
     [0]=>
     int(%d)
     [1]=>
-    string(4) " 
+    string(3) "
   "
     [2]=>
     int(2)
   }
-  [11]=>
+  [10]=>
   array(3) {
     [0]=>
     int(%d)
@@ -134,7 +125,7 @@ array(89) {
     [2]=>
     int(%d)
   }
-  [12]=>
+  [11]=>
   array(3) {
     [0]=>
     int(%d)
@@ -143,7 +134,7 @@ array(89) {
     [2]=>
     int(%d)
   }
-  [13]=>
+  [12]=>
   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,7 +175,7 @@ array(89) {
     [2]=>
     int(4)
   }
-  [19]=>
+  [18]=>
   array(3) {
     [0]=>
     int(%d)
@@ -193,7 +184,7 @@ array(89) {
     [2]=>
     int(4)
   }
-  [20]=>
+  [19]=>
   array(3) {
     [0]=>
     int(%d)
@@ -202,7 +193,7 @@ array(89) {
     [2]=>
     int(4)
   }
-  [21]=>
+  [20]=>
   array(3) {
     [0]=>
     int(%d)
@@ -211,7 +202,7 @@ array(89) {
     [2]=>
     int(4)
   }
-  [22]=>
+  [21]=>
   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,7 +232,7 @@ array(89) {
     [2]=>
     int(5)
   }
-  [26]=>
+  [25]=>
   array(3) {
     [0]=>
     int(%d)
@@ -250,7 +241,7 @@ array(89) {
     [2]=>
     int(5)
   }
-  [27]=>
+  [26]=>
   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,7 +282,7 @@ array(89) {
     [2]=>
     int(6)
   }
-  [33]=>
+  [32]=>
   array(3) {
     [0]=>
     int(%d)
@@ -300,7 +291,7 @@ array(89) {
     [2]=>
     int(6)
   }
-  [34]=>
+  [33]=>
   array(3) {
     [0]=>
     int(%d)
@@ -309,7 +300,7 @@ array(89) {
     [2]=>
     int(6)
   }
-  [35]=>
+  [34]=>
   array(3) {
     [0]=>
     int(%d)
@@ -318,7 +309,7 @@ array(89) {
     [2]=>
     int(6)
   }
-  [36]=>
+  [35]=>
   array(3) {
     [0]=>
     int(%d)
@@ -327,7 +318,7 @@ array(89) {
     [2]=>
     int(6)
   }
-  [37]=>
+  [36]=>
   array(3) {
     [0]=>
     int(%d)
@@ -336,7 +327,7 @@ array(89) {
     [2]=>
     int(6)
   }
-  [38]=>
+  [37]=>
   array(3) {
     [0]=>
     int(%d)
@@ -345,7 +336,7 @@ array(89) {
     [2]=>
     int(6)
   }
-  [39]=>
+  [38]=>
   array(3) {
     [0]=>
     int(%d)
@@ -354,7 +345,7 @@ array(89) {
     [2]=>
     int(6)
   }
-  [40]=>
+  [39]=>
   array(3) {
     [0]=>
     int(%d)
@@ -363,7 +354,7 @@ array(89) {
     [2]=>
     int(6)
   }
-  [41]=>
+  [40]=>
   array(3) {
     [0]=>
     int(%d)
@@ -372,7 +363,7 @@ array(89) {
     [2]=>
     int(6)
   }
-  [42]=>
+  [41]=>
   array(3) {
     [0]=>
     int(%d)
@@ -381,7 +372,7 @@ array(89) {
     [2]=>
     int(6)
   }
-  [43]=>
+  [42]=>
   array(3) {
     [0]=>
     int(%d)
@@ -390,7 +381,7 @@ array(89) {
     [2]=>
     int(6)
   }
-  [44]=>
+  [43]=>
   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,7 +411,7 @@ array(89) {
     [2]=>
     int(7)
   }
-  [48]=>
+  [47]=>
   array(3) {
     [0]=>
     int(%d)
@@ -429,7 +420,7 @@ array(89) {
     [2]=>
     int(7)
   }
-  [49]=>
+  [48]=>
   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,7 +461,7 @@ array(89) {
     [2]=>
     int(8)
   }
-  [55]=>
+  [54]=>
   array(3) {
     [0]=>
     int(%d)
@@ -479,7 +470,7 @@ array(89) {
     [2]=>
     int(8)
   }
-  [56]=>
+  [55]=>
   array(3) {
     [0]=>
     int(%d)
@@ -488,7 +479,7 @@ array(89) {
     [2]=>
     int(8)
   }
-  [57]=>
+  [56]=>
   array(3) {
     [0]=>
     int(%d)
@@ -497,7 +488,7 @@ array(89) {
     [2]=>
     int(8)
   }
-  [58]=>
+  [57]=>
   array(3) {
     [0]=>
     int(%d)
@@ -506,7 +497,7 @@ array(89) {
     [2]=>
     int(8)
   }
-  [59]=>
+  [58]=>
   array(3) {
     [0]=>
     int(%d)
@@ -515,7 +506,7 @@ array(89) {
     [2]=>
     int(8)
   }
-  [60]=>
+  [59]=>
   array(3) {
     [0]=>
     int(%d)
@@ -524,7 +515,7 @@ array(89) {
     [2]=>
     int(8)
   }
-  [61]=>
+  [60]=>
   array(3) {
     [0]=>
     int(%d)
@@ -533,7 +524,7 @@ array(89) {
     [2]=>
     int(8)
   }
-  [62]=>
+  [61]=>
   array(3) {
     [0]=>
     int(%d)
@@ -542,7 +533,7 @@ array(89) {
     [2]=>
     int(8)
   }
-  [63]=>
+  [62]=>
   array(3) {
     [0]=>
     int(%d)
@@ -551,7 +542,7 @@ array(89) {
     [2]=>
     int(8)
   }
-  [64]=>
+  [63]=>
   array(3) {
     [0]=>
     int(%d)
@@ -560,7 +551,7 @@ array(89) {
     [2]=>
     int(8)
   }
-  [65]=>
+  [64]=>
   array(3) {
     [0]=>
     int(%d)
@@ -569,7 +560,7 @@ array(89) {
     [2]=>
     int(8)
   }
-  [66]=>
+  [65]=>
   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,7 +590,7 @@ array(89) {
     [2]=>
     int(9)
   }
-  [70]=>
+  [69]=>
   array(3) {
     [0]=>
     int(%d)
@@ -608,7 +599,7 @@ array(89) {
     [2]=>
     int(9)
   }
-  [71]=>
+  [70]=>
   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 d81562060a6e712733f5f5bc0ef21197e80dc52d..3eed7676658b200898e1cb58c562f543a83d5266 100644 (file)
--- 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 = '<?php 
+$source = '<?php
 $a = 1, $b = 2;
 $c += $b;
 $b -= $a;
@@ -41,27 +41,18 @@ echo "Done"
 ?>
 --EXPECTF--
 *** Testing token_get_all() : 'source' string with different assignment operators ***
-array(94) {
+array(93) {
   [0]=>
   array(3) {
     [0]=>
     int(%d)
     [1]=>
-    string(6) "<?php "
-    [2]=>
-    int(1)
-  }
-  [1]=>
-  array(3) {
-    [0]=>
-    int(%d)
-    [1]=>
-    string(1) "
+    string(6) "<?php
 "
     [2]=>
     int(1)
   }
-  [2]=>
+  [1]=>
   array(3) {
     [0]=>
     int(%d)
@@ -70,7 +61,7 @@ array(94) {
     [2]=>
     int(2)
   }
-  [3]=>
+  [2]=>
   array(3) {
     [0]=>
     int(%d)
@@ -79,9 +70,9 @@ array(94) {
     [2]=>
     int(2)
   }
-  [4]=>
+  [3]=>
   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,7 +101,7 @@ array(94) {
     [2]=>
     int(2)
   }
-  [9]=>
+  [8]=>
   array(3) {
     [0]=>
     int(%d)
@@ -119,7 +110,7 @@ array(94) {
     [2]=>
     int(2)
   }
-  [10]=>
+  [9]=>
   array(3) {
     [0]=>
     int(%d)
@@ -128,9 +119,9 @@ array(94) {
     [2]=>
     int(2)
   }
-  [11]=>
+  [10]=>
   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,7 +160,7 @@ array(94) {
     [2]=>
     int(%d)
   }
-  [17]=>
+  [16]=>
   array(3) {
     [0]=>
     int(%d)
@@ -178,7 +169,7 @@ array(94) {
     [2]=>
     int(%d)
   }
-  [18]=>
+  [17]=>
   array(3) {
     [0]=>
     int(%d)
@@ -187,7 +178,7 @@ array(94) {
     [2]=>
     int(%d)
   }
-  [19]=>
+  [18]=>
   array(3) {
     [0]=>
     int(%d)
@@ -196,7 +187,7 @@ array(94) {
     [2]=>
     int(%d)
   }
-  [20]=>
+  [19]=>
   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,7 +217,7 @@ array(94) {
     [2]=>
     int(4)
   }
-  [24]=>
+  [23]=>
   array(3) {
     [0]=>
     int(%d)
@@ -235,7 +226,7 @@ array(94) {
     [2]=>
     int(4)
   }
-  [25]=>
+  [24]=>
   array(3) {
     [0]=>
     int(%d)
@@ -244,7 +235,7 @@ array(94) {
     [2]=>
     int(4)
   }
-  [26]=>
+  [25]=>
   array(3) {
     [0]=>
     int(%d)
@@ -253,7 +244,7 @@ array(94) {
     [2]=>
     int(4)
   }
-  [27]=>
+  [26]=>
   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,7 +274,7 @@ array(94) {
     [2]=>
     int(5)
   }
-  [31]=>
+  [30]=>
   array(3) {
     [0]=>
     int(%d)
@@ -292,7 +283,7 @@ array(94) {
     [2]=>
     int(5)
   }
-  [32]=>
+  [31]=>
   array(3) {
     [0]=>
     int(%d)
@@ -301,7 +292,7 @@ array(94) {
     [2]=>
     int(5)
   }
-  [33]=>
+  [32]=>
   array(3) {
     [0]=>
     int(%d)
@@ -310,7 +301,7 @@ array(94) {
     [2]=>
     int(5)
   }
-  [34]=>
+  [33]=>
   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,7 +331,7 @@ array(94) {
     [2]=>
     int(6)
   }
-  [38]=>
+  [37]=>
   array(3) {
     [0]=>
     int(%d)
@@ -349,7 +340,7 @@ array(94) {
     [2]=>
     int(6)
   }
-  [39]=>
+  [38]=>
   array(3) {
     [0]=>
     int(%d)
@@ -358,7 +349,7 @@ array(94) {
     [2]=>
     int(6)
   }
-  [40]=>
+  [39]=>
   array(3) {
     [0]=>
     int(%d)
@@ -367,7 +358,7 @@ array(94) {
     [2]=>
     int(6)
   }
-  [41]=>
+  [40]=>
   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,7 +388,7 @@ array(94) {
     [2]=>
     int(7)
   }
-  [45]=>
+  [44]=>
   array(3) {
     [0]=>
     int(%d)
@@ -406,7 +397,7 @@ array(94) {
     [2]=>
     int(7)
   }
-  [46]=>
+  [45]=>
   array(3) {
     [0]=>
     int(%d)
@@ -415,7 +406,7 @@ array(94) {
     [2]=>
     int(7)
   }
-  [47]=>
+  [46]=>
   array(3) {
     [0]=>
     int(%d)
@@ -424,7 +415,7 @@ array(94) {
     [2]=>
     int(7)
   }
-  [48]=>
+  [47]=>
   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,7 +445,7 @@ array(94) {
     [2]=>
     int(8)
   }
-  [52]=>
+  [51]=>
   array(3) {
     [0]=>
     int(%d)
@@ -463,7 +454,7 @@ array(94) {
     [2]=>
     int(8)
   }
-  [53]=>
+  [52]=>
   array(3) {
     [0]=>
     int(%d)
@@ -472,7 +463,7 @@ array(94) {
     [2]=>
     int(8)
   }
-  [54]=>
+  [53]=>
   array(3) {
     [0]=>
     int(%d)
@@ -481,7 +472,7 @@ array(94) {
     [2]=>
     int(8)
   }
-  [55]=>
+  [54]=>
   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,7 +502,7 @@ array(94) {
     [2]=>
     int(9)
   }
-  [59]=>
+  [58]=>
   array(3) {
     [0]=>
     int(%d)
@@ -520,7 +511,7 @@ array(94) {
     [2]=>
     int(9)
   }
-  [60]=>
+  [59]=>
   array(3) {
     [0]=>
     int(%d)
@@ -529,7 +520,7 @@ array(94) {
     [2]=>
     int(9)
   }
-  [61]=>
+  [60]=>
   array(3) {
     [0]=>
     int(%d)
@@ -538,7 +529,7 @@ array(94) {
     [2]=>
     int(9)
   }
-  [62]=>
+  [61]=>
   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,7 +559,7 @@ array(94) {
     [2]=>
     int(10)
   }
-  [66]=>
+  [65]=>
   array(3) {
     [0]=>
     int(%d)
@@ -577,7 +568,7 @@ array(94) {
     [2]=>
     int(10)
   }
-  [67]=>
+  [66]=>
   array(3) {
     [0]=>
     int(%d)
@@ -586,7 +577,7 @@ array(94) {
     [2]=>
     int(10)
   }
-  [68]=>
+  [67]=>
   array(3) {
     [0]=>
     int(%d)
@@ -595,7 +586,7 @@ array(94) {
     [2]=>
     int(10)
   }
-  [69]=>
+  [68]=>
   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 8ba8db8b7e3b3fe6d6d7ca392ce20eb1d618db27..6d976a40549ddcf76585c16c3589aea22ede828a 100644 (file)
--- a/ext/tokenizer/tests/token_get_all_variation7.phpt
+++ b/ext/tokenizer/tests/token_get_all_variation7.phpt
@@ -18,39 +18,30 @@ 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 = '<?php 
+$source = '<?php
 $a = 10, $b = 5;
 $a++;
 $b--;
 echo $a;
 ?>';
-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) "<?php "
-    [2]=>
-    int(1)
-  }
-  [1]=>
-  array(3) {
-    [0]=>
-    int(%d)
-    [1]=>
-    string(1) "
+    string(6) "<?php
 "
     [2]=>
     int(1)
   }
-  [2]=>
+  [1]=>
   array(3) {
     [0]=>
     int(%d)
@@ -59,7 +50,7 @@ array(30) {
     [2]=>
     int(2)
   }
-  [3]=>
+  [2]=>
   array(3) {
     [0]=>
     int(%d)
@@ -68,9 +59,9 @@ array(30) {
     [2]=>
     int(2)
   }
-  [4]=>
+  [3]=>
   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,7 +90,7 @@ array(30) {
     [2]=>
     int(2)
   }
-  [9]=>
+  [8]=>
   array(3) {
     [0]=>
     int(%d)
@@ -108,7 +99,7 @@ array(30) {
     [2]=>
     int(2)
   }
-  [10]=>
+  [9]=>
   array(3) {
     [0]=>
     int(%d)
@@ -117,9 +108,9 @@ array(30) {
     [2]=>
     int(2)
   }
-  [11]=>
+  [10]=>
   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 f1c3ff15e0a054b813fad964c7976880e7fd79c2..015e60d6e332cb92069d01c2aabf79e7f5cc0ee8 100644 (file)
--- 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 = '<?php 
+$source = '<?php
 $a = 1, $b = 10.5
 $c = (int)$b + $a;
 $d = (float)$a + $b;
@@ -36,27 +36,18 @@ echo "Done"
 ?>
 --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) "<?php "
-    [2]=>
-    int(1)
-  }
-  [1]=>
-  array(3) {
-    [0]=>
-    int(%d)
-    [1]=>
-    string(1) "
+    string(6) "<?php
 "
     [2]=>
     int(1)
   }
-  [2]=>
+  [1]=>
   array(3) {
     [0]=>
     int(%d)
@@ -65,7 +56,7 @@ array(108) {
     [2]=>
     int(2)
   }
-  [3]=>
+  [2]=>
   array(3) {
     [0]=>
     int(%d)
@@ -74,9 +65,9 @@ array(108) {
     [2]=>
     int(2)
   }
-  [4]=>
+  [3]=>
   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,7 +96,7 @@ array(108) {
     [2]=>
     int(2)
   }
-  [9]=>
+  [8]=>
   array(3) {
     [0]=>
     int(%d)
@@ -114,7 +105,7 @@ array(108) {
     [2]=>
     int(2)
   }
-  [10]=>
+  [9]=>
   array(3) {
     [0]=>
     int(%d)
@@ -123,9 +114,9 @@ array(108) {
     [2]=>
     int(2)
   }
-  [11]=>
+  [10]=>
   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,7 +153,7 @@ array(108) {
     [2]=>
     int(%d)
   }
-  [16]=>
+  [15]=>
   array(3) {
     [0]=>
     int(%d)
@@ -171,9 +162,9 @@ array(108) {
     [2]=>
     int(%d)
   }
-  [17]=>
+  [16]=>
   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,7 +191,7 @@ array(108) {
     [2]=>
     int(%d)
   }
-  [21]=>
+  [20]=>
   array(3) {
     [0]=>
     int(%d)
@@ -209,9 +200,9 @@ array(108) {
     [2]=>
     int(%d)
   }
-  [22]=>
+  [21]=>
   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,7 +241,7 @@ array(108) {
     [2]=>
     int(4)
   }
-  [28]=>
+  [27]=>
   array(3) {
     [0]=>
     int(%d)
@@ -259,9 +250,9 @@ array(108) {
     [2]=>
     int(4)
   }
-  [29]=>
+  [28]=>
   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,7 +279,7 @@ array(108) {
     [2]=>
     int(4)
   }
-  [33]=>
+  [32]=>
   array(3) {
     [0]=>
     int(%d)
@@ -297,9 +288,9 @@ array(108) {
     [2]=>
     int(4)
   }
-  [34]=>
+  [33]=>
   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,7 +349,7 @@ array(108) {
     [2]=>
     int(5)
   }
-  [43]=>
+  [42]=>
   array(3) {
     [0]=>
     int(%d)
@@ -367,7 +358,7 @@ array(108) {
     [2]=>
     int(5)
   }
-  [44]=>
+  [43]=>
   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,7 +439,7 @@ array(108) {
     [2]=>
     int(6)
   }
-  [56]=>
+  [55]=>
   array(3) {
     [0]=>
     int(%d)
@@ -457,7 +448,7 @@ array(108) {
     [2]=>
     int(6)
   }
-  [57]=>
+  [56]=>
   array(3) {
     [0]=>
     int(%d)
@@ -466,7 +457,7 @@ array(108) {
     [2]=>
     int(6)
   }
-  [58]=>
+  [57]=>
   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,7 +588,7 @@ array(108) {
     [2]=>
     int(8)
   }
-  [77]=>
+  [76]=>
   array(3) {
     [0]=>
     int(%d)
@@ -606,7 +597,7 @@ array(108) {
     [2]=>
     int(8)
   }
-  [78]=>
+  [77]=>
   array(3) {
     [0]=>
     int(%d)
@@ -615,9 +606,9 @@ array(108) {
     [2]=>
     int(8)
   }
-  [79]=>
+  [78]=>
   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,7 +665,7 @@ array(108) {
     [2]=>
     int(9)
   }
-  [87]=>
+  [86]=>
   array(3) {
     [0]=>
     int(%d)
@@ -683,9 +674,9 @@ array(108) {
     [2]=>
     int(9)
   }
-  [88]=>
+  [87]=>
   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,7 +694,7 @@ array(108) {
     [2]=>
     int(9)
   }
-  [91]=>
+  [90]=>
   array(3) {
     [0]=>
     int(%d)
@@ -712,9 +703,9 @@ array(108) {
     [2]=>
     int(9)
   }
-  [92]=>
+  [91]=>
   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,7 +762,7 @@ array(108) {
     [2]=>
     int(10)
   }
-  [100]=>
+  [99]=>
   array(3) {
     [0]=>
     int(%d)
@@ -780,9 +771,9 @@ array(108) {
     [2]=>
     int(10)
   }
-  [101]=>
+  [100]=>
   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 e61093304b650a32eee9c6dcae124d2446ce8632..45660e984cf235b4e95f2cfca1b04e5408852e9a 100644 (file)
--- 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 = '<?php 
+$source = '<?php
 /** Performing addition operation on given values :
   * a, b
   */
@@ -30,8 +30,8 @@ $a = 10;
 $b = 20;
 $c = true; // bool value
 
-/* 
- * Performing operation on $a,$b 
+/*
+ * Performing operation on $a,$b
  * display result
  */
 $c = $a + $b;
@@ -45,27 +45,18 @@ echo "Done"
 ?>
 --EXPECTF--
 *** Testing token_get_all() : 'source' string with different comments ***
-array(51) {
+array(50) {
   [0]=>
   array(3) {
     [0]=>
     int(%d)
     [1]=>
-    string(6) "<?php "
-    [2]=>
-    int(1)
-  }
-  [1]=>
-  array(3) {
-    [0]=>
-    int(%d)
-    [1]=>
-    string(1) "
+    string(6) "<?php
 "
     [2]=>
     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,7 +97,7 @@ array(51) {
     [2]=>
     int(7)
   }
-  [6]=>
+  [5]=>
   array(3) {
     [0]=>
     int(%d)
@@ -115,9 +106,9 @@ array(51) {
     [2]=>
     int(7)
   }
-  [7]=>
+  [6]=>
   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,7 +147,7 @@ array(51) {
     [2]=>
     int(8)
   }
-  [13]=>
+  [12]=>
   array(3) {
     [0]=>
     int(%d)
@@ -165,9 +156,9 @@ array(51) {
     [2]=>
     int(8)
   }
-  [14]=>
+  [13]=>
   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,7 +197,7 @@ array(51) {
     [2]=>
     int(9)
   }
-  [20]=>
+  [19]=>
   array(3) {
     [0]=>
     int(%d)
@@ -215,9 +206,9 @@ array(51) {
     [2]=>
     int(9)
   }
-  [21]=>
+  [20]=>
   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,7 +288,7 @@ array(51) {
     [2]=>
     int(15)
   }
-  [31]=>
+  [30]=>
   array(3) {
     [0]=>
     int(%d)
@@ -306,9 +297,9 @@ array(51) {
     [2]=>
     int(15)
   }
-  [32]=>
+  [31]=>
   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,7 +317,7 @@ array(51) {
     [2]=>
     int(15)
   }
-  [35]=>
+  [34]=>
   array(3) {
     [0]=>
     int(%d)
@@ -335,9 +326,9 @@ array(51) {
     [2]=>
     int(15)
   }
-  [36]=>
+  [35]=>
   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 3ddd35ed0ea33091204b529e1828e3a41005d5c0..e479699a8f860e5c552d00e6e6aa39d94f61f5f0 100644 (file)
--- 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"] ='<?xml version="1.0" encoding="iso-8859-1" ?>
 <data>
 <![CDATA[
 multi
-line 
+line
 CDATA
 block
 ]]>
@@ -36,7 +36,7 @@ $xmls["Comment"] ='<?xml version="1.0" encoding="iso-8859-1" ?>
 <data>
 <!-- ATA[
 multi
-line 
+line
 CDATA
 block
 -->
@@ -47,7 +47,7 @@ $xmls["Text"] ='<?xml version="1.0" encoding="iso-8859-1" ?>
 <data>
 -!-- ATA[
 multi
-line 
+line
 CDATA
 block
 ---
@@ -84,10 +84,10 @@ foreach ($xmls as $desc => $xml) {
 --EXPECTF--
 CDATA
 <DATA> at line 2, col %d (byte 9)
-</DATA> at line 9, col %d (byte 56)
+</DATA> at line 9, col %d (byte 55)
 Comment
 <DATA> at line 2, col %d (byte 9)
-</DATA> at line 9, col %d (byte 56)
+</DATA> at line 9, col %d (byte 55)
 Text
 <DATA> at line 2, col %d (byte 9)
-</DATA> at line 9, col %d (byte 56)
+</DATA> at line 9, col %d (byte 55)