This commit was manufactured by cvs2svn to create branch 'PHP_4_3'.

diff --git a/ext/standard/tests/general_functions/highlight_heredoc.phpt b/ext/standard/tests/general_functions/highlight_heredoc.phpt
new file mode 100644 (file)
index 0000000..89834a2
--- /dev/null
+++ b/ext/standard/tests/general_functions/highlight_heredoc.phpt
@@ -0,0 +1,19 @@
+--TEST--
+highlight_string() handling of heredoc
+--FILE--
+<?php
+$str = '
+$x=<<<DD
+jhdsjkfhjdsh
+DD
+."";
+$a=<<<DDDD
+jhdsjkfhjdsh
+DDDD;
+';
+highlight_string($str);
+?>
+--EXPECT--
+<code><font color="#000000">
+<br />$x=&lt;&lt;&lt;DD<br />jhdsjkfhjdsh<br />DD<br />."";<br />$a=&lt;&lt;&lt;DDDD<br />jhdsjkfhjdsh<br />DDDD;<br /></font>
+</code>

diff --git a/ext/tokenizer/tests/bug26463.phpt b/ext/tokenizer/tests/bug26463.phpt
new file mode 100644 (file)
index 0000000..d1e75b4
--- /dev/null
+++ b/ext/tokenizer/tests/bug26463.phpt
@@ -0,0 +1,118 @@
+--TEST--
+Bug #26463 (token_get_all() does not correctly handle semicolons after T_END_HEREDOC)
+--FILE--
+<?php
+$str = '<?php
+$x=<<<DD
+jhdsjkfhjdsh
+DD
+."";
+$a=<<<DDDD
+jhdsjkfhjdsh
+DDDD;
+?>';
+var_dump(token_get_all($str));
+?>
+--EXPECT--
+array(17) {
+  [0]=>
+  array(2) {
+    [0]=>
+    int(363)
+    [1]=>
+    string(6) "<?php
+"
+  }
+  [1]=>
+  array(2) {
+    [0]=>
+    int(307)
+    [1]=>
+    string(2) "$x"
+  }
+  [2]=>
+  string(1) "="
+  [3]=>
+  array(2) {
+    [0]=>
+    int(367)
+    [1]=>
+    string(6) "<<<DD
+"
+  }
+  [4]=>
+  array(2) {
+    [0]=>
+    int(305)
+    [1]=>
+    string(13) "jhdsjkfhjdsh
+"
+  }
+  [5]=>
+  array(2) {
+    [0]=>
+    int(368)
+    [1]=>
+    string(2) "DD"
+  }
+  [6]=>
+  string(1) "."
+  [7]=>
+  array(2) {
+    [0]=>
+    int(313)
+    [1]=>
+    string(2) """"
+  }
+  [8]=>
+  string(1) ";"
+  [9]=>
+  array(2) {
+    [0]=>
+    int(366)
+    [1]=>
+    string(1) "
+"
+  }
+  [10]=>
+  array(2) {
+    [0]=>
+    int(307)
+    [1]=>
+    string(2) "$a"
+  }
+  [11]=>
+  string(1) "="
+  [12]=>
+  array(2) {
+    [0]=>
+    int(367)
+    [1]=>
+    string(8) "<<<DDDD
+"
+  }
+  [13]=>
+  array(2) {
+    [0]=>
+    int(305)
+    [1]=>
+    string(13) "jhdsjkfhjdsh
+"
+  }
+  [14]=>
+  array(2) {
+    [0]=>
+    int(368)
+    [1]=>
+    string(4) "DDDD"
+  }
+  [15]=>
+  string(1) ";"
+  [16]=>
+  array(2) {
+    [0]=>
+    int(365)
+    [1]=>
+    string(2) "?>"
+  }
+}