{NOWDOC_CHARS}*{NEWLINE}+{LABEL}";"?[\n\r] */
- String text = yytext();
-
- if (text.charAt(text.length() - 2)== ';') {
- text = text.substring(0, text.length() - 2);
- yypushback(1);
- } else {
- text = text.substring(0, text.length() - 1);
- }
-
- int textLength = text.length();
- if (textLength > nowdoc_len && text.substring(textLength - nowdoc_len, textLength).equals(nowdoc)) {
- yypushback(nowdoc_len + 1);
- updateNowdocBodyInfo();
- yybegin(ST_END_NOWDOC);
- if (nowdocBodyLength > 0) {
- return createFullNowdocBodySymbol();
- }
- } else {
- yypushback(1);
- updateNowdocBodyInfo();
- }
- }
- case 405: break;
- case 66:
+ case 407: break;
+ case 69:
{ return createFullSymbol(ASTPHP5Symbols.T_VARIABLE);
}
- case 406: break;
- case 200:
+ case 408: break;
+ case 201:
{ return createSymbol(ASTPHP5Symbols.T_YIELD_FROM);
}
- case 407: break;
- case 171:
+ case 409: break;
+ case 172:
{ return createFullSymbol(ASTPHP5Symbols.T_DECLARE);
}
- case 408: break;
- case 92:
+ case 410: break;
+ case 95:
{ return createSymbol(ASTPHP5Symbols.T_XOR_EQUAL);
}
- case 409: break;
- case 83:
+ case 411: break;
+ case 86:
{ return createSymbol(ASTPHP5Symbols.T_POW);
}
- case 410: break;
- case 134:
+ case 412: break;
+ case 135:
{ return createFullSymbol(ASTPHP5Symbols.T_CASE);
}
- case 411: break;
- case 187:
+ case 413: break;
+ case 188:
{ return createFullSymbol(ASTPHP5Symbols.T_FILE);
}
- case 412: break;
- case 103:
+ case 414: break;
+ case 106:
{ return createSymbol(ASTPHP5Symbols.T_OBJECT_OPERATOR);
}
- case 413: break;
- case 109:
+ case 415: break;
+ case 112:
{ return createSymbol(ASTPHP5Symbols.T_ELLIPSIS);
}
- case 414: break;
- case 51:
+ case 416: break;
+ case 54:
{ return createSymbol(ASTPHP5Symbols.T_BACKQUATE);
}
- case 415: break;
- case 55:
+ case 417: break;
+ case 58:
{
}
- case 416: break;
+ case 418: break;
default:
if (zzInput == YYEOF && (zzStartRead == zzCurrentPos || zzLexicalState == ST_DOCBLOCK)) {
zzAtEOF = true;
@@ -3035,7 +3079,7 @@ && yytext().substring(labelLength - heredoc.length(), labelLength).equals(heredo
return createSymbol(ASTPHP5Symbols.EOF);
}
}
- case 791: break;
+ case 787: break;
default:
{ return createSymbol(ASTPHP5Symbols.EOF);
}
diff --git a/php/php.editor/src/org/netbeans/modules/php/editor/parser/astnodes/Quote.java b/php/php.editor/src/org/netbeans/modules/php/editor/parser/astnodes/Quote.java
index 27d10c830a53..6dfbc3201a12 100644
--- a/php/php.editor/src/org/netbeans/modules/php/editor/parser/astnodes/Quote.java
+++ b/php/php.editor/src/org/netbeans/modules/php/editor/parser/astnodes/Quote.java
@@ -20,16 +20,17 @@
import java.util.ArrayList;
import java.util.Arrays;
+import java.util.Collections;
import java.util.List;
/**
* Represents complex qoute(i.e. qoute that includes string and variables).
* Also represents heredoc
- * e.g.
+ * e.g.
* "this is $a quote",
* "'single ${$complex->quote()}'"
* >>>Heredoc\n This is here documents \nHeredoc;\n
- *
+ *
* Note: "This is".$not." a quote node",
* 'This is $not a quote too'
*/
@@ -58,7 +59,7 @@ public Quote(int start, int end, List expressions, Quote.Type type) {
* @return expression list of the echo statement
*/
public List getExpressions() {
- return this.expressions;
+ return Collections.unmodifiableList(this.expressions);
}
/**
@@ -80,7 +81,7 @@ public String toString() {
for (Expression expression : getExpressions()) {
sb.append(expression).append(","); //NOI18N
}
- return getQuoteType() + " " + sb.toString();
+ return getQuoteType() + " " + sb.toString(); //NOI18N
}
}
diff --git a/php/php.editor/src/org/netbeans/modules/php/editor/verification/PHP73UnhandledError.java b/php/php.editor/src/org/netbeans/modules/php/editor/verification/PHP73UnhandledError.java
index f1ba6cab7af7..9b1f745926bf 100644
--- a/php/php.editor/src/org/netbeans/modules/php/editor/verification/PHP73UnhandledError.java
+++ b/php/php.editor/src/org/netbeans/modules/php/editor/verification/PHP73UnhandledError.java
@@ -95,6 +95,7 @@ public CheckVisitor(FileObject fileObject) {
public Collection getErrors() {
checkFunctionCallTrailingCommas();
+ checkFlexibleHeredocAndNowdoc();
return Collections.unmodifiableCollection(errors);
}
@@ -209,6 +210,56 @@ private void checkListReferenceAssignment(List elements) {
});
}
+ private void checkFlexibleHeredocAndNowdoc() {
+ if (CancelSupport.getDefault().isCancelled()) {
+ return;
+ }
+
+ BaseDocument document = GsfUtilities.getDocument(fileObject, true);
+ if (document == null) {
+ return;
+ }
+ document.readLock();
+ try {
+ TokenSequence ts = LexUtilities.getPHPTokenSequence(document, document.getLength());
+ if (ts == null) {
+ return;
+ }
+ ts.move(document.getLength());
+ checkHeredocNowdocIndentationAndNewline(ts);
+ } finally {
+ document.readUnlock();
+ }
+ }
+
+ private void checkHeredocNowdocIndentationAndNewline(TokenSequence ts) {
+ Token endTag;
+ List lookforEndTokens = Arrays.asList(PHPTokenId.PHP_HEREDOC_TAG_END, PHPTokenId.PHP_NOWDOC_TAG_END);
+ while (ts.movePrevious()
+ && (endTag = LexUtilities.findPreviousToken(ts, lookforEndTokens)) != null) {
+ String endId = endTag.text().toString();
+ // indentation of closing marker
+ int offset = ts.offset();
+ if (endId.contains(" ") || endId.contains("\t")) { // NOI18N
+ createError(offset, offset + endId.length());
+ }
+ // new line of closing marker
+ if (ts.moveNext()) {
+ Token newLine = ts.token();
+ if (newLine != null) {
+ if (TokenUtilities.startsWith(newLine.text(), "\r") // NOI18N
+ || (TokenUtilities.startsWith(newLine.text(), "\n") // NOI18N
+ || TokenUtilities.textEquals(newLine.text(), ";"))) { // NOI18N
+ // noop
+ } else {
+ createError(ts.offset(), ts.offset() + newLine.length());
+ }
+ }
+ }
+ ts.move(offset);
+ }
+ }
+
private void createError(ASTNode node) {
createError(node.getStartOffset(), node.getEndOffset());
}
diff --git a/php/php.editor/test/unit/data/goldenfiles/org/netbeans/modules/php/editor/lexer/PHP53FeaturesTest/lexer/heredoc_001.pass b/php/php.editor/test/unit/data/goldenfiles/org/netbeans/modules/php/editor/lexer/PHP53FeaturesTest/lexer/heredoc_001.pass
index d9737b4ff50a..c9a98aab5ca5 100644
--- a/php/php.editor/test/unit/data/goldenfiles/org/netbeans/modules/php/editor/lexer/PHP53FeaturesTest/lexer/heredoc_001.pass
+++ b/php/php.editor/test/unit/data/goldenfiles/org/netbeans/modules/php/editor/lexer/PHP53FeaturesTest/lexer/heredoc_001.pass
@@ -11,27 +11,29 @@ token #9 WHITESPACE
token #10 PHP_HEREDOC_TAG_START <<
-token #36 T_INLINE_HTML \n--EXPECT--\nThis is a heredoc test.\nThis is another heredoc test.\n
+token #13 PHP_CONSTANT_ENCAPSED_STRING \n
+token #14 PHP_HEREDOC_TAG_END ENDOFHEREDOC
+token #15 PHP_SEMICOLON ;
+token #16 WHITESPACE \n\n
+token #17 PHP_VARIABLE $x
+token #18 WHITESPACE
+token #19 PHP_OPERATOR =
+token #20 WHITESPACE
+token #21 PHP_HEREDOC_TAG_START <<
+token #38 T_INLINE_HTML \n--EXPECT--\nThis is a heredoc test.\nThis is another heredoc test.\n
diff --git a/php/php.editor/test/unit/data/goldenfiles/org/netbeans/modules/php/editor/lexer/PHP53FeaturesTest/lexer/heredoc_002.pass b/php/php.editor/test/unit/data/goldenfiles/org/netbeans/modules/php/editor/lexer/PHP53FeaturesTest/lexer/heredoc_002.pass
index 053dc1e31ae7..f0be6a81f894 100644
--- a/php/php.editor/test/unit/data/goldenfiles/org/netbeans/modules/php/editor/lexer/PHP53FeaturesTest/lexer/heredoc_002.pass
+++ b/php/php.editor/test/unit/data/goldenfiles/org/netbeans/modules/php/editor/lexer/PHP53FeaturesTest/lexer/heredoc_002.pass
@@ -11,27 +11,29 @@ token #9 WHITESPACE
token #10 PHP_HEREDOC_TAG_START b<<
-token #36 T_INLINE_HTML \n--EXPECT--\nThis is a heredoc test.\nThis is another heredoc test.\n
+token #13 PHP_CONSTANT_ENCAPSED_STRING \n
+token #14 PHP_HEREDOC_TAG_END ENDOFHEREDOC
+token #15 PHP_SEMICOLON ;
+token #16 WHITESPACE \n\n
+token #17 PHP_VARIABLE $x
+token #18 WHITESPACE
+token #19 PHP_OPERATOR =
+token #20 WHITESPACE
+token #21 PHP_HEREDOC_TAG_START b<<
+token #38 T_INLINE_HTML \n--EXPECT--\nThis is a heredoc test.\nThis is another heredoc test.\n
diff --git a/php/php.editor/test/unit/data/goldenfiles/org/netbeans/modules/php/editor/lexer/PHP53FeaturesTest/lexer/heredoc_003.pass b/php/php.editor/test/unit/data/goldenfiles/org/netbeans/modules/php/editor/lexer/PHP53FeaturesTest/lexer/heredoc_003.pass
index b1628b726a71..240dac51798e 100644
--- a/php/php.editor/test/unit/data/goldenfiles/org/netbeans/modules/php/editor/lexer/PHP53FeaturesTest/lexer/heredoc_003.pass
+++ b/php/php.editor/test/unit/data/goldenfiles/org/netbeans/modules/php/editor/lexer/PHP53FeaturesTest/lexer/heredoc_003.pass
@@ -13,29 +13,31 @@ token #11 PHP_ENCAPSED_AND_WHITESPACE This is heredoc test #
token #12 PHP_VARIABLE $a
token #13 PHP_CONSTANT_ENCAPSED_STRING .
token #14 PHP_CONSTANT_ENCAPSED_STRING \n
-token #15 PHP_HEREDOC_TAG_END \nENDOFHEREDOC
-token #16 PHP_SEMICOLON ;
-token #17 WHITESPACE \n\n
-token #18 PHP_VARIABLE $x
-token #19 WHITESPACE
-token #20 PHP_OPERATOR =
-token #21 WHITESPACE
-token #22 PHP_HEREDOC_TAG_START <<
-token #40 T_INLINE_HTML \n--EXPECT--\nThis is heredoc test #1.\nThis is heredoc test #2.\n
+token #15 PHP_CONSTANT_ENCAPSED_STRING \n
+token #16 PHP_HEREDOC_TAG_END ENDOFHEREDOC
+token #17 PHP_SEMICOLON ;
+token #18 WHITESPACE \n\n
+token #19 PHP_VARIABLE $x
+token #20 WHITESPACE
+token #21 PHP_OPERATOR =
+token #22 WHITESPACE
+token #23 PHP_HEREDOC_TAG_START <<
+token #42 T_INLINE_HTML \n--EXPECT--\nThis is heredoc test #1.\nThis is heredoc test #2.\n
diff --git a/php/php.editor/test/unit/data/goldenfiles/org/netbeans/modules/php/editor/lexer/PHP53FeaturesTest/lexer/heredoc_004.pass b/php/php.editor/test/unit/data/goldenfiles/org/netbeans/modules/php/editor/lexer/PHP53FeaturesTest/lexer/heredoc_004.pass
index ad286346ae2b..206f62e699e6 100644
--- a/php/php.editor/test/unit/data/goldenfiles/org/netbeans/modules/php/editor/lexer/PHP53FeaturesTest/lexer/heredoc_004.pass
+++ b/php/php.editor/test/unit/data/goldenfiles/org/netbeans/modules/php/editor/lexer/PHP53FeaturesTest/lexer/heredoc_004.pass
@@ -15,31 +15,33 @@ token #13 PHP_VARIABLE $a
token #14 PHP_CURLY_CLOSE }
token #15 PHP_CONSTANT_ENCAPSED_STRING .
token #16 PHP_CONSTANT_ENCAPSED_STRING \n
-token #17 PHP_HEREDOC_TAG_END \nENDOFHEREDOC
-token #18 PHP_SEMICOLON ;
-token #19 WHITESPACE \n\n
-token #20 PHP_VARIABLE $x
-token #21 WHITESPACE
-token #22 PHP_OPERATOR =
-token #23 WHITESPACE
-token #24 PHP_HEREDOC_TAG_START <<
-token #44 T_INLINE_HTML \n--EXPECT--\nThis is heredoc test #1.\nThis is heredoc test #2.\n
+token #17 PHP_CONSTANT_ENCAPSED_STRING \n
+token #18 PHP_HEREDOC_TAG_END ENDOFHEREDOC
+token #19 PHP_SEMICOLON ;
+token #20 WHITESPACE \n\n
+token #21 PHP_VARIABLE $x
+token #22 WHITESPACE
+token #23 PHP_OPERATOR =
+token #24 WHITESPACE
+token #25 PHP_HEREDOC_TAG_START <<
+token #46 T_INLINE_HTML \n--EXPECT--\nThis is heredoc test #1.\nThis is heredoc test #2.\n
diff --git a/php/php.editor/test/unit/data/goldenfiles/org/netbeans/modules/php/editor/lexer/PHP53FeaturesTest/lexer/heredoc_005.pass b/php/php.editor/test/unit/data/goldenfiles/org/netbeans/modules/php/editor/lexer/PHP53FeaturesTest/lexer/heredoc_005.pass
index e597e6afd3a1..6145dd0b2154 100644
--- a/php/php.editor/test/unit/data/goldenfiles/org/netbeans/modules/php/editor/lexer/PHP53FeaturesTest/lexer/heredoc_005.pass
+++ b/php/php.editor/test/unit/data/goldenfiles/org/netbeans/modules/php/editor/lexer/PHP53FeaturesTest/lexer/heredoc_005.pass
@@ -22,38 +22,40 @@ token #20 PHP_OBJECT_OPERATOR ->
token #21 PHP_STRING d
token #22 PHP_CONSTANT_ENCAPSED_STRING .
token #23 PHP_CONSTANT_ENCAPSED_STRING \n
-token #24 PHP_HEREDOC_TAG_END \nENDOFHEREDOC
-token #25 PHP_SEMICOLON ;
-token #26 WHITESPACE \n\n
-token #27 PHP_VARIABLE $x
-token #28 WHITESPACE
-token #29 PHP_OPERATOR =
-token #30 WHITESPACE
-token #31 PHP_HEREDOC_TAG_START <<
-token #42 PHP_STRING d
-token #43 PHP_CONSTANT_ENCAPSED_STRING .
-token #44 PHP_CONSTANT_ENCAPSED_STRING \n
-token #45 PHP_HEREDOC_TAG_END \nENDOFHEREDOC
-token #46 PHP_SEMICOLON ;
-token #47 WHITESPACE \n\n
-token #48 PHP_PRINT print
-token #49 WHITESPACE
-token #50 PHP_CONSTANT_ENCAPSED_STRING "
-token #51 PHP_CURLY_OPEN {
-token #52 PHP_VARIABLE $x
-token #53 PHP_CURLY_CLOSE }
-token #54 PHP_CONSTANT_ENCAPSED_STRING "
-token #55 PHP_SEMICOLON ;
-token #56 WHITESPACE \n\n
-token #57 PHP_CLOSETAG ?>
-token #58 T_INLINE_HTML \n--EXPECTF--\nParse error: syntax error, unexpected T_ENCAPSED_AND_WHITESPACE, expecting T_STRING or T_VARIABLE or T_NUM_STRING in %sheredoc_005.php on line 6\n
+token #24 PHP_CONSTANT_ENCAPSED_STRING \n
+token #25 PHP_HEREDOC_TAG_END ENDOFHEREDOC
+token #26 PHP_SEMICOLON ;
+token #27 WHITESPACE \n\n
+token #28 PHP_VARIABLE $x
+token #29 WHITESPACE
+token #30 PHP_OPERATOR =
+token #31 WHITESPACE
+token #32 PHP_HEREDOC_TAG_START <<
+token #43 PHP_STRING d
+token #44 PHP_CONSTANT_ENCAPSED_STRING .
+token #45 PHP_CONSTANT_ENCAPSED_STRING \n
+token #46 PHP_CONSTANT_ENCAPSED_STRING \n
+token #47 PHP_HEREDOC_TAG_END ENDOFHEREDOC
+token #48 PHP_SEMICOLON ;
+token #49 WHITESPACE \n\n
+token #50 PHP_PRINT print
+token #51 WHITESPACE
+token #52 PHP_CONSTANT_ENCAPSED_STRING "
+token #53 PHP_CURLY_OPEN {
+token #54 PHP_VARIABLE $x
+token #55 PHP_CURLY_CLOSE }
+token #56 PHP_CONSTANT_ENCAPSED_STRING "
+token #57 PHP_SEMICOLON ;
+token #58 WHITESPACE \n\n
+token #59 PHP_CLOSETAG ?>
+token #60 T_INLINE_HTML \n--EXPECTF--\nParse error: syntax error, unexpected T_ENCAPSED_AND_WHITESPACE, expecting T_STRING or T_VARIABLE or T_NUM_STRING in %sheredoc_005.php on line 6\n
diff --git a/php/php.editor/test/unit/data/goldenfiles/org/netbeans/modules/php/editor/lexer/PHP53FeaturesTest/lexer/heredoc_006.pass b/php/php.editor/test/unit/data/goldenfiles/org/netbeans/modules/php/editor/lexer/PHP53FeaturesTest/lexer/heredoc_006.pass
index 0b68f2837c6a..1fe5336c1ba4 100644
--- a/php/php.editor/test/unit/data/goldenfiles/org/netbeans/modules/php/editor/lexer/PHP53FeaturesTest/lexer/heredoc_006.pass
+++ b/php/php.editor/test/unit/data/goldenfiles/org/netbeans/modules/php/editor/lexer/PHP53FeaturesTest/lexer/heredoc_006.pass
@@ -32,48 +32,50 @@ token #30 PHP_STRING d
token #31 PHP_CURLY_CLOSE }
token #32 PHP_CONSTANT_ENCAPSED_STRING .
token #33 PHP_CONSTANT_ENCAPSED_STRING \n
-token #34 PHP_HEREDOC_TAG_END \nENDOFHEREDOC
-token #35 PHP_SEMICOLON ;
-token #36 WHITESPACE \n\n
-token #37 PHP_VARIABLE $x
-token #38 WHITESPACE
-token #39 PHP_OPERATOR =
-token #40 WHITESPACE
-token #41 PHP_HEREDOC_TAG_START <<
-token #61 PHP_STRING d
-token #62 PHP_CURLY_CLOSE }
-token #63 PHP_CONSTANT_ENCAPSED_STRING .
-token #64 PHP_CONSTANT_ENCAPSED_STRING \n
-token #65 PHP_HEREDOC_TAG_END \nENDOFHEREDOC
-token #66 PHP_SEMICOLON ;
-token #67 WHITESPACE \n\n
-token #68 PHP_PRINT print
-token #69 WHITESPACE
-token #70 PHP_CONSTANT_ENCAPSED_STRING "
-token #71 PHP_CURLY_OPEN {
-token #72 PHP_VARIABLE $x
-token #73 PHP_CURLY_CLOSE }
-token #74 PHP_CONSTANT_ENCAPSED_STRING "
-token #75 PHP_SEMICOLON ;
-token #76 WHITESPACE \n\n
-token #77 PHP_CLOSETAG ?>
-token #78 T_INLINE_HTML \n--EXPECT--\nThis is heredoc test #s 1, 2, 3, and 4.\nThis is heredoc test #s 1, 2, 3, and 4.\n
+token #34 PHP_CONSTANT_ENCAPSED_STRING \n
+token #35 PHP_HEREDOC_TAG_END ENDOFHEREDOC
+token #36 PHP_SEMICOLON ;
+token #37 WHITESPACE \n\n
+token #38 PHP_VARIABLE $x
+token #39 WHITESPACE
+token #40 PHP_OPERATOR =
+token #41 WHITESPACE
+token #42 PHP_HEREDOC_TAG_START <<
+token #62 PHP_STRING d
+token #63 PHP_CURLY_CLOSE }
+token #64 PHP_CONSTANT_ENCAPSED_STRING .
+token #65 PHP_CONSTANT_ENCAPSED_STRING \n
+token #66 PHP_CONSTANT_ENCAPSED_STRING \n
+token #67 PHP_HEREDOC_TAG_END ENDOFHEREDOC
+token #68 PHP_SEMICOLON ;
+token #69 WHITESPACE \n\n
+token #70 PHP_PRINT print
+token #71 WHITESPACE
+token #72 PHP_CONSTANT_ENCAPSED_STRING "
+token #73 PHP_CURLY_OPEN {
+token #74 PHP_VARIABLE $x
+token #75 PHP_CURLY_CLOSE }
+token #76 PHP_CONSTANT_ENCAPSED_STRING "
+token #77 PHP_SEMICOLON ;
+token #78 WHITESPACE \n\n
+token #79 PHP_CLOSETAG ?>
+token #80 T_INLINE_HTML \n--EXPECT--\nThis is heredoc test #s 1, 2, 3, and 4.\nThis is heredoc test #s 1, 2, 3, and 4.\n
diff --git a/php/php.editor/test/unit/data/goldenfiles/org/netbeans/modules/php/editor/lexer/PHP53FeaturesTest/lexer/heredoc_007.pass b/php/php.editor/test/unit/data/goldenfiles/org/netbeans/modules/php/editor/lexer/PHP53FeaturesTest/lexer/heredoc_007.pass
index 58a8e918ebb1..49da0d4e56cc 100644
--- a/php/php.editor/test/unit/data/goldenfiles/org/netbeans/modules/php/editor/lexer/PHP53FeaturesTest/lexer/heredoc_007.pass
+++ b/php/php.editor/test/unit/data/goldenfiles/org/netbeans/modules/php/editor/lexer/PHP53FeaturesTest/lexer/heredoc_007.pass
@@ -30,46 +30,48 @@ token #28 PHP_STRING d
token #29 PHP_CURLY_CLOSE }
token #30 PHP_CONSTANT_ENCAPSED_STRING .
token #31 PHP_CONSTANT_ENCAPSED_STRING \n
-token #32 PHP_HEREDOC_TAG_END \nENDOFHEREDOC
-token #33 PHP_SEMICOLON ;
-token #34 WHITESPACE \n\n
-token #35 PHP_VARIABLE $x
-token #36 WHITESPACE
-token #37 PHP_OPERATOR =
-token #38 WHITESPACE
-token #39 PHP_HEREDOC_TAG_START <<
-token #57 PHP_STRING d
-token #58 PHP_CURLY_CLOSE }
-token #59 PHP_CONSTANT_ENCAPSED_STRING .
-token #60 PHP_CONSTANT_ENCAPSED_STRING \n
-token #61 PHP_HEREDOC_TAG_END \nENDOFHEREDOC
-token #62 PHP_SEMICOLON ;
-token #63 WHITESPACE \n\n
-token #64 PHP_PRINT print
-token #65 WHITESPACE
-token #66 PHP_CONSTANT_ENCAPSED_STRING "
-token #67 PHP_CURLY_OPEN {
-token #68 PHP_VARIABLE $x
-token #69 PHP_CURLY_CLOSE }
-token #70 PHP_CONSTANT_ENCAPSED_STRING "
-token #71 PHP_SEMICOLON ;
-token #72 WHITESPACE \n\n
-token #73 PHP_CLOSETAG ?>
-token #74 T_INLINE_HTML \n--EXPECT--\nThis is heredoc test #s 1, 2, 3, and 4.\nThis is heredoc test #s 1, 2, 3, and 4.\n
+token #32 PHP_CONSTANT_ENCAPSED_STRING \n
+token #33 PHP_HEREDOC_TAG_END ENDOFHEREDOC
+token #34 PHP_SEMICOLON ;
+token #35 WHITESPACE \n\n
+token #36 PHP_VARIABLE $x
+token #37 WHITESPACE
+token #38 PHP_OPERATOR =
+token #39 WHITESPACE
+token #40 PHP_HEREDOC_TAG_START <<
+token #58 PHP_STRING d
+token #59 PHP_CURLY_CLOSE }
+token #60 PHP_CONSTANT_ENCAPSED_STRING .
+token #61 PHP_CONSTANT_ENCAPSED_STRING \n
+token #62 PHP_CONSTANT_ENCAPSED_STRING \n
+token #63 PHP_HEREDOC_TAG_END ENDOFHEREDOC
+token #64 PHP_SEMICOLON ;
+token #65 WHITESPACE \n\n
+token #66 PHP_PRINT print
+token #67 WHITESPACE
+token #68 PHP_CONSTANT_ENCAPSED_STRING "
+token #69 PHP_CURLY_OPEN {
+token #70 PHP_VARIABLE $x
+token #71 PHP_CURLY_CLOSE }
+token #72 PHP_CONSTANT_ENCAPSED_STRING "
+token #73 PHP_SEMICOLON ;
+token #74 WHITESPACE \n\n
+token #75 PHP_CLOSETAG ?>
+token #76 T_INLINE_HTML \n--EXPECT--\nThis is heredoc test #s 1, 2, 3, and 4.\nThis is heredoc test #s 1, 2, 3, and 4.\n
diff --git a/php/php.editor/test/unit/data/goldenfiles/org/netbeans/modules/php/editor/lexer/PHP53FeaturesTest/lexer/heredoc_009.pass b/php/php.editor/test/unit/data/goldenfiles/org/netbeans/modules/php/editor/lexer/PHP53FeaturesTest/lexer/heredoc_009.pass
deleted file mode 100644
index 789919006c7d..000000000000
--- a/php/php.editor/test/unit/data/goldenfiles/org/netbeans/modules/php/editor/lexer/PHP53FeaturesTest/lexer/heredoc_009.pass
+++ /dev/null
@@ -1,49 +0,0 @@
-token #0 T_INLINE_HTML --TEST--\nTorture the T_END_HEREDOC rules (heredoc)\n--FILE--\n
-token #1 PHP_OPENTAG
-token #48 T_INLINE_HTML \n--EXPECTF--\nNotice: Undefined variable: ENDOFHEREDOC in %s on line %d\nENDOFHEREDOC ;\n ENDOFHEREDOC;\nENDOFHEREDOC \n ENDOFHEREDOC\n;\n\nNotice: Undefined variable: ENDOFHEREDOC in %s on line %d\nENDOFHEREDOC ;\n ENDOFHEREDOC;\nENDOFHEREDOC \n ENDOFHEREDOC\n;\n
diff --git a/php/php.editor/test/unit/data/goldenfiles/org/netbeans/modules/php/editor/lexer/PHP53FeaturesTest/lexer/heredoc_010.pass b/php/php.editor/test/unit/data/goldenfiles/org/netbeans/modules/php/editor/lexer/PHP53FeaturesTest/lexer/heredoc_010.pass
deleted file mode 100644
index 063b78bdefe3..000000000000
--- a/php/php.editor/test/unit/data/goldenfiles/org/netbeans/modules/php/editor/lexer/PHP53FeaturesTest/lexer/heredoc_010.pass
+++ /dev/null
@@ -1,74 +0,0 @@
-token #0 T_INLINE_HTML --TEST--\nTorture the T_END_HEREDOC rules with variable expansions (heredoc)\n--FILE--\n
-token #1 PHP_OPENTAG
-token #73 T_INLINE_HTML \n--EXPECT--\nENDOFHEREDOC\nENDOFHEREDOC\nENDOFHEREDOC\nENDOFHEREDOC\nENDOFHEREDOC\nENDOFHEREDOC\n
diff --git a/php/php.editor/test/unit/data/goldenfiles/org/netbeans/modules/php/editor/lexer/PHP53FeaturesTest/lexer/heredoc_011.pass b/php/php.editor/test/unit/data/goldenfiles/org/netbeans/modules/php/editor/lexer/PHP53FeaturesTest/lexer/heredoc_011.pass
index 3a6c62bb53b7..e53094de1a13 100644
--- a/php/php.editor/test/unit/data/goldenfiles/org/netbeans/modules/php/editor/lexer/PHP53FeaturesTest/lexer/heredoc_011.pass
+++ b/php/php.editor/test/unit/data/goldenfiles/org/netbeans/modules/php/editor/lexer/PHP53FeaturesTest/lexer/heredoc_011.pass
@@ -20,22 +20,23 @@ token #18 PHP_OPERATOR =
token #19 WHITESPACE
token #20 PHP_HEREDOC_TAG_START <<
-token #40 T_INLINE_HTML \n--EXPECT--\nIf you see this, everything is ok.\n
+token #22 PHP_CONSTANT_ENCAPSED_STRING \n
+token #23 PHP_HEREDOC_TAG_END THISMUSTNOTERROR
+token #24 PHP_SEMICOLON ;
+token #25 WHITESPACE \n\n
+token #26 PHP_CURLY_CLOSE }
+token #27 PHP_SEMICOLON ;
+token #28 WHITESPACE \n\n
+token #29 PHP_PRINT print
+token #30 WHITESPACE
+token #31 PHP_STRING e
+token #32 PHP_PAAMAYIM_NEKUDOTAYIM ::
+token #33 PHP_STRING E
+token #34 WHITESPACE
+token #35 PHP_TOKEN .
+token #36 WHITESPACE
+token #37 PHP_CONSTANT_ENCAPSED_STRING "\n"
+token #38 PHP_SEMICOLON ;
+token #39 WHITESPACE \n\n
+token #40 PHP_CLOSETAG ?>
+token #41 T_INLINE_HTML \n--EXPECT--\nIf you see this, everything is ok.\n
diff --git a/php/php.editor/test/unit/data/goldenfiles/org/netbeans/modules/php/editor/lexer/PHP53FeaturesTest/lexer/heredoc_012.pass b/php/php.editor/test/unit/data/goldenfiles/org/netbeans/modules/php/editor/lexer/PHP53FeaturesTest/lexer/heredoc_012.pass
index e9143b1fa9c7..12f8ddd28f8d 100644
--- a/php/php.editor/test/unit/data/goldenfiles/org/netbeans/modules/php/editor/lexer/PHP53FeaturesTest/lexer/heredoc_012.pass
+++ b/php/php.editor/test/unit/data/goldenfiles/org/netbeans/modules/php/editor/lexer/PHP53FeaturesTest/lexer/heredoc_012.pass
@@ -15,13 +15,14 @@ token #13 WHITESPACE
token #14 PHP_HEREDOC_TAG_START <<<"MYLABEL"\n
token #15 PHP_ENCAPSED_AND_WHITESPACE test:
token #16 PHP_VARIABLE $test
-token #17 PHP_HEREDOC_TAG_END \nMYLABEL
-token #18 PHP_SEMICOLON ;
-token #19 WHITESPACE \n
-token #20 PHP_ECHO echo
-token #21 WHITESPACE
-token #22 PHP_VARIABLE $var
-token #23 PHP_SEMICOLON ;
-token #24 WHITESPACE \n
-token #25 PHP_CLOSETAG ?>
-token #26 T_INLINE_HTML \n--EXPECT--\ntest: foo\n
+token #17 PHP_CONSTANT_ENCAPSED_STRING \n
+token #18 PHP_HEREDOC_TAG_END MYLABEL
+token #19 PHP_SEMICOLON ;
+token #20 WHITESPACE \n
+token #21 PHP_ECHO echo
+token #22 WHITESPACE
+token #23 PHP_VARIABLE $var
+token #24 PHP_SEMICOLON ;
+token #25 WHITESPACE \n
+token #26 PHP_CLOSETAG ?>
+token #27 T_INLINE_HTML \n--EXPECT--\ntest: foo\n
diff --git a/php/php.editor/test/unit/data/goldenfiles/org/netbeans/modules/php/editor/lexer/PHP53FeaturesTest/lexer/heredoc_013.pass b/php/php.editor/test/unit/data/goldenfiles/org/netbeans/modules/php/editor/lexer/PHP53FeaturesTest/lexer/heredoc_013.pass
index ba70c610a7e8..efed7eea29b7 100644
--- a/php/php.editor/test/unit/data/goldenfiles/org/netbeans/modules/php/editor/lexer/PHP53FeaturesTest/lexer/heredoc_013.pass
+++ b/php/php.editor/test/unit/data/goldenfiles/org/netbeans/modules/php/editor/lexer/PHP53FeaturesTest/lexer/heredoc_013.pass
@@ -16,13 +16,14 @@ token #14 PHP_STRING prefix
token #15 PHP_HEREDOC_TAG_START <<<"MYLABEL"\n
token #16 PHP_ENCAPSED_AND_WHITESPACE test:
token #17 PHP_VARIABLE $test
-token #18 PHP_HEREDOC_TAG_END \nMYLABEL
-token #19 PHP_SEMICOLON ;
-token #20 WHITESPACE \n
-token #21 PHP_ECHO echo
-token #22 WHITESPACE
-token #23 PHP_VARIABLE $var
-token #24 PHP_SEMICOLON ;
-token #25 WHITESPACE \n
-token #26 PHP_CLOSETAG ?>
-token #27 T_INLINE_HTML \n--EXPECTF--\nParse error: syntax error, unexpected T_START_HEREDOC in %sheredoc_013.php on line %d\n
+token #18 PHP_CONSTANT_ENCAPSED_STRING \n
+token #19 PHP_HEREDOC_TAG_END MYLABEL
+token #20 PHP_SEMICOLON ;
+token #21 WHITESPACE \n
+token #22 PHP_ECHO echo
+token #23 WHITESPACE
+token #24 PHP_VARIABLE $var
+token #25 PHP_SEMICOLON ;
+token #26 WHITESPACE \n
+token #27 PHP_CLOSETAG ?>
+token #28 T_INLINE_HTML \n--EXPECTF--\nParse error: syntax error, unexpected T_START_HEREDOC in %sheredoc_013.php on line %d\n
diff --git a/php/php.editor/test/unit/data/goldenfiles/org/netbeans/modules/php/editor/lexer/PHP53FeaturesTest/lexer/heredoc_015.pass b/php/php.editor/test/unit/data/goldenfiles/org/netbeans/modules/php/editor/lexer/PHP53FeaturesTest/lexer/heredoc_015.pass
index cace7f7e10c7..3519aded35d9 100644
--- a/php/php.editor/test/unit/data/goldenfiles/org/netbeans/modules/php/editor/lexer/PHP53FeaturesTest/lexer/heredoc_015.pass
+++ b/php/php.editor/test/unit/data/goldenfiles/org/netbeans/modules/php/editor/lexer/PHP53FeaturesTest/lexer/heredoc_015.pass
@@ -15,33 +15,34 @@ token #13 PHP_OPERATOR =
token #14 WHITESPACE
token #15 PHP_HEREDOC_TAG_START <<
-token #38 PHP_STRING e
-token #39 WHITESPACE
-token #40 PHP_TOKEN .
-token #41 WHITESPACE
-token #42 PHP_CONSTANT_ENCAPSED_STRING "\n"
-token #43 PHP_SEMICOLON ;
-token #44 WHITESPACE \n\n
-token #45 PHP_CLOSETAG ?>
-token #46 T_INLINE_HTML \n--EXPECT--\nIf you see this, everything is ok.\n
+token #17 PHP_CONSTANT_ENCAPSED_STRING \n
+token #18 PHP_HEREDOC_TAG_END THISMUSTNOTERROR
+token #19 PHP_SEMICOLON ;
+token #20 WHITESPACE \n\n
+token #21 PHP_CURLY_CLOSE }
+token #22 PHP_SEMICOLON ;
+token #23 WHITESPACE \n
+token #24 PHP_VARIABLE $e
+token #25 WHITESPACE
+token #26 PHP_OPERATOR =
+token #27 WHITESPACE
+token #28 PHP_NEW new
+token #29 WHITESPACE
+token #30 PHP_STRING e
+token #31 PHP_TOKEN (
+token #32 PHP_TOKEN )
+token #33 PHP_SEMICOLON ;
+token #34 WHITESPACE \n
+token #35 PHP_PRINT print
+token #36 WHITESPACE
+token #37 PHP_VARIABLE $e
+token #38 PHP_OBJECT_OPERATOR ->
+token #39 PHP_STRING e
+token #40 WHITESPACE
+token #41 PHP_TOKEN .
+token #42 WHITESPACE
+token #43 PHP_CONSTANT_ENCAPSED_STRING "\n"
+token #44 PHP_SEMICOLON ;
+token #45 WHITESPACE \n\n
+token #46 PHP_CLOSETAG ?>
+token #47 T_INLINE_HTML \n--EXPECT--\nIf you see this, everything is ok.\n
diff --git a/php/php.editor/test/unit/data/goldenfiles/org/netbeans/modules/php/editor/lexer/PHP53FeaturesTest/lexer/issue225549.pass b/php/php.editor/test/unit/data/goldenfiles/org/netbeans/modules/php/editor/lexer/PHP53FeaturesTest/lexer/issue225549.pass
index bc1014db7bc5..5050ef76f824 100644
--- a/php/php.editor/test/unit/data/goldenfiles/org/netbeans/modules/php/editor/lexer/PHP53FeaturesTest/lexer/issue225549.pass
+++ b/php/php.editor/test/unit/data/goldenfiles/org/netbeans/modules/php/editor/lexer/PHP53FeaturesTest/lexer/issue225549.pass
@@ -10,7 +10,8 @@ token #8 PHP_CURLY_OPEN {
token #9 PHP_VARIABLE $url
token #10 PHP_CURLY_CLOSE }
token #11 PHP_CONSTANT_ENCAPSED_STRING "
-token #12 PHP_HEREDOC_TAG_END \nEOT
-token #13 PHP_SEMICOLON ;
-token #14 WHITESPACE \n
-token #15 PHP_CLOSETAG ?>\n
+token #12 PHP_CONSTANT_ENCAPSED_STRING \n
+token #13 PHP_HEREDOC_TAG_END EOT
+token #14 PHP_SEMICOLON ;
+token #15 WHITESPACE \n
+token #16 PHP_CLOSETAG ?>\n
diff --git a/php/php.editor/test/unit/data/goldenfiles/org/netbeans/modules/php/editor/lexer/PHP53FeaturesTest/lexer/nowdoc_008.pass b/php/php.editor/test/unit/data/goldenfiles/org/netbeans/modules/php/editor/lexer/PHP53FeaturesTest/lexer/nowdoc_008.pass
index dd33072f0d12..4c00ed030e3a 100644
--- a/php/php.editor/test/unit/data/goldenfiles/org/netbeans/modules/php/editor/lexer/PHP53FeaturesTest/lexer/nowdoc_008.pass
+++ b/php/php.editor/test/unit/data/goldenfiles/org/netbeans/modules/php/editor/lexer/PHP53FeaturesTest/lexer/nowdoc_008.pass
@@ -9,23 +9,25 @@ token #7 WHITESPACE \n\n
token #8 PHP_PRINT print
token #9 WHITESPACE
token #10 PHP_NOWDOC_TAG_START <<<'ENDOFNOWDOC'\n
-token #11 PHP_NOWDOC_TAG_END ENDOFNOWDOC;\n
-token #12 WHITESPACE \n
-token #13 PHP_VARIABLE $x
-token #14 WHITESPACE
-token #15 PHP_OPERATOR =
-token #16 WHITESPACE
-token #17 PHP_NOWDOC_TAG_START <<<'ENDOFNOWDOC'\n
-token #18 PHP_NOWDOC_TAG_END ENDOFNOWDOC;\n
-token #19 WHITESPACE \n
-token #20 PHP_PRINT print
-token #21 WHITESPACE
-token #22 PHP_CONSTANT_ENCAPSED_STRING "
-token #23 PHP_CURLY_OPEN {
-token #24 PHP_VARIABLE $x
-token #25 PHP_CURLY_CLOSE }
-token #26 PHP_CONSTANT_ENCAPSED_STRING "
-token #27 PHP_SEMICOLON ;
-token #28 WHITESPACE \n\n
-token #29 PHP_CLOSETAG ?>
-token #30 T_INLINE_HTML \n--EXPECT--\n
+token #11 PHP_NOWDOC_TAG_END ENDOFNOWDOC
+token #12 PHP_SEMICOLON ;
+token #13 WHITESPACE \n\n
+token #14 PHP_VARIABLE $x
+token #15 WHITESPACE
+token #16 PHP_OPERATOR =
+token #17 WHITESPACE
+token #18 PHP_NOWDOC_TAG_START <<<'ENDOFNOWDOC'\n
+token #19 PHP_NOWDOC_TAG_END ENDOFNOWDOC
+token #20 PHP_SEMICOLON ;
+token #21 WHITESPACE \n\n
+token #22 PHP_PRINT print
+token #23 WHITESPACE
+token #24 PHP_CONSTANT_ENCAPSED_STRING "
+token #25 PHP_CURLY_OPEN {
+token #26 PHP_VARIABLE $x
+token #27 PHP_CURLY_CLOSE }
+token #28 PHP_CONSTANT_ENCAPSED_STRING "
+token #29 PHP_SEMICOLON ;
+token #30 WHITESPACE \n\n
+token #31 PHP_CLOSETAG ?>
+token #32 T_INLINE_HTML \n--EXPECT--\n
diff --git a/php/php.editor/test/unit/data/goldenfiles/org/netbeans/modules/php/editor/lexer/PHP53FeaturesTest/lexer/nowdoc_009.pass b/php/php.editor/test/unit/data/goldenfiles/org/netbeans/modules/php/editor/lexer/PHP53FeaturesTest/lexer/nowdoc_009.pass
deleted file mode 100644
index 33106495c32e..000000000000
--- a/php/php.editor/test/unit/data/goldenfiles/org/netbeans/modules/php/editor/lexer/PHP53FeaturesTest/lexer/nowdoc_009.pass
+++ /dev/null
@@ -1,35 +0,0 @@
-token #0 T_INLINE_HTML --TEST--\nTorture the T_END_NOWDOC rules (nowdoc)\n--FILE--\n
-token #1 PHP_OPENTAG
-token #34 T_INLINE_HTML \n--EXPECT--\nENDOFNOWDOC ;\n ENDOFNOWDOC;\nENDOFNOWDOC \n ENDOFNOWDOC\n$ENDOFNOWDOC;\nENDOFNOWDOC ;\n ENDOFNOWDOC;\nENDOFNOWDOC \n ENDOFNOWDOC\n$ENDOFNOWDOC;\n\n
diff --git a/php/php.editor/test/unit/data/goldenfiles/org/netbeans/modules/php/editor/lexer/PHP53FeaturesTest/lexer/nowdoc_010.pass b/php/php.editor/test/unit/data/goldenfiles/org/netbeans/modules/php/editor/lexer/PHP53FeaturesTest/lexer/nowdoc_010.pass
deleted file mode 100644
index c9a51e05b181..000000000000
--- a/php/php.editor/test/unit/data/goldenfiles/org/netbeans/modules/php/editor/lexer/PHP53FeaturesTest/lexer/nowdoc_010.pass
+++ /dev/null
@@ -1,42 +0,0 @@
-token #0 T_INLINE_HTML --TEST--\nTorture the T_END_NOWDOC rules with variable expansions (nowdoc)\n--FILE--\n
-token #1 PHP_OPENTAG
-token #41 T_INLINE_HTML \n--EXPECT--\n{$fooledYou}ENDOFNOWDOC{$fooledYou}\nENDOFNOWDOC{$fooledYou}\n{$fooledYou}ENDOFNOWDOC\n{$fooledYou}ENDOFNOWDOC{$fooledYou}\nENDOFNOWDOC{$fooledYou}\n{$fooledYou}ENDOFNOWDOC\n\n
diff --git a/php/php.editor/test/unit/data/goldenfiles/org/netbeans/modules/php/editor/lexer/PHP53FeaturesTest/lexer/nowdoc_012.pass b/php/php.editor/test/unit/data/goldenfiles/org/netbeans/modules/php/editor/lexer/PHP53FeaturesTest/lexer/nowdoc_012.pass
index ba140f340363..e371334c97b8 100644
--- a/php/php.editor/test/unit/data/goldenfiles/org/netbeans/modules/php/editor/lexer/PHP53FeaturesTest/lexer/nowdoc_012.pass
+++ b/php/php.editor/test/unit/data/goldenfiles/org/netbeans/modules/php/editor/lexer/PHP53FeaturesTest/lexer/nowdoc_012.pass
@@ -11,22 +11,19 @@ token #9 WHITESPACE
token #10 PHP_OPERATOR =
token #11 WHITESPACE
token #12 PHP_NOWDOC_TAG_START <<<'ENDOFNOWDOC'\n
-token #13 PHP_CONSTANT_ENCAPSED_STRING This is a nowdoc test.\nNOTREALLYEND;
-token #14 PHP_CONSTANT_ENCAPSED_STRING \nAnother line\nNOTENDEITHER;
-token #15 PHP_CONSTANT_ENCAPSED_STRING \nENDOFNOWDOCWILLBESOON
-token #16 PHP_CONSTANT_ENCAPSED_STRING \nNow let's finish it\n
-token #17 PHP_NOWDOC_TAG_END ENDOFNOWDOC
-token #18 PHP_SEMICOLON ;
-token #19 WHITESPACE \n
-token #20 PHP_PRINT print
-token #21 WHITESPACE
-token #22 PHP_CONSTANT_ENCAPSED_STRING "
-token #23 PHP_CURLY_OPEN {
-token #24 PHP_VARIABLE $x
-token #25 PHP_CURLY_CLOSE }
-token #26 PHP_ENCAPSED_AND_WHITESPACE \n
-token #27 PHP_CONSTANT_ENCAPSED_STRING "
-token #28 PHP_SEMICOLON ;
-token #29 WHITESPACE \n\n
-token #30 PHP_CLOSETAG ?>
-token #31 T_INLINE_HTML \n--EXPECT--\nThis is a nowdoc test.\nNOTREALLYEND;\nAnother line\nNOTENDEITHER;\nENDOFNOWDOCWILLBESOON\nNow let's finish it\n
+token #13 PHP_CONSTANT_ENCAPSED_STRING This is a nowdoc test.\nNOTREALLYEND;\nAnother line\nNOTENDEITHER;\nENDOFNOWDOCWILLBESOON\nNow let's finish it\n
+token #14 PHP_NOWDOC_TAG_END ENDOFNOWDOC
+token #15 PHP_SEMICOLON ;
+token #16 WHITESPACE \n
+token #17 PHP_PRINT print
+token #18 WHITESPACE
+token #19 PHP_CONSTANT_ENCAPSED_STRING "
+token #20 PHP_CURLY_OPEN {
+token #21 PHP_VARIABLE $x
+token #22 PHP_CURLY_CLOSE }
+token #23 PHP_ENCAPSED_AND_WHITESPACE \n
+token #24 PHP_CONSTANT_ENCAPSED_STRING "
+token #25 PHP_SEMICOLON ;
+token #26 WHITESPACE \n\n
+token #27 PHP_CLOSETAG ?>
+token #28 T_INLINE_HTML \n--EXPECT--\nThis is a nowdoc test.\nNOTREALLYEND;\nAnother line\nNOTENDEITHER;\nENDOFNOWDOCWILLBESOON\nNow let's finish it\n
diff --git a/php/php.editor/test/unit/data/goldenfiles/org/netbeans/modules/php/editor/lexer/PHP53FeaturesTest/lexer/nowdoc_013.pass b/php/php.editor/test/unit/data/goldenfiles/org/netbeans/modules/php/editor/lexer/PHP53FeaturesTest/lexer/nowdoc_013.pass
index d51a90ccf35b..07ef356e6a75 100644
--- a/php/php.editor/test/unit/data/goldenfiles/org/netbeans/modules/php/editor/lexer/PHP53FeaturesTest/lexer/nowdoc_013.pass
+++ b/php/php.editor/test/unit/data/goldenfiles/org/netbeans/modules/php/editor/lexer/PHP53FeaturesTest/lexer/nowdoc_013.pass
@@ -6,38 +6,37 @@ token #4 WHITESPACE
token #5 PHP_OPERATOR =
token #6 WHITESPACE
token #7 PHP_NOWDOC_TAG_START <<<'EOF'\n
-token #8 PHP_CONSTANT_ENCAPSED_STRING \n
-token #10 PHP_NOWDOC_TAG_END EOF
-token #11 PHP_SEMICOLON ;
-token #12 WHITESPACE \n
-token #13 PHP_STRING highlight_string
-token #14 PHP_TOKEN (
-token #15 PHP_VARIABLE $code
-token #16 PHP_TOKEN )
-token #17 PHP_SEMICOLON ;
-token #18 WHITESPACE \n
-token #19 PHP_CLOSETAG ?>
-token #20 T_INLINE_HTML \n--EXPECT--\n
-token #21 T_INLINE_HTML <
-token #22 T_INLINE_HTML code>
-token #23 T_INLINE_HTML <
-token #24 T_INLINE_HTML span style="color: #000000">\n
-token #25 T_INLINE_HTML <
-token #26 T_INLINE_HTML span style="color: #0000BB"><?php
$x
-token #27 T_INLINE_HTML <
-token #28 T_INLINE_HTML span style="color: #007700">= <<<'EOT'
-token #29 T_INLINE_HTML <
-token #30 T_INLINE_HTML span style="color: #0000BB">some string
-token #31 T_INLINE_HTML <
-token #32 T_INLINE_HTML span style="color: #007700">EOT
-token #33 T_INLINE_HTML <
-token #34 T_INLINE_HTML span style="color: #0000BB">$y
-token #35 T_INLINE_HTML <
-token #36 T_INLINE_HTML span style="color: #007700">=
-token #37 T_INLINE_HTML <
-token #38 T_INLINE_HTML span style="color: #0000BB">2
-token #39 T_INLINE_HTML <
-token #40 T_INLINE_HTML span style="color: #007700">;
-token #41 T_INLINE_HTML <
-token #42 T_INLINE_HTML span style="color: #0000BB">?>\n\n\n
+token #8 PHP_CONSTANT_ENCAPSED_STRING \n
+token #9 PHP_NOWDOC_TAG_END EOF
+token #10 PHP_SEMICOLON ;
+token #11 WHITESPACE \n
+token #12 PHP_STRING highlight_string
+token #13 PHP_TOKEN (
+token #14 PHP_VARIABLE $code
+token #15 PHP_TOKEN )
+token #16 PHP_SEMICOLON ;
+token #17 WHITESPACE \n
+token #18 PHP_CLOSETAG ?>
+token #19 T_INLINE_HTML \n--EXPECT--\n
+token #20 T_INLINE_HTML <
+token #21 T_INLINE_HTML code>
+token #22 T_INLINE_HTML <
+token #23 T_INLINE_HTML span style="color: #000000">\n
+token #24 T_INLINE_HTML <
+token #25 T_INLINE_HTML span style="color: #0000BB"><?php
$x
+token #26 T_INLINE_HTML <
+token #27 T_INLINE_HTML span style="color: #007700">= <<<'EOT'
+token #28 T_INLINE_HTML <
+token #29 T_INLINE_HTML span style="color: #0000BB">some string
+token #30 T_INLINE_HTML <
+token #31 T_INLINE_HTML span style="color: #007700">EOT
+token #32 T_INLINE_HTML <
+token #33 T_INLINE_HTML span style="color: #0000BB">$y
+token #34 T_INLINE_HTML <
+token #35 T_INLINE_HTML span style="color: #007700">=
+token #36 T_INLINE_HTML <
+token #37 T_INLINE_HTML span style="color: #0000BB">2
+token #38 T_INLINE_HTML <
+token #39 T_INLINE_HTML span style="color: #007700">;
+token #40 T_INLINE_HTML <
+token #41 T_INLINE_HTML span style="color: #0000BB">?>\n\n\n
diff --git a/php/php.editor/test/unit/data/goldenfiles/org/netbeans/modules/php/editor/lexer/PHP53FeaturesTest/lexer/nowdoc_014.pass b/php/php.editor/test/unit/data/goldenfiles/org/netbeans/modules/php/editor/lexer/PHP53FeaturesTest/lexer/nowdoc_014.pass
index 5d556ff0ad6e..4451ee65ff2c 100644
--- a/php/php.editor/test/unit/data/goldenfiles/org/netbeans/modules/php/editor/lexer/PHP53FeaturesTest/lexer/nowdoc_014.pass
+++ b/php/php.editor/test/unit/data/goldenfiles/org/netbeans/modules/php/editor/lexer/PHP53FeaturesTest/lexer/nowdoc_014.pass
@@ -6,38 +6,37 @@ token #4 WHITESPACE
token #5 PHP_OPERATOR =
token #6 WHITESPACE
token #7 PHP_NOWDOC_TAG_START <<<'EOF'\n
-token #8 PHP_CONSTANT_ENCAPSED_STRING \n
-token #10 PHP_NOWDOC_TAG_END EOF
-token #11 PHP_SEMICOLON ;
-token #12 WHITESPACE \n
-token #13 PHP_STRING highlight_string
-token #14 PHP_TOKEN (
-token #15 PHP_VARIABLE $code
-token #16 PHP_TOKEN )
-token #17 PHP_SEMICOLON ;
-token #18 WHITESPACE \n
-token #19 PHP_CLOSETAG ?>
-token #20 T_INLINE_HTML \n--EXPECT--\n
-token #21 T_INLINE_HTML <
-token #22 T_INLINE_HTML code>
-token #23 T_INLINE_HTML <
-token #24 T_INLINE_HTML span style="color: #000000">\n
-token #25 T_INLINE_HTML <
-token #26 T_INLINE_HTML span style="color: #0000BB"><?php
$x
-token #27 T_INLINE_HTML <
-token #28 T_INLINE_HTML span style="color: #007700">= <<<'EOT'
-token #29 T_INLINE_HTML <
-token #30 T_INLINE_HTML span style="color: #0000BB">
-token #31 T_INLINE_HTML <
-token #32 T_INLINE_HTML span style="color: #007700">EOT
-token #33 T_INLINE_HTML <
-token #34 T_INLINE_HTML span style="color: #0000BB">$y
-token #35 T_INLINE_HTML <
-token #36 T_INLINE_HTML span style="color: #007700">=
-token #37 T_INLINE_HTML <
-token #38 T_INLINE_HTML span style="color: #0000BB">2
-token #39 T_INLINE_HTML <
-token #40 T_INLINE_HTML span style="color: #007700">;
-token #41 T_INLINE_HTML <
-token #42 T_INLINE_HTML span style="color: #0000BB">?>\n\n\n
+token #8 PHP_CONSTANT_ENCAPSED_STRING \n
+token #9 PHP_NOWDOC_TAG_END EOF
+token #10 PHP_SEMICOLON ;
+token #11 WHITESPACE \n
+token #12 PHP_STRING highlight_string
+token #13 PHP_TOKEN (
+token #14 PHP_VARIABLE $code
+token #15 PHP_TOKEN )
+token #16 PHP_SEMICOLON ;
+token #17 WHITESPACE \n
+token #18 PHP_CLOSETAG ?>
+token #19 T_INLINE_HTML \n--EXPECT--\n
+token #20 T_INLINE_HTML <
+token #21 T_INLINE_HTML code>
+token #22 T_INLINE_HTML <
+token #23 T_INLINE_HTML span style="color: #000000">\n
+token #24 T_INLINE_HTML <
+token #25 T_INLINE_HTML span style="color: #0000BB"><?php
$x
+token #26 T_INLINE_HTML <
+token #27 T_INLINE_HTML span style="color: #007700">= <<<'EOT'
+token #28 T_INLINE_HTML <
+token #29 T_INLINE_HTML span style="color: #0000BB">
+token #30 T_INLINE_HTML <
+token #31 T_INLINE_HTML span style="color: #007700">EOT
+token #32 T_INLINE_HTML <
+token #33 T_INLINE_HTML span style="color: #0000BB">$y
+token #34 T_INLINE_HTML <
+token #35 T_INLINE_HTML span style="color: #007700">=
+token #36 T_INLINE_HTML <
+token #37 T_INLINE_HTML span style="color: #0000BB">2
+token #38 T_INLINE_HTML <
+token #39 T_INLINE_HTML span style="color: #007700">;
+token #40 T_INLINE_HTML <
+token #41 T_INLINE_HTML span style="color: #0000BB">?>\n\n\n
diff --git a/php/php.editor/test/unit/data/goldenfiles/org/netbeans/modules/php/editor/lexer/PHP53FeaturesTest/lexer/nowdoc_015.pass b/php/php.editor/test/unit/data/goldenfiles/org/netbeans/modules/php/editor/lexer/PHP53FeaturesTest/lexer/nowdoc_015.pass
index b9b165446354..2c29bfb82f3f 100644
--- a/php/php.editor/test/unit/data/goldenfiles/org/netbeans/modules/php/editor/lexer/PHP53FeaturesTest/lexer/nowdoc_015.pass
+++ b/php/php.editor/test/unit/data/goldenfiles/org/netbeans/modules/php/editor/lexer/PHP53FeaturesTest/lexer/nowdoc_015.pass
@@ -74,128 +74,131 @@ token #72 WHITESPACE
token #73 PHP_OPERATOR =
token #74 WHITESPACE
token #75 PHP_NOWDOC_TAG_START <<<'EOF'\n
-token #76 PHP_NOWDOC_TAG_END EOF;\n
-token #77 PHP_STRING var_dump
-token #78 PHP_TOKEN (
-token #79 PHP_VARIABLE $x
-token #80 PHP_TOKEN )
-token #81 PHP_SEMICOLON ;
-token #82 WHITESPACE \n
-token #83 PHP_STRING trigger_error
-token #84 PHP_TOKEN (
-token #85 PHP_CONSTANT_ENCAPSED_STRING "line"
-token #86 PHP_TOKEN ,
-token #87 WHITESPACE
-token #88 PHP_STRING E_USER_ERROR
-token #89 PHP_TOKEN )
-token #90 PHP_SEMICOLON ;
-token #91 WHITESPACE \n
-token #92 PHP_VARIABLE $x
-token #93 WHITESPACE
-token #94 PHP_OPERATOR =
+token #76 PHP_NOWDOC_TAG_END EOF
+token #77 PHP_SEMICOLON ;
+token #78 WHITESPACE \n
+token #79 PHP_STRING var_dump
+token #80 PHP_TOKEN (
+token #81 PHP_VARIABLE $x
+token #82 PHP_TOKEN )
+token #83 PHP_SEMICOLON ;
+token #84 WHITESPACE \n
+token #85 PHP_STRING trigger_error
+token #86 PHP_TOKEN (
+token #87 PHP_CONSTANT_ENCAPSED_STRING "line"
+token #88 PHP_TOKEN ,
+token #89 WHITESPACE
+token #90 PHP_STRING E_USER_ERROR
+token #91 PHP_TOKEN )
+token #92 PHP_SEMICOLON ;
+token #93 WHITESPACE \n
+token #94 PHP_VARIABLE $x
token #95 WHITESPACE
-token #96 PHP_HEREDOC_TAG_START <<
-token #200 T_INLINE_HTML \n--EXPECT--\n6\nstring(0) ""\n10\nstring(0) ""\n14\nstring(4) "test"\n19\nstring(4) "test"\n24\nstring(20) "test1\ntest2\n\ntest3\n\n"\n34\nstring(20) "test1\ntest2\n\ntest3\n\n"\n44\nok\n
+token #169 PHP_STRING E_USER_ERROR
+token #170 PHP_TOKEN )
+token #171 PHP_SEMICOLON ;
+token #172 WHITESPACE \n
+token #173 PHP_VARIABLE $x
+token #174 WHITESPACE
+token #175 PHP_OPERATOR =
+token #176 WHITESPACE
+token #177 PHP_NOWDOC_TAG_START <<<'EOF'\n
+token #178 PHP_CONSTANT_ENCAPSED_STRING test1\ntest2\n\ntest3\n\n\n
+token #179 PHP_NOWDOC_TAG_END EOF
+token #180 PHP_SEMICOLON ;
+token #181 WHITESPACE \n
+token #182 PHP_STRING var_dump
+token #183 PHP_TOKEN (
+token #184 PHP_VARIABLE $x
+token #185 PHP_TOKEN )
+token #186 PHP_SEMICOLON ;
+token #187 WHITESPACE \n
+token #188 PHP_STRING trigger_error
+token #189 PHP_TOKEN (
+token #190 PHP_CONSTANT_ENCAPSED_STRING "line"
+token #191 PHP_TOKEN ,
+token #192 WHITESPACE
+token #193 PHP_STRING E_USER_ERROR
+token #194 PHP_TOKEN )
+token #195 PHP_SEMICOLON ;
+token #196 WHITESPACE \n
+token #197 PHP_ECHO echo
+token #198 WHITESPACE
+token #199 PHP_CONSTANT_ENCAPSED_STRING "ok\n"
+token #200 PHP_SEMICOLON ;
+token #201 WHITESPACE \n
+token #202 PHP_CLOSETAG ?>
+token #203 T_INLINE_HTML \n--EXPECT--\n6\nstring(0) ""\n10\nstring(0) ""\n14\nstring(4) "test"\n19\nstring(4) "test"\n24\nstring(20) "test1\ntest2\n\ntest3\n\n"\n34\nstring(20) "test1\ntest2\n\ntest3\n\n"\n44\nok\n
diff --git a/php/php.editor/test/unit/data/goldenfiles/org/netbeans/modules/php/editor/lexer/PHP73FeaturesTest/lexer/php73/heredoc_indent_spaces_01.pass b/php/php.editor/test/unit/data/goldenfiles/org/netbeans/modules/php/editor/lexer/PHP73FeaturesTest/lexer/php73/heredoc_indent_spaces_01.pass
new file mode 100644
index 000000000000..1a769b5fb52f
--- /dev/null
+++ b/php/php.editor/test/unit/data/goldenfiles/org/netbeans/modules/php/editor/lexer/PHP73FeaturesTest/lexer/php73/heredoc_indent_spaces_01.pass
@@ -0,0 +1,26 @@
+token #0 PHP_OPENTAG
+token #22 PHP_ENCAPSED_AND_WHITESPACE \nMy age is:
+token #23 PHP_VARIABLE $age
+token #24 PHP_CONSTANT_ENCAPSED_STRING
+token #25 PHP_CONSTANT_ENCAPSED_STRING \n
+token #26 PHP_HEREDOC_TAG_END HEREDOC
+token #27 PHP_SEMICOLON ;
+token #28 WHITESPACE \n
+token #29 PHP_VARIABLE $name
+token #30 PHP_OPERATOR =
+token #31 PHP_CONSTANT_ENCAPSED_STRING "Jun"
+token #32 PHP_SEMICOLON ;
+token #33 WHITESPACE \n\n
+token #34 PHP_LINE_COMMENT //
+token #35 PHP_LINE_COMMENT defferent indentation for body(spaces) ending marker(tabs)\n
+token #36 PHP_LINE_COMMENT //
+token #37 PHP_LINE_COMMENT allow this in the lexer but spaces and tabs MUST NOT be intermixed\n
+token #38 PHP_VARIABLE $x
+token #39 WHITESPACE
+token #40 PHP_OPERATOR =
+token #41 WHITESPACE
+token #42 PHP_HEREDOC_TAG_START <<
+token #58 PHP_STRING field
+token #59 PHP_CONSTANT_ENCAPSED_STRING \n
+token #60 PHP_HEREDOC_TAG_END \t\tENDOFHEREDOC
+token #61 PHP_SEMICOLON ;
+token #62 WHITESPACE \n\n
+token #63 PHP_LINE_COMMENT //
+token #64 PHP_LINE_COMMENT body(tabs) ending marker(spaces)\n
+token #65 PHP_VARIABLE $y
+token #66 WHITESPACE
+token #67 PHP_OPERATOR =
+token #68 WHITESPACE
+token #69 PHP_HEREDOC_TAG_START <<
+token #85 PHP_STRING field
+token #86 PHP_CONSTANT_ENCAPSED_STRING \n
+token #87 PHP_HEREDOC_TAG_END ENDOFHEREDOC
+token #88 PHP_SEMICOLON ;
+token #89 WHITESPACE \n
diff --git a/php/php.editor/test/unit/data/goldenfiles/org/netbeans/modules/php/editor/lexer/PHP73FeaturesTest/lexer/php73/heredoc_mixed_03.pass b/php/php.editor/test/unit/data/goldenfiles/org/netbeans/modules/php/editor/lexer/PHP73FeaturesTest/lexer/php73/heredoc_mixed_03.pass
new file mode 100644
index 000000000000..54676cfe9f10
--- /dev/null
+++ b/php/php.editor/test/unit/data/goldenfiles/org/netbeans/modules/php/editor/lexer/PHP73FeaturesTest/lexer/php73/heredoc_mixed_03.pass
@@ -0,0 +1,39 @@
+token #0 PHP_OPENTAG \nMy age is: $age
\n
+token #20 PHP_NOWDOC_TAG_END NOWDOC
+token #21 PHP_SEMICOLON ;
+token #22 WHITESPACE \n
+token #23 PHP_VARIABLE $name
+token #24 PHP_OPERATOR =
+token #25 PHP_CONSTANT_ENCAPSED_STRING "Jun"
+token #26 PHP_SEMICOLON ;
+token #27 WHITESPACE \n\n
+token #28 PHP_LINE_COMMENT //
+token #29 PHP_LINE_COMMENT defferent indentation for body(spaces) ending marker(tabs)\n
+token #30 PHP_LINE_COMMENT //
+token #31 PHP_LINE_COMMENT allow this in the lexer but spaces and tabs MUST NOT be intermixed\n
+token #32 PHP_VARIABLE $x
+token #33 WHITESPACE
+token #34 PHP_OPERATOR =
+token #35 WHITESPACE
+token #36 PHP_NOWDOC_TAG_START <<<'ENDOFNOWDOC'\n
+token #37 PHP_CONSTANT_ENCAPSED_STRING This is another nowdoc test.\n With another line in it. {$test} $test ${test} variable test.\n test. $object->field\n
+token #38 PHP_NOWDOC_TAG_END \t\tENDOFNOWDOC
+token #39 PHP_SEMICOLON ;
+token #40 WHITESPACE \n\n
+token #41 PHP_LINE_COMMENT //
+token #42 PHP_LINE_COMMENT body(tabs) ending marker(spaces)\n
+token #43 PHP_VARIABLE $y
+token #44 WHITESPACE
+token #45 PHP_OPERATOR =
+token #46 WHITESPACE
+token #47 PHP_NOWDOC_TAG_START <<<'ENDOFNOWDOC'\n
+token #48 PHP_CONSTANT_ENCAPSED_STRING \t\tThis is another nowdoc test.\n\t\tWith another line in it. {$test} $test ${test} variable test.\n\t\ttest. $object->field\n
+token #49 PHP_NOWDOC_TAG_END ENDOFNOWDOC
+token #50 PHP_SEMICOLON ;
+token #51 WHITESPACE \n
diff --git a/php/php.editor/test/unit/data/goldenfiles/org/netbeans/modules/php/editor/lexer/PHP73FeaturesTest/lexer/php73/nowdoc_mixed_03.pass b/php/php.editor/test/unit/data/goldenfiles/org/netbeans/modules/php/editor/lexer/PHP73FeaturesTest/lexer/php73/nowdoc_mixed_03.pass
new file mode 100644
index 000000000000..c1d137a42e52
--- /dev/null
+++ b/php/php.editor/test/unit/data/goldenfiles/org/netbeans/modules/php/editor/lexer/PHP73FeaturesTest/lexer/php73/nowdoc_mixed_03.pass
@@ -0,0 +1,23 @@
+token #0 PHP_OPENTAG
token #18 PHP_ENCAPSED_AND_WHITESPACE \nMy age is:
token #19 PHP_VARIABLE $age
token #20 PHP_CONSTANT_ENCAPSED_STRING
-token #21 PHP_HEREDOC_TAG_END \nHEREDOC
-token #22 PHP_SEMICOLON ;
-token #23 WHITESPACE \n
-token #24 PHP_VARIABLE $name
-token #25 PHP_OPERATOR =
-token #26 PHP_CONSTANT_ENCAPSED_STRING "Honza"
-token #27 PHP_SEMICOLON ;
-token #28 WHITESPACE \n\n
-token #29 PHP_VARIABLE $x
-token #30 WHITESPACE
-token #31 PHP_OPERATOR =
-token #32 WHITESPACE
-token #33 PHP_HEREDOC_TAG_START <<\n
+token #43 PHP_OPERATOR =
+token #44 WHITESPACE
+token #45 PHP_HEREDOC_TAG_START <<\n
diff --git a/php/php.editor/test/unit/data/goldenfiles/org/netbeans/modules/php/editor/lexer/PHPLexerTest/lexer/heredoc_02.pass b/php/php.editor/test/unit/data/goldenfiles/org/netbeans/modules/php/editor/lexer/PHPLexerTest/lexer/heredoc_02.pass
index a86a636535ac..53b4372a9152 100644
--- a/php/php.editor/test/unit/data/goldenfiles/org/netbeans/modules/php/editor/lexer/PHPLexerTest/lexer/heredoc_02.pass
+++ b/php/php.editor/test/unit/data/goldenfiles/org/netbeans/modules/php/editor/lexer/PHPLexerTest/lexer/heredoc_02.pass
@@ -5,8 +5,9 @@ token #3 WHITESPACE
token #4 PHP_HEREDOC_TAG_START <<
-token #11 T_INLINE_HTML \n
+token #7 PHP_CONSTANT_ENCAPSED_STRING \n
+token #8 PHP_HEREDOC_TAG_END ABC
+token #9 PHP_SEMICOLON ;
+token #10 WHITESPACE \n
+token #11 PHP_CLOSETAG ?>
+token #12 T_INLINE_HTML \n
diff --git a/php/php.editor/test/unit/data/goldenfiles/org/netbeans/modules/php/editor/lexer/PHPLexerTest/lexer/heredoc_03.pass b/php/php.editor/test/unit/data/goldenfiles/org/netbeans/modules/php/editor/lexer/PHPLexerTest/lexer/heredoc_03.pass
index 8237f26689e0..34f85c7ae610 100644
--- a/php/php.editor/test/unit/data/goldenfiles/org/netbeans/modules/php/editor/lexer/PHPLexerTest/lexer/heredoc_03.pass
+++ b/php/php.editor/test/unit/data/goldenfiles/org/netbeans/modules/php/editor/lexer/PHPLexerTest/lexer/heredoc_03.pass
@@ -5,11 +5,12 @@ token #3 WHITESPACE
token #4 PHP_HEREDOC_TAG_START <<\n
+token #7 PHP_CONSTANT_ENCAPSED_STRING \n
+token #8 PHP_HEREDOC_TAG_END HERE
+token #9 WHITESPACE \n
+token #10 PHP_TOKEN .
+token #11 WHITESPACE
+token #12 PHP_CONSTANT_ENCAPSED_STRING " where foo = bar"
+token #13 PHP_SEMICOLON ;
+token #14 WHITESPACE \n
+token #15 PHP_CLOSETAG ?>\n
diff --git a/php/php.editor/test/unit/data/goldenfiles/org/netbeans/modules/php/editor/lexer/PHPLexerTest/lexer/issue221484.pass b/php/php.editor/test/unit/data/goldenfiles/org/netbeans/modules/php/editor/lexer/PHPLexerTest/lexer/issue221484.pass
index cd16a2a4fc16..a5a129cf71f3 100644
--- a/php/php.editor/test/unit/data/goldenfiles/org/netbeans/modules/php/editor/lexer/PHPLexerTest/lexer/issue221484.pass
+++ b/php/php.editor/test/unit/data/goldenfiles/org/netbeans/modules/php/editor/lexer/PHPLexerTest/lexer/issue221484.pass
@@ -5,7 +5,8 @@ token #3 WHITESPACE
token #4 PHP_HEREDOC_TAG_START <<\n
+token #7 PHP_CONSTANT_ENCAPSED_STRING \n
+token #8 PHP_HEREDOC_TAG_END ABC
+token #9 PHP_SEMICOLON ;
+token #10 WHITESPACE \n\n
+token #11 PHP_CLOSETAG ?>\n
diff --git a/php/php.editor/test/unit/data/goldenfiles/org/netbeans/modules/php/editor/lexer/PHPLexerTest/lexer/issue222092_01.pass b/php/php.editor/test/unit/data/goldenfiles/org/netbeans/modules/php/editor/lexer/PHPLexerTest/lexer/issue222092_01.pass
index 11fe4ff8f96f..ad650d623ca6 100644
--- a/php/php.editor/test/unit/data/goldenfiles/org/netbeans/modules/php/editor/lexer/PHPLexerTest/lexer/issue222092_01.pass
+++ b/php/php.editor/test/unit/data/goldenfiles/org/netbeans/modules/php/editor/lexer/PHPLexerTest/lexer/issue222092_01.pass
@@ -6,7 +6,8 @@ token #4 PHP_OPERATOR =
token #5 WHITESPACE
token #6 PHP_HEREDOC_TAG_START <<\n
+token #8 PHP_CONSTANT_ENCAPSED_STRING \n
+token #9 PHP_HEREDOC_TAG_END EOD
+token #10 PHP_SEMICOLON ;
+token #11 WHITESPACE \n\n
+token #12 PHP_CLOSETAG ?>\n
diff --git a/php/php.editor/test/unit/data/goldenfiles/org/netbeans/modules/php/editor/lexer/PHPLexerTest/lexer/issue222092_02.pass b/php/php.editor/test/unit/data/goldenfiles/org/netbeans/modules/php/editor/lexer/PHPLexerTest/lexer/issue222092_02.pass
index 53562925d0ca..8077249fc8e8 100644
--- a/php/php.editor/test/unit/data/goldenfiles/org/netbeans/modules/php/editor/lexer/PHPLexerTest/lexer/issue222092_02.pass
+++ b/php/php.editor/test/unit/data/goldenfiles/org/netbeans/modules/php/editor/lexer/PHPLexerTest/lexer/issue222092_02.pass
@@ -6,7 +6,8 @@ token #4 PHP_OPERATOR =
token #5 WHITESPACE
token #6 PHP_HEREDOC_TAG_START <<\n
+token #8 PHP_CONSTANT_ENCAPSED_STRING \n
+token #9 PHP_HEREDOC_TAG_END EOD
+token #10 PHP_SEMICOLON ;
+token #11 WHITESPACE \n\n
+token #12 PHP_CLOSETAG ?>\n
diff --git a/php/php.editor/test/unit/data/goldenfiles/org/netbeans/modules/php/editor/parser/ASTPHP5ParserTest/parser/functionCallTrailingCommas_01.pass b/php/php.editor/test/unit/data/goldenfiles/org/netbeans/modules/php/editor/parser/ASTPHP5ParserTest/parser/php73/functionCallTrailingCommas_01.pass
similarity index 100%
rename from php/php.editor/test/unit/data/goldenfiles/org/netbeans/modules/php/editor/parser/ASTPHP5ParserTest/parser/functionCallTrailingCommas_01.pass
rename to php/php.editor/test/unit/data/goldenfiles/org/netbeans/modules/php/editor/parser/ASTPHP5ParserTest/parser/php73/functionCallTrailingCommas_01.pass
diff --git a/php/php.editor/test/unit/data/goldenfiles/org/netbeans/modules/php/editor/parser/ASTPHP5ParserTest/parser/php73/heredoc_indent_spaces_01.pass b/php/php.editor/test/unit/data/goldenfiles/org/netbeans/modules/php/editor/parser/ASTPHP5ParserTest/parser/php73/heredoc_indent_spaces_01.pass
new file mode 100644
index 000000000000..3e1b3428bdec
--- /dev/null
+++ b/php/php.editor/test/unit/data/goldenfiles/org/netbeans/modules/php/editor/parser/ASTPHP5ParserTest/parser/php73/heredoc_indent_spaces_01.pass
@@ -0,0 +1,73 @@
+
+
+
+ class
+
+
+ Foo
+
+
+ {
+
+
+ public
+
+
+ $test
+
+
+ =
+
+
+ <<< HEREDOC\n
+
+
+ spaces indentation\n
+
+
+ HEREDOC
+
+
+ ;
+
+
+ }
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/php/php.editor/test/unit/data/goldenfiles/org/netbeans/modules/php/editor/parser/ASTPHP5ParserTest/parser/php73/heredoc_indent_spaces_02.pass b/php/php.editor/test/unit/data/goldenfiles/org/netbeans/modules/php/editor/parser/ASTPHP5ParserTest/parser/php73/heredoc_indent_spaces_02.pass
new file mode 100644
index 000000000000..e3bfece96281
--- /dev/null
+++ b/php/php.editor/test/unit/data/goldenfiles/org/netbeans/modules/php/editor/parser/ASTPHP5ParserTest/parser/php73/heredoc_indent_spaces_02.pass
@@ -0,0 +1,69 @@
+
+
+
+ class
+
+
+ Foo
+
+
+ {
+
+
+ public
+
+
+ $test
+
+
+ =
+
+
+ <<< HEREDOC\n
+
+
+ HEREDOC
+
+
+ ;
+
+
+ }
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/php/php.editor/test/unit/data/goldenfiles/org/netbeans/modules/php/editor/parser/ASTPHP5ParserTest/parser/php73/heredoc_indent_spaces_03.pass b/php/php.editor/test/unit/data/goldenfiles/org/netbeans/modules/php/editor/parser/ASTPHP5ParserTest/parser/php73/heredoc_indent_spaces_03.pass
new file mode 100644
index 000000000000..955345aef2ce
--- /dev/null
+++ b/php/php.editor/test/unit/data/goldenfiles/org/netbeans/modules/php/editor/parser/ASTPHP5ParserTest/parser/php73/heredoc_indent_spaces_03.pass
@@ -0,0 +1,68 @@
+
+
+
+ $array
+
+
+ =
+
+
+ [
+
+
+ <<< HEREDOC\n
+
+
+ HEREDOC
+
+
+ ,
+
+
+ 'qux'
+
+
+ ]
+
+
+ ;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/php/php.editor/test/unit/data/goldenfiles/org/netbeans/modules/php/editor/parser/ASTPHP5ParserTest/parser/php73/heredoc_indent_spaces_04.pass b/php/php.editor/test/unit/data/goldenfiles/org/netbeans/modules/php/editor/parser/ASTPHP5ParserTest/parser/php73/heredoc_indent_spaces_04.pass
new file mode 100644
index 000000000000..e9a6457d3c8c
--- /dev/null
+++ b/php/php.editor/test/unit/data/goldenfiles/org/netbeans/modules/php/editor/parser/ASTPHP5ParserTest/parser/php73/heredoc_indent_spaces_04.pass
@@ -0,0 +1,68 @@
+
+
+
+ $array
+
+
+ =
+
+
+ [
+
+
+ <<< HEREDOC\n
+
+
+ HEREDOC
+
+
+ ,
+
+
+ 'qux'
+
+
+ ]
+
+
+ ;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/php/php.editor/test/unit/data/goldenfiles/org/netbeans/modules/php/editor/parser/ASTPHP5ParserTest/parser/php73/heredoc_indent_tabs_01.pass b/php/php.editor/test/unit/data/goldenfiles/org/netbeans/modules/php/editor/parser/ASTPHP5ParserTest/parser/php73/heredoc_indent_tabs_01.pass
new file mode 100644
index 000000000000..7d6d77b26a4a
--- /dev/null
+++ b/php/php.editor/test/unit/data/goldenfiles/org/netbeans/modules/php/editor/parser/ASTPHP5ParserTest/parser/php73/heredoc_indent_tabs_01.pass
@@ -0,0 +1,73 @@
+
+
+
+ class
+
+
+ Foo
+
+
+ {
+
+
+ public
+
+
+ $test
+
+
+ =
+
+
+ <<< HEREDOC\n
+
+
+ \ttab indentation\n\t
+
+
+ HEREDOC
+
+
+ ;
+
+
+ }
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/php/php.editor/test/unit/data/goldenfiles/org/netbeans/modules/php/editor/parser/ASTPHP5ParserTest/parser/php73/heredoc_indent_tabs_02.pass b/php/php.editor/test/unit/data/goldenfiles/org/netbeans/modules/php/editor/parser/ASTPHP5ParserTest/parser/php73/heredoc_indent_tabs_02.pass
new file mode 100644
index 000000000000..2ab20f9105ea
--- /dev/null
+++ b/php/php.editor/test/unit/data/goldenfiles/org/netbeans/modules/php/editor/parser/ASTPHP5ParserTest/parser/php73/heredoc_indent_tabs_02.pass
@@ -0,0 +1,69 @@
+
+
+
+ class
+
+
+ Foo
+
+
+ {
+
+
+ public
+
+
+ $test
+
+
+ =
+
+
+ <<< HEREDOC\n
+
+
+ HEREDOC
+
+
+ ;
+
+
+ }
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/php/php.editor/test/unit/data/goldenfiles/org/netbeans/modules/php/editor/parser/ASTPHP5ParserTest/parser/php73/heredoc_indent_tabs_03.pass b/php/php.editor/test/unit/data/goldenfiles/org/netbeans/modules/php/editor/parser/ASTPHP5ParserTest/parser/php73/heredoc_indent_tabs_03.pass
new file mode 100644
index 000000000000..13330222827a
--- /dev/null
+++ b/php/php.editor/test/unit/data/goldenfiles/org/netbeans/modules/php/editor/parser/ASTPHP5ParserTest/parser/php73/heredoc_indent_tabs_03.pass
@@ -0,0 +1,68 @@
+
+
+
+ $array
+
+
+ =
+
+
+ [
+
+
+ <<< HEREDOC\n
+
+
+ HEREDOC
+
+
+ ,
+
+
+ 'qux'
+
+
+ ]
+
+
+ ;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/php/php.editor/test/unit/data/goldenfiles/org/netbeans/modules/php/editor/parser/ASTPHP5ParserTest/parser/php73/heredoc_mixed_01.pass b/php/php.editor/test/unit/data/goldenfiles/org/netbeans/modules/php/editor/parser/ASTPHP5ParserTest/parser/php73/heredoc_mixed_01.pass
new file mode 100644
index 000000000000..57a06bae5b9f
--- /dev/null
+++ b/php/php.editor/test/unit/data/goldenfiles/org/netbeans/modules/php/editor/parser/ASTPHP5ParserTest/parser/php73/heredoc_mixed_01.pass
@@ -0,0 +1,319 @@
+
+
+
+ $array
+
+
+ =
+
+
+ [
+
+
+ <<< END\n
+
+
+ spaces\n\ttabs\nnospaces\n \tspaces tabs\n\t\t tabs spaces\n
+
+
+ END
+
+
+ ,
+
+
+ $test
+
+
+ ]
+
+
+ ;
+
+
+ $array2
+
+
+ =
+
+
+ [
+
+
+ <<< END\n
+
+
+ spaces\n\ttabs\n \tspaces tabs\n\t\t tabs spaces\n
+
+
+ END
+
+
+ ,
+
+
+ $test
+
+
+ [
+
+
+ 0
+
+
+ ]
+
+
+ ]
+
+
+ ;
+
+
+ $array3
+
+
+ =
+
+
+ [
+
+
+ <<< END\n
+
+
+
+
+
+ $test
+
+
+ \n spaces
+
+
+ $test
+
+
+ \n\ttabs
+
+
+ {
+
+
+ $test
+
+
+ }
+
+
+ \n spaces tabs
+
+
+ ${
+
+
+ test
+
+
+ }
+
+
+ \n
+
+
+ $test
+
+
+ \n\t\t tabs spaces\nnospaces test\n
+
+
+ END
+
+
+ ,
+
+
+ $
+
+
+ {
+
+
+ test
+
+
+ }
+
+
+ ]
+
+
+ ;
+
+
+ $test
+
+
+ =
+
+
+ <<< END\n
+
+
+ \t spaces tabs spaces\n \t
+
+
+ END
+
+
+ ;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/php/php.editor/test/unit/data/goldenfiles/org/netbeans/modules/php/editor/parser/ASTPHP5ParserTest/parser/php73/heredoc_mixed_02.pass b/php/php.editor/test/unit/data/goldenfiles/org/netbeans/modules/php/editor/parser/ASTPHP5ParserTest/parser/php73/heredoc_mixed_02.pass
new file mode 100644
index 000000000000..913b02a1f082
--- /dev/null
+++ b/php/php.editor/test/unit/data/goldenfiles/org/netbeans/modules/php/editor/parser/ASTPHP5ParserTest/parser/php73/heredoc_mixed_02.pass
@@ -0,0 +1,317 @@
+
+
+
+ $name
+
+
+ =
+
+
+ "Junichi"
+
+
+ ;
+
+
+ $age
+
+
+ =
+
+
+ 100
+
+
+ ;
+
+
+ echo
+
+
+ <<<HEREDOC\n
+
+
+ Name:
+
+
+ $name
+
+
+ <br>\nMy age is:
+
+
+ $age
+
+
+ <br>\n
+
+
+ HEREDOC
+
+
+ ;
+
+
+ $name
+
+
+ =
+
+
+ "Jun"
+
+
+ ;
+
+
+ $x
+
+
+ =
+
+
+ <<<ENDOFHEREDOC\n
+
+
+ This is another heredoc test.\n With another line in it.
+
+
+ {
+
+
+ $test
+
+
+ }
+
+
+
+
+
+ $test
+
+
+
+
+
+ ${
+
+
+ test
+
+
+ }
+
+
+ variable test.\n test.
+
+
+ $object
+
+
+ ->
+
+
+ field
+
+
+ \n\t\t
+
+
+ ENDOFHEREDOC
+
+
+ ;
+
+
+ $y
+
+
+ =
+
+
+ <<<ENDOFHEREDOC\n
+
+
+ \t\tThis is another heredoc test.\n\t\tWith another line in it.
+
+
+ {
+
+
+ $test
+
+
+ }
+
+
+
+
+
+ $test
+
+
+
+
+
+ ${
+
+
+ test
+
+
+ }
+
+
+ variable test.\n\t\ttest.
+
+
+ $object
+
+
+ ->
+
+
+ field
+
+
+ \n
+
+
+ ENDOFHEREDOC
+
+
+ ;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/php/php.editor/test/unit/data/goldenfiles/org/netbeans/modules/php/editor/parser/ASTPHP5ParserTest/parser/php73/heredoc_mixed_03.pass b/php/php.editor/test/unit/data/goldenfiles/org/netbeans/modules/php/editor/parser/ASTPHP5ParserTest/parser/php73/heredoc_mixed_03.pass
new file mode 100644
index 000000000000..6e1e372a5d13
--- /dev/null
+++ b/php/php.editor/test/unit/data/goldenfiles/org/netbeans/modules/php/editor/parser/ASTPHP5ParserTest/parser/php73/heredoc_mixed_03.pass
@@ -0,0 +1,149 @@
+
+
+
+ $array
+
+
+ =
+
+
+ [
+
+
+ <<< END\n
+
+
+
+
+
+ $test
+
+
+ \n spaces
+
+
+ $test
+
+
+ \n\ttabs
+
+
+ {
+
+
+ $test
+
+
+ }
+
+
+ \n spaces tabs
+
+
+ ${
+
+
+ test
+
+
+ }
+
+
+ \n
+
+
+ $test
+
+
+ \n\t\t tabs spaces\nnospaces test\n
+
+
+ END
+
+
+ ,
+
+
+ $
+
+
+ {
+
+
+ test
+
+
+ }
+
+
+ ]
+
+
+ ;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/php/php.editor/test/unit/data/goldenfiles/org/netbeans/modules/php/editor/parser/ASTPHP5ParserTest/parser/php73/heredoc_new_line_01.pass b/php/php.editor/test/unit/data/goldenfiles/org/netbeans/modules/php/editor/parser/ASTPHP5ParserTest/parser/php73/heredoc_new_line_01.pass
new file mode 100644
index 000000000000..c77830a612bc
--- /dev/null
+++ b/php/php.editor/test/unit/data/goldenfiles/org/netbeans/modules/php/editor/parser/ASTPHP5ParserTest/parser/php73/heredoc_new_line_01.pass
@@ -0,0 +1,109 @@
+
+
+
+ test
+
+
+ (
+
+
+ <<< HEREDOC\n
+
+
+ foo\n bar\nqux\n
+
+
+ HEREDOC
+
+
+ )
+
+
+ ;
+
+
+ $array
+
+
+ =
+
+
+ [
+
+
+ <<< END\n
+
+
+ foo\nbar\nbaz\n
+
+
+ END
+
+
+ ,
+
+
+ 'qux'
+
+
+ ]
+
+
+ ;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/php/php.editor/test/unit/data/goldenfiles/org/netbeans/modules/php/editor/parser/ASTPHP5ParserTest/parser/php73/heredoc_new_line_02.pass b/php/php.editor/test/unit/data/goldenfiles/org/netbeans/modules/php/editor/parser/ASTPHP5ParserTest/parser/php73/heredoc_new_line_02.pass
new file mode 100644
index 000000000000..6f2cfc64c36a
--- /dev/null
+++ b/php/php.editor/test/unit/data/goldenfiles/org/netbeans/modules/php/editor/parser/ASTPHP5ParserTest/parser/php73/heredoc_new_line_02.pass
@@ -0,0 +1,72 @@
+
+
+
+ $array
+
+
+ =
+
+
+ [
+
+
+ <<< END\n
+
+
+ foo\nbar\nENDING\n
+
+
+ END
+
+
+ ,
+
+
+ 'qux'
+
+
+ ]
+
+
+ ;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/php/php.editor/test/unit/data/goldenfiles/org/netbeans/modules/php/editor/parser/ASTPHP5ParserTest/parser/php73/heredoc_new_line_03.pass b/php/php.editor/test/unit/data/goldenfiles/org/netbeans/modules/php/editor/parser/ASTPHP5ParserTest/parser/php73/heredoc_new_line_03.pass
new file mode 100644
index 000000000000..10c07890e3d4
--- /dev/null
+++ b/php/php.editor/test/unit/data/goldenfiles/org/netbeans/modules/php/editor/parser/ASTPHP5ParserTest/parser/php73/heredoc_new_line_03.pass
@@ -0,0 +1,72 @@
+
+
+
+ $array
+
+
+ =
+
+
+ [
+
+
+ <<< END\n
+
+
+ foo END\n bar\n ENDING\n
+
+
+ END
+
+
+ ,
+
+
+ 'qux'
+
+
+ ]
+
+
+ ;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/php/php.editor/test/unit/data/goldenfiles/org/netbeans/modules/php/editor/parser/ASTPHP5ParserTest/parser/php73/heredoc_new_line_04.pass b/php/php.editor/test/unit/data/goldenfiles/org/netbeans/modules/php/editor/parser/ASTPHP5ParserTest/parser/php73/heredoc_new_line_04.pass
new file mode 100644
index 000000000000..fec91b2a5241
--- /dev/null
+++ b/php/php.editor/test/unit/data/goldenfiles/org/netbeans/modules/php/editor/parser/ASTPHP5ParserTest/parser/php73/heredoc_new_line_04.pass
@@ -0,0 +1,82 @@
+
+
+
+ $array
+
+
+ =
+
+
+ [
+
+
+ <<< END\n
+
+
+ foo END\n
+
+
+ $test
+
+
+ bar\n ENDING\n
+
+
+ END
+
+
+ ,
+
+
+ 'qux'
+
+
+ ]
+
+
+ ;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/php/php.editor/test/unit/data/goldenfiles/org/netbeans/modules/php/editor/parser/ASTPHP5ParserTest/parser/listReferenceAssignment_01.pass b/php/php.editor/test/unit/data/goldenfiles/org/netbeans/modules/php/editor/parser/ASTPHP5ParserTest/parser/php73/listReferenceAssignment_01.pass
similarity index 100%
rename from php/php.editor/test/unit/data/goldenfiles/org/netbeans/modules/php/editor/parser/ASTPHP5ParserTest/parser/listReferenceAssignment_01.pass
rename to php/php.editor/test/unit/data/goldenfiles/org/netbeans/modules/php/editor/parser/ASTPHP5ParserTest/parser/php73/listReferenceAssignment_01.pass
diff --git a/php/php.editor/test/unit/data/goldenfiles/org/netbeans/modules/php/editor/parser/ASTPHP5ParserTest/parser/php73/nowdoc_indent_spaces_01.pass b/php/php.editor/test/unit/data/goldenfiles/org/netbeans/modules/php/editor/parser/ASTPHP5ParserTest/parser/php73/nowdoc_indent_spaces_01.pass
new file mode 100644
index 000000000000..29aa83e0aafb
--- /dev/null
+++ b/php/php.editor/test/unit/data/goldenfiles/org/netbeans/modules/php/editor/parser/ASTPHP5ParserTest/parser/php73/nowdoc_indent_spaces_01.pass
@@ -0,0 +1,69 @@
+
+
+
+ class
+
+
+ Foo
+
+
+ {
+
+
+ public
+
+
+ $test
+
+
+ =
+
+
+ <<< 'NOWDOC'\n
+
+
+ spaces indentation\n
+
+
+ NOWDOC
+
+
+ ;
+
+
+ }
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/php/php.editor/test/unit/data/goldenfiles/org/netbeans/modules/php/editor/parser/ASTPHP5ParserTest/parser/php73/nowdoc_indent_spaces_02.pass b/php/php.editor/test/unit/data/goldenfiles/org/netbeans/modules/php/editor/parser/ASTPHP5ParserTest/parser/php73/nowdoc_indent_spaces_02.pass
new file mode 100644
index 000000000000..e817ad9f20d8
--- /dev/null
+++ b/php/php.editor/test/unit/data/goldenfiles/org/netbeans/modules/php/editor/parser/ASTPHP5ParserTest/parser/php73/nowdoc_indent_spaces_02.pass
@@ -0,0 +1,66 @@
+
+
+
+ class
+
+
+ Foo
+
+
+ {
+
+
+ public
+
+
+ $test
+
+
+ =
+
+
+ <<< 'NOWDOC'\n
+
+
+ NOWDOC
+
+
+ ;
+
+
+ }
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/php/php.editor/test/unit/data/goldenfiles/org/netbeans/modules/php/editor/parser/ASTPHP5ParserTest/parser/php73/nowdoc_indent_spaces_03.pass b/php/php.editor/test/unit/data/goldenfiles/org/netbeans/modules/php/editor/parser/ASTPHP5ParserTest/parser/php73/nowdoc_indent_spaces_03.pass
new file mode 100644
index 000000000000..c737e957d79c
--- /dev/null
+++ b/php/php.editor/test/unit/data/goldenfiles/org/netbeans/modules/php/editor/parser/ASTPHP5ParserTest/parser/php73/nowdoc_indent_spaces_03.pass
@@ -0,0 +1,65 @@
+
+
+
+ $array
+
+
+ =
+
+
+ [
+
+
+ <<< 'NOWDOC'\n
+
+
+ NOWDOC
+
+
+ ,
+
+
+ 'qux'
+
+
+ ]
+
+
+ ;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/php/php.editor/test/unit/data/goldenfiles/org/netbeans/modules/php/editor/parser/ASTPHP5ParserTest/parser/php73/nowdoc_indent_spaces_04.pass b/php/php.editor/test/unit/data/goldenfiles/org/netbeans/modules/php/editor/parser/ASTPHP5ParserTest/parser/php73/nowdoc_indent_spaces_04.pass
new file mode 100644
index 000000000000..ade3ba72e5aa
--- /dev/null
+++ b/php/php.editor/test/unit/data/goldenfiles/org/netbeans/modules/php/editor/parser/ASTPHP5ParserTest/parser/php73/nowdoc_indent_spaces_04.pass
@@ -0,0 +1,65 @@
+
+
+
+ $array
+
+
+ =
+
+
+ [
+
+
+ <<< 'NOWDOC'\n
+
+
+ NOWDOC
+
+
+ ,
+
+
+ 'qux'
+
+
+ ]
+
+
+ ;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/php/php.editor/test/unit/data/goldenfiles/org/netbeans/modules/php/editor/parser/ASTPHP5ParserTest/parser/php73/nowdoc_indent_tabs_01.pass b/php/php.editor/test/unit/data/goldenfiles/org/netbeans/modules/php/editor/parser/ASTPHP5ParserTest/parser/php73/nowdoc_indent_tabs_01.pass
new file mode 100644
index 000000000000..0d533e46afa4
--- /dev/null
+++ b/php/php.editor/test/unit/data/goldenfiles/org/netbeans/modules/php/editor/parser/ASTPHP5ParserTest/parser/php73/nowdoc_indent_tabs_01.pass
@@ -0,0 +1,69 @@
+
+
+
+ class
+
+
+ Foo
+
+
+ {
+
+
+ public
+
+
+ $test
+
+
+ =
+
+
+ <<< 'NOWDOC'\n
+
+
+ \ttab indentation\n
+
+
+ \tNOWDOC
+
+
+ ;
+
+
+ }
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/php/php.editor/test/unit/data/goldenfiles/org/netbeans/modules/php/editor/parser/ASTPHP5ParserTest/parser/php73/nowdoc_indent_tabs_02.pass b/php/php.editor/test/unit/data/goldenfiles/org/netbeans/modules/php/editor/parser/ASTPHP5ParserTest/parser/php73/nowdoc_indent_tabs_02.pass
new file mode 100644
index 000000000000..1d38aa040ea8
--- /dev/null
+++ b/php/php.editor/test/unit/data/goldenfiles/org/netbeans/modules/php/editor/parser/ASTPHP5ParserTest/parser/php73/nowdoc_indent_tabs_02.pass
@@ -0,0 +1,66 @@
+
+
+
+ class
+
+
+ Foo
+
+
+ {
+
+
+ public
+
+
+ $test
+
+
+ =
+
+
+ <<< 'NOWDOC'\n
+
+
+ \tNOWDOC
+
+
+ ;
+
+
+ }
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/php/php.editor/test/unit/data/goldenfiles/org/netbeans/modules/php/editor/parser/ASTPHP5ParserTest/parser/php73/nowdoc_indent_tabs_03.pass b/php/php.editor/test/unit/data/goldenfiles/org/netbeans/modules/php/editor/parser/ASTPHP5ParserTest/parser/php73/nowdoc_indent_tabs_03.pass
new file mode 100644
index 000000000000..a1160e0637d3
--- /dev/null
+++ b/php/php.editor/test/unit/data/goldenfiles/org/netbeans/modules/php/editor/parser/ASTPHP5ParserTest/parser/php73/nowdoc_indent_tabs_03.pass
@@ -0,0 +1,65 @@
+
+
+
+ $array
+
+
+ =
+
+
+ [
+
+
+ <<< 'NOWDOC'\n
+
+
+ \tNOWDOC
+
+
+ ,
+
+
+ 'qux'
+
+
+ ]
+
+
+ ;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/php/php.editor/test/unit/data/goldenfiles/org/netbeans/modules/php/editor/parser/ASTPHP5ParserTest/parser/php73/nowdoc_mixed_01.pass b/php/php.editor/test/unit/data/goldenfiles/org/netbeans/modules/php/editor/parser/ASTPHP5ParserTest/parser/php73/nowdoc_mixed_01.pass
new file mode 100644
index 000000000000..0fae0d3f8b49
--- /dev/null
+++ b/php/php.editor/test/unit/data/goldenfiles/org/netbeans/modules/php/editor/parser/ASTPHP5ParserTest/parser/php73/nowdoc_mixed_01.pass
@@ -0,0 +1,239 @@
+
+
+
+ $array
+
+
+ =
+
+
+ [
+
+
+ <<< 'END'\n
+
+
+ spaces\n\ttabs\nnospaces\n \tspaces tabs\n\t\t tabs spaces\n
+
+
+ END
+
+
+ ,
+
+
+ $test
+
+
+ ]
+
+
+ ;
+
+
+ $array2
+
+
+ =
+
+
+ [
+
+
+ <<< 'END'\n
+
+
+ spaces\n\ttabs\n \tspaces tabs\n\t\t tabs spaces\n
+
+
+ END
+
+
+ ,
+
+
+ $test
+
+
+ [
+
+
+ 0
+
+
+ ]
+
+
+ ]
+
+
+ ;
+
+
+ $array3
+
+
+ =
+
+
+ [
+
+
+ <<< 'END'\n
+
+
+ $test\n spaces $test\n\ttabs {$test}\n spaces tabs ${test}\n$test\n\t\t tabs spaces\nnospaces test\n
+
+
+ END
+
+
+ ,
+
+
+ $
+
+
+ {
+
+
+ test
+
+
+ }
+
+
+ ]
+
+
+ ;
+
+
+ $test
+
+
+ =
+
+
+ <<< 'END'\n
+
+
+ \t spaces tabs spaces\n
+
+
+ \tEND
+
+
+ ;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/php/php.editor/test/unit/data/goldenfiles/org/netbeans/modules/php/editor/parser/ASTPHP5ParserTest/parser/php73/nowdoc_mixed_02.pass b/php/php.editor/test/unit/data/goldenfiles/org/netbeans/modules/php/editor/parser/ASTPHP5ParserTest/parser/php73/nowdoc_mixed_02.pass
new file mode 100644
index 000000000000..489b3f13ddae
--- /dev/null
+++ b/php/php.editor/test/unit/data/goldenfiles/org/netbeans/modules/php/editor/parser/ASTPHP5ParserTest/parser/php73/nowdoc_mixed_02.pass
@@ -0,0 +1,151 @@
+
+
+
+ $name
+
+
+ =
+
+
+ "Junichi"
+
+
+ ;
+
+
+ $age
+
+
+ =
+
+
+ 100
+
+
+ ;
+
+
+ echo
+
+
+ <<<'NOWDOC'\n
+
+
+ Name: $name<br>\nMy age is: $age<br>\n
+
+
+ NOWDOC
+
+
+ ;
+
+
+ $name
+
+
+ =
+
+
+ "Jun"
+
+
+ ;
+
+
+ $x
+
+
+ =
+
+
+ <<<'ENDOFNOWDOC'\n
+
+
+ This is another nowdoc test.\n With another line in it. {$test} $test ${test} variable test.\n test. $object->field\n
+
+
+ \t\tENDOFNOWDOC
+
+
+ ;
+
+
+ $y
+
+
+ =
+
+
+ <<<'ENDOFNOWDOC'\n
+
+
+ \t\tThis is another nowdoc test.\n\t\tWith another line in it. {$test} $test ${test} variable test.\n\t\ttest. $object->field\n
+
+
+ ENDOFNOWDOC
+
+
+ ;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/php/php.editor/test/unit/data/goldenfiles/org/netbeans/modules/php/editor/parser/ASTPHP5ParserTest/parser/php73/nowdoc_mixed_03.pass b/php/php.editor/test/unit/data/goldenfiles/org/netbeans/modules/php/editor/parser/ASTPHP5ParserTest/parser/php73/nowdoc_mixed_03.pass
new file mode 100644
index 000000000000..578fb2b5d43d
--- /dev/null
+++ b/php/php.editor/test/unit/data/goldenfiles/org/netbeans/modules/php/editor/parser/ASTPHP5ParserTest/parser/php73/nowdoc_mixed_03.pass
@@ -0,0 +1,81 @@
+
+
+
+ $array
+
+
+ =
+
+
+ [
+
+
+ <<< 'END'\n
+
+
+ $test\n spaces $test\n\ttabs {$test}\n spaces tabs ${test}\n$test\n\t\t tabs spaces\nnospaces test\n
+
+
+ END
+
+
+ ,
+
+
+ $
+
+
+ {
+
+
+ test
+
+
+ }
+
+
+ ]
+
+
+ ;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/php/php.editor/test/unit/data/goldenfiles/org/netbeans/modules/php/editor/parser/ASTPHP5ParserTest/parser/php73/nowdoc_new_line_01.pass b/php/php.editor/test/unit/data/goldenfiles/org/netbeans/modules/php/editor/parser/ASTPHP5ParserTest/parser/php73/nowdoc_new_line_01.pass
new file mode 100644
index 000000000000..4b40d141af27
--- /dev/null
+++ b/php/php.editor/test/unit/data/goldenfiles/org/netbeans/modules/php/editor/parser/ASTPHP5ParserTest/parser/php73/nowdoc_new_line_01.pass
@@ -0,0 +1,101 @@
+
+
+
+ test
+
+
+ (
+
+
+ <<< 'NOWDOC'\n
+
+
+ foo\n bar\nqux\n
+
+
+ NOWDOC
+
+
+ )
+
+
+ ;
+
+
+ $array
+
+
+ =
+
+
+ [
+
+
+ <<< 'END'\n
+
+
+ foo\nbar\nbaz\n
+
+
+ END
+
+
+ ,
+
+
+ 'qux'
+
+
+ ]
+
+
+ ;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/php/php.editor/test/unit/data/goldenfiles/org/netbeans/modules/php/editor/parser/ASTPHP5ParserTest/parser/php73/nowdoc_new_line_02.pass b/php/php.editor/test/unit/data/goldenfiles/org/netbeans/modules/php/editor/parser/ASTPHP5ParserTest/parser/php73/nowdoc_new_line_02.pass
new file mode 100644
index 000000000000..7b96f772cc2d
--- /dev/null
+++ b/php/php.editor/test/unit/data/goldenfiles/org/netbeans/modules/php/editor/parser/ASTPHP5ParserTest/parser/php73/nowdoc_new_line_02.pass
@@ -0,0 +1,68 @@
+
+
+
+ $array
+
+
+ =
+
+
+ [
+
+
+ <<< 'END'\n
+
+
+ foo\nbar\nENDING\n
+
+
+ END
+
+
+ ,
+
+
+ 'qux'
+
+
+ ]
+
+
+ ;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/php/php.editor/test/unit/data/goldenfiles/org/netbeans/modules/php/editor/parser/ASTPHP5ParserTest/parser/php73/nowdoc_new_line_03.pass b/php/php.editor/test/unit/data/goldenfiles/org/netbeans/modules/php/editor/parser/ASTPHP5ParserTest/parser/php73/nowdoc_new_line_03.pass
new file mode 100644
index 000000000000..a64601897e74
--- /dev/null
+++ b/php/php.editor/test/unit/data/goldenfiles/org/netbeans/modules/php/editor/parser/ASTPHP5ParserTest/parser/php73/nowdoc_new_line_03.pass
@@ -0,0 +1,68 @@
+
+
+
+ $array
+
+
+ =
+
+
+ [
+
+
+ <<< 'END'\n
+
+
+ foo END\n bar\n ENDING\n
+
+
+ END
+
+
+ ,
+
+
+ 'qux'
+
+
+ ]
+
+
+ ;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/php/php.editor/test/unit/data/goldenfiles/org/netbeans/modules/php/editor/parser/ASTPHP5ParserTest/parser/php73/nowdoc_new_line_04.pass b/php/php.editor/test/unit/data/goldenfiles/org/netbeans/modules/php/editor/parser/ASTPHP5ParserTest/parser/php73/nowdoc_new_line_04.pass
new file mode 100644
index 000000000000..2d5198d630b9
--- /dev/null
+++ b/php/php.editor/test/unit/data/goldenfiles/org/netbeans/modules/php/editor/parser/ASTPHP5ParserTest/parser/php73/nowdoc_new_line_04.pass
@@ -0,0 +1,68 @@
+
+
+
+ $array
+
+
+ =
+
+
+ [
+
+
+ <<< 'END'\n
+
+
+ foo END\n $test bar\n ENDING\n
+
+
+ END
+
+
+ ,
+
+
+ 'qux'
+
+
+ ]
+
+
+ ;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/php/php.editor/test/unit/data/testfiles/formatting/flexibleHeredoc_01.php b/php/php.editor/test/unit/data/testfiles/formatting/flexibleHeredoc_01.php
new file mode 100644
index 000000000000..fcdc5331bfca
--- /dev/null
+++ b/php/php.editor/test/unit/data/testfiles/formatting/flexibleHeredoc_01.php
@@ -0,0 +1,49 @@
+
+My age is: $age
+HEREDOC;
+$name="Jun";
+
+// defferent indentation for body(spaces) ending marker(tabs)
+// allow this in the lexer but spaces and tabs MUST NOT be intermixed
+$x = <<field
+ ENDOFHEREDOC;
+
+// body(tabs) ending marker(spaces)
+$y = <<field
+ ENDOFHEREDOC;
diff --git a/php/php.editor/test/unit/data/testfiles/lexer/php73/heredoc_mixed_03.php b/php/php.editor/test/unit/data/testfiles/lexer/php73/heredoc_mixed_03.php
new file mode 100644
index 000000000000..21eb41e7bcad
--- /dev/null
+++ b/php/php.editor/test/unit/data/testfiles/lexer/php73/heredoc_mixed_03.php
@@ -0,0 +1,29 @@
+
+My age is: $age
+NOWDOC;
+$name="Jun";
+
+// defferent indentation for body(spaces) ending marker(tabs)
+// allow this in the lexer but spaces and tabs MUST NOT be intermixed
+$x = <<<'ENDOFNOWDOC'
+ This is another nowdoc test.
+ With another line in it. {$test} $test ${test} variable test.
+ test. $object->field
+ ENDOFNOWDOC;
+
+// body(tabs) ending marker(spaces)
+$y = <<<'ENDOFNOWDOC'
+ This is another nowdoc test.
+ With another line in it. {$test} $test ${test} variable test.
+ test. $object->field
+ ENDOFNOWDOC;
diff --git a/php/php.editor/test/unit/data/testfiles/lexer/php73/nowdoc_mixed_03.php b/php/php.editor/test/unit/data/testfiles/lexer/php73/nowdoc_mixed_03.php
new file mode 100644
index 000000000000..2c60e758c89a
--- /dev/null
+++ b/php/php.editor/test/unit/data/testfiles/lexer/php73/nowdoc_mixed_03.php
@@ -0,0 +1,29 @@
+
---EXPECTF--
-Notice: Undefined variable: ENDOFHEREDOC in %s on line %d
-ENDOFHEREDOC ;
- ENDOFHEREDOC;
-ENDOFHEREDOC
- ENDOFHEREDOC
-;
-
-Notice: Undefined variable: ENDOFHEREDOC in %s on line %d
-ENDOFHEREDOC ;
- ENDOFHEREDOC;
-ENDOFHEREDOC
- ENDOFHEREDOC
-;
diff --git a/php/php.editor/test/unit/data/testfiles/parser/heredoc_010.php b/php/php.editor/test/unit/data/testfiles/parser/heredoc_010.php
deleted file mode 100644
index 5aa0433bcff7..000000000000
--- a/php/php.editor/test/unit/data/testfiles/parser/heredoc_010.php
+++ /dev/null
@@ -1,32 +0,0 @@
---TEST--
-Torture the T_END_HEREDOC rules with variable expansions (heredoc)
---FILE--
-
---EXPECT--
-ENDOFHEREDOC
-ENDOFHEREDOC
-ENDOFHEREDOC
-ENDOFHEREDOC
-ENDOFHEREDOC
-ENDOFHEREDOC
diff --git a/php/php.editor/test/unit/data/testfiles/parser/nowdoc_009.php b/php/php.editor/test/unit/data/testfiles/parser/nowdoc_009.php
deleted file mode 100644
index ec8b78f010c8..000000000000
--- a/php/php.editor/test/unit/data/testfiles/parser/nowdoc_009.php
+++ /dev/null
@@ -1,40 +0,0 @@
---TEST--
-Torture the T_END_NOWDOC rules (nowdoc)
---FILE--
-
---EXPECT--
-ENDOFNOWDOC ;
- ENDOFNOWDOC;
-ENDOFNOWDOC
- ENDOFNOWDOC
-$ENDOFNOWDOC;
-ENDOFNOWDOC ;
- ENDOFNOWDOC;
-ENDOFNOWDOC
- ENDOFNOWDOC
-$ENDOFNOWDOC;
-
diff --git a/php/php.editor/test/unit/data/testfiles/parser/nowdoc_010.php b/php/php.editor/test/unit/data/testfiles/parser/nowdoc_010.php
deleted file mode 100644
index 6f288151ce93..000000000000
--- a/php/php.editor/test/unit/data/testfiles/parser/nowdoc_010.php
+++ /dev/null
@@ -1,33 +0,0 @@
---TEST--
-Torture the T_END_NOWDOC rules with variable expansions (nowdoc)
---FILE--
-
---EXPECT--
-{$fooledYou}ENDOFNOWDOC{$fooledYou}
-ENDOFNOWDOC{$fooledYou}
-{$fooledYou}ENDOFNOWDOC
-{$fooledYou}ENDOFNOWDOC{$fooledYou}
-ENDOFNOWDOC{$fooledYou}
-{$fooledYou}ENDOFNOWDOC
-
diff --git a/php/php.editor/test/unit/data/testfiles/parser/functionCallTrailingCommas_01.php b/php/php.editor/test/unit/data/testfiles/parser/php73/functionCallTrailingCommas_01.php
similarity index 100%
rename from php/php.editor/test/unit/data/testfiles/parser/functionCallTrailingCommas_01.php
rename to php/php.editor/test/unit/data/testfiles/parser/php73/functionCallTrailingCommas_01.php
diff --git a/php/php.editor/test/unit/data/testfiles/parser/functionCallTrailingCommas_01.php.errors b/php/php.editor/test/unit/data/testfiles/parser/php73/functionCallTrailingCommas_01.php.errors
similarity index 100%
rename from php/php.editor/test/unit/data/testfiles/parser/functionCallTrailingCommas_01.php.errors
rename to php/php.editor/test/unit/data/testfiles/parser/php73/functionCallTrailingCommas_01.php.errors
diff --git a/php/php.editor/test/unit/data/testfiles/parser/functionCallTrailingCommas_02.php b/php/php.editor/test/unit/data/testfiles/parser/php73/functionCallTrailingCommas_02.php
similarity index 100%
rename from php/php.editor/test/unit/data/testfiles/parser/functionCallTrailingCommas_02.php
rename to php/php.editor/test/unit/data/testfiles/parser/php73/functionCallTrailingCommas_02.php
diff --git a/php/php.editor/test/unit/data/testfiles/parser/functionCallTrailingCommas_02.php.errors b/php/php.editor/test/unit/data/testfiles/parser/php73/functionCallTrailingCommas_02.php.errors
similarity index 100%
rename from php/php.editor/test/unit/data/testfiles/parser/functionCallTrailingCommas_02.php.errors
rename to php/php.editor/test/unit/data/testfiles/parser/php73/functionCallTrailingCommas_02.php.errors
diff --git a/php/php.editor/test/unit/data/testfiles/parser/functionCallTrailingCommas_03.php b/php/php.editor/test/unit/data/testfiles/parser/php73/functionCallTrailingCommas_03.php
similarity index 100%
rename from php/php.editor/test/unit/data/testfiles/parser/functionCallTrailingCommas_03.php
rename to php/php.editor/test/unit/data/testfiles/parser/php73/functionCallTrailingCommas_03.php
diff --git a/php/php.editor/test/unit/data/testfiles/parser/functionCallTrailingCommas_03.php.errors b/php/php.editor/test/unit/data/testfiles/parser/php73/functionCallTrailingCommas_03.php.errors
similarity index 100%
rename from php/php.editor/test/unit/data/testfiles/parser/functionCallTrailingCommas_03.php.errors
rename to php/php.editor/test/unit/data/testfiles/parser/php73/functionCallTrailingCommas_03.php.errors
diff --git a/php/php.editor/test/unit/data/testfiles/parser/functionCallTrailingCommas_04.php b/php/php.editor/test/unit/data/testfiles/parser/php73/functionCallTrailingCommas_04.php
similarity index 100%
rename from php/php.editor/test/unit/data/testfiles/parser/functionCallTrailingCommas_04.php
rename to php/php.editor/test/unit/data/testfiles/parser/php73/functionCallTrailingCommas_04.php
diff --git a/php/php.editor/test/unit/data/testfiles/parser/functionCallTrailingCommas_04.php.errors b/php/php.editor/test/unit/data/testfiles/parser/php73/functionCallTrailingCommas_04.php.errors
similarity index 100%
rename from php/php.editor/test/unit/data/testfiles/parser/functionCallTrailingCommas_04.php.errors
rename to php/php.editor/test/unit/data/testfiles/parser/php73/functionCallTrailingCommas_04.php.errors
diff --git a/php/php.editor/test/unit/data/testfiles/parser/php73/heredoc_indent_spaces_01.php b/php/php.editor/test/unit/data/testfiles/parser/php73/heredoc_indent_spaces_01.php
new file mode 100644
index 000000000000..eaa2308a7a1e
--- /dev/null
+++ b/php/php.editor/test/unit/data/testfiles/parser/php73/heredoc_indent_spaces_01.php
@@ -0,0 +1,26 @@
+
+My age is: $age
+HEREDOC;
+$name="Jun";
+
+// defferent indentation for body(spaces) ending marker(tabs)
+// allow this in the lexer but spaces and tabs MUST NOT be intermixed
+$x = <<field
+ ENDOFHEREDOC;
+
+// body(tabs) ending marker(spaces)
+$y = <<field
+ ENDOFHEREDOC;
diff --git a/php/php.editor/test/unit/data/testfiles/parser/php73/heredoc_mixed_02.php.errors b/php/php.editor/test/unit/data/testfiles/parser/php73/heredoc_mixed_02.php.errors
new file mode 100644
index 000000000000..8b137891791f
--- /dev/null
+++ b/php/php.editor/test/unit/data/testfiles/parser/php73/heredoc_mixed_02.php.errors
@@ -0,0 +1 @@
+
diff --git a/php/php.editor/test/unit/data/testfiles/parser/php73/heredoc_mixed_03.php b/php/php.editor/test/unit/data/testfiles/parser/php73/heredoc_mixed_03.php
new file mode 100644
index 000000000000..21eb41e7bcad
--- /dev/null
+++ b/php/php.editor/test/unit/data/testfiles/parser/php73/heredoc_mixed_03.php
@@ -0,0 +1,29 @@
+, }, ',', OR, XOR, &&, ?, ;, ||, &&, |, ^, &, ==, !=, ===, !==, <=, >=, <=>, <, >, <<, >>, +, -, *, /, %, '.', ], ), :, ??] 865-868:Syntax error
+ unexpected: identifier 'ING'
+ after: END_HEREDOC
+ expected: instanceof, as, =>, }, ',', OR, XOR, &&, ?, ;, ||, &&, |, ^, &, ==, !=, ===, !==, <=, >=, <=>, <, >, <<, >>, +, -, *, /, %, '.', ], ), :, ??
+[[869,872]-POSSIBLE Syntax Error (check preceding valid syntax error)
+ unexpected: identifier 'END'] 869-872:POSSIBLE Syntax Error (check preceding valid syntax error)
+ unexpected: identifier 'END'
+[[872,873]-POSSIBLE Syntax Error (check preceding valid syntax error)
+ unexpected: ','] 872-873:POSSIBLE Syntax Error (check preceding valid syntax error)
+ unexpected: ','
+[[879,880]-POSSIBLE Syntax Error (check preceding valid syntax error)
+ unexpected: ]] 879-880:POSSIBLE Syntax Error (check preceding valid syntax error)
+ unexpected: ]
diff --git a/php/php.editor/test/unit/data/testfiles/parser/php73/heredoc_new_line_error_02.php b/php/php.editor/test/unit/data/testfiles/parser/php73/heredoc_new_line_error_02.php
new file mode 100644
index 000000000000..f2891f02f7e9
--- /dev/null
+++ b/php/php.editor/test/unit/data/testfiles/parser/php73/heredoc_new_line_error_02.php
@@ -0,0 +1,25 @@
+, }, ',', OR, XOR, &&, ?, ;, ||, &&, |, ^, &, ==, !=, ===, !==, <=, >=, <=>, <, >, <<, >>, +, -, *, /, %, '.', ], ), :, ??] 864-865:Syntax error
+ unexpected: {
+ after: END_HEREDOC
+ expected: instanceof, as, =>, }, ',', OR, XOR, &&, ?, ;, ||, &&, |, ^, &, ==, !=, ===, !==, <=, >=, <=>, <, >, <<, >>, +, -, *, /, %, '.', ], ), :, ??
+[[870,871]-POSSIBLE Syntax Error (check preceding valid syntax error)
+ unexpected: }] 870-871:POSSIBLE Syntax Error (check preceding valid syntax error)
+ unexpected: }
+[[875,876]-POSSIBLE Syntax Error (check preceding valid syntax error)
+ unexpected: ','] 875-876:POSSIBLE Syntax Error (check preceding valid syntax error)
+ unexpected: ','
+[[882,883]-POSSIBLE Syntax Error (check preceding valid syntax error)
+ unexpected: ]] 882-883:POSSIBLE Syntax Error (check preceding valid syntax error)
+ unexpected: ]
diff --git a/php/php.editor/test/unit/data/testfiles/parser/listReferenceAssignment_01.php b/php/php.editor/test/unit/data/testfiles/parser/php73/listReferenceAssignment_01.php
similarity index 100%
rename from php/php.editor/test/unit/data/testfiles/parser/listReferenceAssignment_01.php
rename to php/php.editor/test/unit/data/testfiles/parser/php73/listReferenceAssignment_01.php
diff --git a/php/php.editor/test/unit/data/testfiles/parser/php73/listReferenceAssignment_01.php.errors b/php/php.editor/test/unit/data/testfiles/parser/php73/listReferenceAssignment_01.php.errors
new file mode 100644
index 000000000000..8b137891791f
--- /dev/null
+++ b/php/php.editor/test/unit/data/testfiles/parser/php73/listReferenceAssignment_01.php.errors
@@ -0,0 +1 @@
+
diff --git a/php/php.editor/test/unit/data/testfiles/parser/php73/nowdoc_indent_spaces_01.php b/php/php.editor/test/unit/data/testfiles/parser/php73/nowdoc_indent_spaces_01.php
new file mode 100644
index 000000000000..eb89827d1956
--- /dev/null
+++ b/php/php.editor/test/unit/data/testfiles/parser/php73/nowdoc_indent_spaces_01.php
@@ -0,0 +1,26 @@
+
+My age is: $age
+NOWDOC;
+$name="Jun";
+
+// defferent indentation for body(spaces) ending marker(tabs)
+// allow this in the lexer but spaces and tabs MUST NOT be intermixed
+$x = <<<'ENDOFNOWDOC'
+ This is another nowdoc test.
+ With another line in it. {$test} $test ${test} variable test.
+ test. $object->field
+ ENDOFNOWDOC;
+
+// body(tabs) ending marker(spaces)
+$y = <<<'ENDOFNOWDOC'
+ This is another nowdoc test.
+ With another line in it. {$test} $test ${test} variable test.
+ test. $object->field
+ ENDOFNOWDOC;
diff --git a/php/php.editor/test/unit/data/testfiles/parser/php73/nowdoc_mixed_02.php.errors b/php/php.editor/test/unit/data/testfiles/parser/php73/nowdoc_mixed_02.php.errors
new file mode 100644
index 000000000000..8b137891791f
--- /dev/null
+++ b/php/php.editor/test/unit/data/testfiles/parser/php73/nowdoc_mixed_02.php.errors
@@ -0,0 +1 @@
+
diff --git a/php/php.editor/test/unit/data/testfiles/parser/php73/nowdoc_mixed_03.php b/php/php.editor/test/unit/data/testfiles/parser/php73/nowdoc_mixed_03.php
new file mode 100644
index 000000000000..2c60e758c89a
--- /dev/null
+++ b/php/php.editor/test/unit/data/testfiles/parser/php73/nowdoc_mixed_03.php
@@ -0,0 +1,29 @@
+, }, ',', OR, XOR, &&, ?, ;, ||, &&, |, ^, &, ==, !=, ===, !==, <=, >=, <=>, <, >, <<, >>, +, -, *, /, %, '.', ], ), :, ??] 867-870:Syntax error
+ unexpected: identifier 'ING'
+ after: END_NOWDOC
+ expected: instanceof, as, =>, }, ',', OR, XOR, &&, ?, ;, ||, &&, |, ^, &, ==, !=, ===, !==, <=, >=, <=>, <, >, <<, >>, +, -, *, /, %, '.', ], ), :, ??
+[[871,874]-POSSIBLE Syntax Error (check preceding valid syntax error)
+ unexpected: identifier 'END'] 871-874:POSSIBLE Syntax Error (check preceding valid syntax error)
+ unexpected: identifier 'END'
+[[874,875]-POSSIBLE Syntax Error (check preceding valid syntax error)
+ unexpected: ','] 874-875:POSSIBLE Syntax Error (check preceding valid syntax error)
+ unexpected: ','
+[[881,882]-POSSIBLE Syntax Error (check preceding valid syntax error)
+ unexpected: ]] 881-882:POSSIBLE Syntax Error (check preceding valid syntax error)
+ unexpected: ]
diff --git a/php/php.editor/test/unit/data/testfiles/parser/php73/nowdoc_new_line_error_02.php b/php/php.editor/test/unit/data/testfiles/parser/php73/nowdoc_new_line_error_02.php
new file mode 100644
index 000000000000..05d5139efae8
--- /dev/null
+++ b/php/php.editor/test/unit/data/testfiles/parser/php73/nowdoc_new_line_error_02.php
@@ -0,0 +1,25 @@
+, }, ',', OR, XOR, &&, ?, ;, ||, &&, |, ^, &, ==, !=, ===, !==, <=, >=, <=>, <, >, <<, >>, +, -, *, /, %, '.', ], ), :, ??] 866-867:Syntax error
+ unexpected: {
+ after: END_NOWDOC
+ expected: instanceof, as, =>, }, ',', OR, XOR, &&, ?, ;, ||, &&, |, ^, &, ==, !=, ===, !==, <=, >=, <=>, <, >, <<, >>, +, -, *, /, %, '.', ], ), :, ??
+[[872,873]-POSSIBLE Syntax Error (check preceding valid syntax error)
+ unexpected: }] 872-873:POSSIBLE Syntax Error (check preceding valid syntax error)
+ unexpected: }
+[[877,878]-POSSIBLE Syntax Error (check preceding valid syntax error)
+ unexpected: ','] 877-878:POSSIBLE Syntax Error (check preceding valid syntax error)
+ unexpected: ','
+[[884,885]-POSSIBLE Syntax Error (check preceding valid syntax error)
+ unexpected: ]] 884-885:POSSIBLE Syntax Error (check preceding valid syntax error)
+ unexpected: ]
diff --git a/php/php.editor/test/unit/src/org/netbeans/modules/php/editor/indent/PHPFormatterTest.java b/php/php.editor/test/unit/src/org/netbeans/modules/php/editor/indent/PHPFormatterTest.java
index cb2ef9afabf3..642974c48fa4 100644
--- a/php/php.editor/test/unit/src/org/netbeans/modules/php/editor/indent/PHPFormatterTest.java
+++ b/php/php.editor/test/unit/src/org/netbeans/modules/php/editor/indent/PHPFormatterTest.java
@@ -780,4 +780,15 @@ public void testIssue271062() throws Exception {
reformatFileContents("testfiles/formatting/issue271062.php", options);
}
+ // PHP 7.3
+ public void testFlexibleHeredoc_01() throws Exception {
+ HashMap options = new HashMap<>(FmtOptions.getDefaults());
+ reformatFileContents("testfiles/formatting/flexibleHeredoc_01.php", options);
+ }
+
+ public void testFlexibleNowdoc_01() throws Exception {
+ HashMap options = new HashMap<>(FmtOptions.getDefaults());
+ reformatFileContents("testfiles/formatting/flexibleNowdoc_01.php", options);
+ }
+
}
diff --git a/php/php.editor/test/unit/src/org/netbeans/modules/php/editor/lexer/PHP53FeaturesTest.java b/php/php.editor/test/unit/src/org/netbeans/modules/php/editor/lexer/PHP53FeaturesTest.java
index 845a83926be2..00edfc3c2b9e 100644
--- a/php/php.editor/test/unit/src/org/netbeans/modules/php/editor/lexer/PHP53FeaturesTest.java
+++ b/php/php.editor/test/unit/src/org/netbeans/modules/php/editor/lexer/PHP53FeaturesTest.java
@@ -127,13 +127,9 @@ public void testNowDoc_08() throws Exception {
performTest("lexer/nowdoc_008");
}
- public void testNowDoc_09() throws Exception {
- performTest("lexer/nowdoc_009");
- }
-
- public void testNowDoc_10() throws Exception {
- performTest("lexer/nowdoc_010");
- }
+ // 09, 10: old syntax tests
+ // we don't provide support for them any longer
+ // we can use the new syntax since PHP 7.3
public void testNowDoc_11() throws Exception {
performTest("lexer/nowdoc_011");
@@ -187,13 +183,9 @@ public void testHereDoc53_08() throws Exception {
performTest("lexer/heredoc_008");
}
- public void testHereDoc53_09() throws Exception {
- performTest("lexer/heredoc_009");
- }
-
- public void testHereDoc53_10() throws Exception {
- performTest("lexer/heredoc_010");
- }
+ // 09, 10: old syntax tests
+ // we don't provide support for them any longer
+ // we can use the new syntax since PHP 7.3
public void testHereDoc53_11() throws Exception {
performTest("lexer/heredoc_011");
diff --git a/php/php.editor/test/unit/src/org/netbeans/modules/php/editor/lexer/PHP73FeaturesTest.java b/php/php.editor/test/unit/src/org/netbeans/modules/php/editor/lexer/PHP73FeaturesTest.java
new file mode 100644
index 000000000000..a18bcf430458
--- /dev/null
+++ b/php/php.editor/test/unit/src/org/netbeans/modules/php/editor/lexer/PHP73FeaturesTest.java
@@ -0,0 +1,149 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.netbeans.modules.php.editor.lexer;
+
+public class PHP73FeaturesTest extends PHPLexerTestBase {
+
+ public PHP73FeaturesTest(String testName) {
+ super(testName);
+ }
+
+ // HEREDOC Closing Marker Indentation
+ public void testFlexibleHeredocIndentationSpaces_01() throws Exception {
+ performTest("lexer/php73/heredoc_indent_spaces_01");
+ }
+
+ public void testFlexibleHeredocIndentationSpaces_02() throws Exception {
+ performTest("lexer/php73/heredoc_indent_spaces_02");
+ }
+
+ public void testFlexibleHeredocIndentationSpaces_03() throws Exception {
+ performTest("lexer/php73/heredoc_indent_spaces_03");
+ }
+
+ public void testFlexibleHeredocIndentationSpaces_04() throws Exception {
+ // no newline at EOF
+ performTest("lexer/php73/heredoc_indent_spaces_04");
+ }
+
+ public void testFlexibleHeredocIndentationTabs_01() throws Exception {
+ performTest("lexer/php73/heredoc_indent_tabs_01");
+ }
+
+ public void testFlexibleHeredocIndentationTabs_02() throws Exception {
+ performTest("lexer/php73/heredoc_indent_tabs_02");
+ }
+
+ public void testFlexibleHeredocIndentationTabs_03() throws Exception {
+ performTest("lexer/php73/heredoc_indent_tabs_03");
+ }
+
+ // HEREDOC Closing Marker New Line
+ public void testFlexibleHeredocNewLine_01() throws Exception {
+ performTest("lexer/php73/heredoc_new_line_01");
+ }
+
+ public void testFlexibleHeredocNewLine_02() throws Exception {
+ performTest("lexer/php73/heredoc_new_line_02");
+ }
+
+ public void testFlexibleHeredocNewLine_03() throws Exception {
+ performTest("lexer/php73/heredoc_new_line_03");
+ }
+
+ public void testFlexibleHeredocNewLine_04() throws Exception {
+ performTest("lexer/php73/heredoc_new_line_04");
+ }
+
+ // HEREDOC Mixed
+ public void testFlexibleHeredocMixed_01() throws Exception {
+ performTest("lexer/php73/heredoc_mixed_01");
+ }
+
+ public void testFlexibleHeredocMixed_02() throws Exception {
+ performTest("lexer/php73/heredoc_mixed_02");
+ }
+
+ public void testFlexibleHeredocMixed_03() throws Exception {
+ // no new line at EOF
+ performTest("lexer/php73/heredoc_mixed_03");
+ }
+
+ // NOWDOC Closing Marker Indentation
+ public void testFlexibleNowdocIndentationSpaces_01() throws Exception {
+ performTest("lexer/php73/nowdoc_indent_spaces_01");
+ }
+
+ public void testFlexibleNowdocIndentationSpaces_02() throws Exception {
+ performTest("lexer/php73/nowdoc_indent_spaces_02");
+ }
+
+ public void testFlexibleNowdocIndentationSpaces_03() throws Exception {
+ performTest("lexer/php73/nowdoc_indent_spaces_03");
+ }
+
+ public void testFlexibleNowdocIndentationSpaces_04() throws Exception {
+ // no newline at EOF
+ performTest("lexer/php73/nowdoc_indent_spaces_04");
+ }
+
+ public void testFlexibleNowdocIndentationTabs_01() throws Exception {
+ performTest("lexer/php73/nowdoc_indent_tabs_01");
+ }
+
+ public void testFlexibleNowdocIndentationTabs_02() throws Exception {
+ performTest("lexer/php73/nowdoc_indent_tabs_02");
+ }
+
+ public void testFlexibleNowdocIndentationTabs_03() throws Exception {
+ performTest("lexer/php73/nowdoc_indent_tabs_03");
+ }
+
+ // NOWDOC Closing Marker New Line
+ public void testFlexibleNowdocNewLine_01() throws Exception {
+ performTest("lexer/php73/nowdoc_new_line_01");
+ }
+
+ public void testFlexibleNowdocNewLine_02() throws Exception {
+ performTest("lexer/php73/nowdoc_new_line_02");
+ }
+
+ public void testFlexibleNowdocNewLine_03() throws Exception {
+ performTest("lexer/php73/nowdoc_new_line_03");
+ }
+
+ public void testFlexibleNowdocNewLine_04() throws Exception {
+ performTest("lexer/php73/nowdoc_new_line_04");
+ }
+
+ // NOWDOC Mixed
+ public void testFlexibleNowdocMixed_01() throws Exception {
+ performTest("lexer/php73/nowdoc_mixed_01");
+ }
+
+ public void testFlexibleNowdocMixed_02() throws Exception {
+ performTest("lexer/php73/nowdoc_mixed_02");
+ }
+
+ public void testFlexibleNowdocMixed_03() throws Exception {
+ // no new line at EOF
+ performTest("lexer/php73/nowdoc_mixed_03");
+ }
+
+}
diff --git a/php/php.editor/test/unit/src/org/netbeans/modules/php/editor/parser/ASTPHP5ParserTest.java b/php/php.editor/test/unit/src/org/netbeans/modules/php/editor/parser/ASTPHP5ParserTest.java
index 09d7fd3d17bb..8c5cf7888b4a 100644
--- a/php/php.editor/test/unit/src/org/netbeans/modules/php/editor/parser/ASTPHP5ParserTest.java
+++ b/php/php.editor/test/unit/src/org/netbeans/modules/php/editor/parser/ASTPHP5ParserTest.java
@@ -161,13 +161,9 @@ public void testNowdoc_11() throws Exception {
performTest("parser/nowdoc_008");
}
- public void testNowdoc_12() throws Exception {
- performTest("parser/nowdoc_009");
- }
-
- public void testNowdoc_13() throws Exception {
- performTest("parser/nowdoc_010");
- }
+ // 12(nowdoc_009), 13(nowdoc_010): old syntax tests
+ // we don't provide support for them any longer
+ // we can use the new syntax since PHP 7.3
public void testNowdoc_14() throws Exception {
performTest("parser/nowdoc_011");
@@ -229,13 +225,9 @@ public void testHereDoc_10() throws Exception {
performTest("parser/heredoc_008");
}
- public void testHereDoc_11() throws Exception {
- performTest("parser/heredoc_009");
- }
-
- public void testHereDoc_12() throws Exception {
- performTest("parser/heredoc_010");
- }
+ // 11(heredoc_009), 12(heredoc_010): old syntax tests
+ // we don't provide support for them any longer
+ // we can use the new syntax since PHP 7.3
public void testHereDoc_13() throws Exception {
performTest("parser/heredoc_011");
@@ -873,11 +865,127 @@ public void testGroupUseTrailingCommas_04() throws Exception {
// PHP 7.3
public void testFunctionCallTrailingCommas_01() throws Exception {
- performTest("parser/functionCallTrailingCommas_01");
+ performTest("parser/php73/functionCallTrailingCommas_01");
}
public void testListReferenceAssignment_01() throws Exception {
- performTest("parser/listReferenceAssignment_01");
+ performTest("parser/php73/listReferenceAssignment_01");
+ }
+
+ public void testFlexibleHeredocIndentSpaces_01() throws Exception {
+ performTest("parser/php73/heredoc_indent_spaces_01");
+ }
+
+ public void testFlexibleHeredocIndentSpaces_02() throws Exception {
+ performTest("parser/php73/heredoc_indent_spaces_02");
+ }
+
+ public void testFlexibleHeredocIndentSpaces_03() throws Exception {
+ performTest("parser/php73/heredoc_indent_spaces_03");
+ }
+
+ public void testFlexibleHeredocIndentSpaces_04() throws Exception {
+ // no new line at EOF
+ performTest("parser/php73/heredoc_indent_spaces_04");
+ }
+
+ public void testFlexibleHeredocIndentTabs_01() throws Exception {
+ performTest("parser/php73/heredoc_indent_tabs_01");
+ }
+
+ public void testFlexibleHeredocIndentTabs_02() throws Exception {
+ performTest("parser/php73/heredoc_indent_tabs_02");
+ }
+
+ public void testFlexibleHeredocIndentTabs_03() throws Exception {
+ performTest("parser/php73/heredoc_indent_tabs_03");
+ }
+
+ public void testFlexibleHeredocNewLine_01() throws Exception {
+ performTest("parser/php73/heredoc_new_line_01");
+ }
+
+ public void testFlexibleHeredocNewLine_02() throws Exception {
+ performTest("parser/php73/heredoc_new_line_02");
+ }
+
+ public void testFlexibleHeredocNewLine_03() throws Exception {
+ performTest("parser/php73/heredoc_new_line_03");
+ }
+
+ public void testFlexibleHeredocNewLine_04() throws Exception {
+ performTest("parser/php73/heredoc_new_line_04");
+ }
+
+ public void testFlexibleHeredocMixed_01() throws Exception {
+ performTest("parser/php73/heredoc_mixed_01");
+ }
+
+ public void testFlexibleHeredocMixed_02() throws Exception {
+ performTest("parser/php73/heredoc_mixed_02");
+ }
+
+ public void testFlexibleHeredocMixed_03() throws Exception {
+ // no new line at EOF
+ performTest("parser/php73/heredoc_mixed_03");
+ }
+
+ public void testFlexibleNowdocIndentSpaces_01() throws Exception {
+ performTest("parser/php73/nowdoc_indent_spaces_01");
+ }
+
+ public void testFlexibleNowdocIndentSpaces_02() throws Exception {
+ performTest("parser/php73/nowdoc_indent_spaces_02");
+ }
+
+ public void testFlexibleNowdocIndentSpaces_03() throws Exception {
+ performTest("parser/php73/nowdoc_indent_spaces_03");
+ }
+
+ public void testFlexibleNowdocIndentSpaces_04() throws Exception {
+ // no new line at EOF
+ performTest("parser/php73/nowdoc_indent_spaces_04");
+ }
+
+ public void testFlexibleNowdocIndentTabs_01() throws Exception {
+ performTest("parser/php73/nowdoc_indent_tabs_01");
+ }
+
+ public void testFlexibleNowdocIndentTabs_02() throws Exception {
+ performTest("parser/php73/nowdoc_indent_tabs_02");
+ }
+
+ public void testFlexibleNowdocIndentTabs_03() throws Exception {
+ performTest("parser/php73/nowdoc_indent_tabs_03");
+ }
+
+ public void testFlexibleNowdocNewLine_01() throws Exception {
+ performTest("parser/php73/nowdoc_new_line_01");
+ }
+
+ public void testFlexibleNowdocNewLine_02() throws Exception {
+ performTest("parser/php73/nowdoc_new_line_02");
+ }
+
+ public void testFlexibleNowdocNewLine_03() throws Exception {
+ performTest("parser/php73/nowdoc_new_line_03");
+ }
+
+ public void testFlexibleNowdocNewLine_04() throws Exception {
+ performTest("parser/php73/nowdoc_new_line_04");
+ }
+
+ public void testFlexibleNowdocMixed_01() throws Exception {
+ performTest("parser/php73/nowdoc_mixed_01");
+ }
+
+ public void testFlexibleNowdocMixed_02() throws Exception {
+ performTest("parser/php73/nowdoc_mixed_02");
+ }
+
+ public void testFlexibleNowdocMixed_03() throws Exception {
+ // no new line at EOF
+ performTest("parser/php73/nowdoc_mixed_03");
}
@Override
diff --git a/php/php.editor/test/unit/src/org/netbeans/modules/php/editor/parser/PhpParserErrorTest.java b/php/php.editor/test/unit/src/org/netbeans/modules/php/editor/parser/PhpParserErrorTest.java
index 7b9c8de21555..e984c35507d5 100644
--- a/php/php.editor/test/unit/src/org/netbeans/modules/php/editor/parser/PhpParserErrorTest.java
+++ b/php/php.editor/test/unit/src/org/netbeans/modules/php/editor/parser/PhpParserErrorTest.java
@@ -781,23 +781,155 @@ public void testGroupUseTrailingCommas_04() throws Exception {
// PHP 7.3
public void testFunctionCallTrailingCommas_01() throws Exception {
- checkErrors("testfiles/parser/functionCallTrailingCommas_01.php");
+ checkErrors("testfiles/parser/php73/functionCallTrailingCommas_01.php");
}
public void testFunctionCallTrailingCommas_02() throws Exception {
- checkErrors("testfiles/parser/functionCallTrailingCommas_02.php");
+ checkErrors("testfiles/parser/php73/functionCallTrailingCommas_02.php");
}
public void testFunctionCallTrailingCommas_03() throws Exception {
- checkErrors("testfiles/parser/functionCallTrailingCommas_03.php");
+ checkErrors("testfiles/parser/php73/functionCallTrailingCommas_03.php");
}
public void testFunctionCallTrailingCommas_04() throws Exception {
- checkErrors("testfiles/parser/functionCallTrailingCommas_04.php");
+ checkErrors("testfiles/parser/php73/functionCallTrailingCommas_04.php");
}
public void testListReferenceAssignment_01() throws Exception {
- checkErrors("testfiles/parser/listReferenceAssignment_01.php");
+ checkErrors("testfiles/parser/php73/listReferenceAssignment_01.php");
+ }
+
+ public void testFlexibleHeredocIndentSpaces_01() throws Exception {
+ checkErrors("testfiles/parser/php73/heredoc_indent_spaces_01.php");
+ }
+
+ public void testFlexibleHeredocIndentSpaces_02() throws Exception {
+ checkErrors("testfiles/parser/php73/heredoc_indent_spaces_02.php");
+ }
+
+ public void testFlexibleHeredocIndentSpaces_03() throws Exception {
+ checkErrors("testfiles/parser/php73/heredoc_indent_spaces_03.php");
+ }
+
+ public void testFlexibleHeredocIndentSpaces_04() throws Exception {
+ // no new line at EOF
+ checkErrors("testfiles/parser/php73/heredoc_indent_spaces_04.php");
+ }
+
+ public void testFlexibleHeredocIndentTabs_01() throws Exception {
+ checkErrors("testfiles/parser/php73/heredoc_indent_tabs_01.php");
+ }
+
+ public void testFlexibleHeredocIndentTabs_02() throws Exception {
+ checkErrors("testfiles/parser/php73/heredoc_indent_tabs_02.php");
+ }
+
+ public void testFlexibleHeredocIndentTabs_03() throws Exception {
+ checkErrors("testfiles/parser/php73/heredoc_indent_tabs_03.php");
+ }
+
+ public void testFlexibleHeredocNewLine_01() throws Exception {
+ checkErrors("testfiles/parser/php73/heredoc_new_line_01.php");
+ }
+
+ public void testFlexibleHeredocNewLine_02() throws Exception {
+ checkErrors("testfiles/parser/php73/heredoc_new_line_02.php");
+ }
+
+ public void testFlexibleHeredocNewLine_03() throws Exception {
+ checkErrors("testfiles/parser/php73/heredoc_new_line_03.php");
+ }
+
+ public void testFlexibleHeredocNewLine_04() throws Exception {
+ checkErrors("testfiles/parser/php73/heredoc_new_line_04.php");
+ }
+
+ public void testFlexibleHeredocNewLineError_01() throws Exception {
+ checkErrors("testfiles/parser/php73/heredoc_new_line_error_01.php");
+ }
+
+ public void testFlexibleHeredocNewLineError_02() throws Exception {
+ checkErrors("testfiles/parser/php73/heredoc_new_line_error_02.php");
+ }
+
+ public void testFlexibleHeredocMixed_01() throws Exception {
+ checkErrors("testfiles/parser/php73/heredoc_mixed_01.php");
+ }
+
+ public void testFlexibleHeredocMixed_02() throws Exception {
+ checkErrors("testfiles/parser/php73/heredoc_mixed_02.php");
+ }
+
+ public void testFlexibleHeredocMixed_03() throws Exception {
+ // no new line at EOF
+ checkErrors("testfiles/parser/php73/heredoc_mixed_03.php");
+ }
+
+ public void testFlexibleNowdocIndentSpaces_01() throws Exception {
+ checkErrors("testfiles/parser/php73/nowdoc_indent_spaces_01.php");
+ }
+
+ public void testFlexibleNowdocIndentSpaces_02() throws Exception {
+ checkErrors("testfiles/parser/php73/nowdoc_indent_spaces_02.php");
+ }
+
+ public void testFlexibleNowdocIndentSpaces_03() throws Exception {
+ checkErrors("testfiles/parser/php73/nowdoc_indent_spaces_03.php");
+ }
+
+ public void testFlexibleNowdocIndentSpaces_04() throws Exception {
+ // no new line at EOF
+ checkErrors("testfiles/parser/php73/nowdoc_indent_spaces_04.php");
+ }
+
+ public void testFlexibleNowdocIndentTabs_01() throws Exception {
+ checkErrors("testfiles/parser/php73/nowdoc_indent_tabs_01.php");
+ }
+
+ public void testFlexibleNowdocIndentTabs_02() throws Exception {
+ checkErrors("testfiles/parser/php73/nowdoc_indent_tabs_02.php");
+ }
+
+ public void testFlexibleNowdocIndentTabs_03() throws Exception {
+ checkErrors("testfiles/parser/php73/nowdoc_indent_tabs_03.php");
+ }
+
+ public void testFlexibleNowdocNewLine_01() throws Exception {
+ checkErrors("testfiles/parser/php73/nowdoc_new_line_01.php");
+ }
+
+ public void testFlexibleNowdocNewLine_02() throws Exception {
+ checkErrors("testfiles/parser/php73/nowdoc_new_line_02.php");
+ }
+
+ public void testFlexibleNowdocNewLine_03() throws Exception {
+ checkErrors("testfiles/parser/php73/nowdoc_new_line_03.php");
+ }
+
+ public void testFlexibleNowdocNewLine_04() throws Exception {
+ checkErrors("testfiles/parser/php73/nowdoc_new_line_04.php");
+ }
+
+ public void testFlexibleNowdocNewLineError_01() throws Exception {
+ checkErrors("testfiles/parser/php73/nowdoc_new_line_error_01.php");
+ }
+
+ public void testFlexibleNowdocNewLineError_02() throws Exception {
+ checkErrors("testfiles/parser/php73/nowdoc_new_line_error_02.php");
+ }
+
+ public void testFlexibleNowdocMixed_01() throws Exception {
+ checkErrors("testfiles/parser/php73/nowdoc_mixed_01.php");
+ }
+
+ public void testFlexibleNowdocMixed_02() throws Exception {
+ checkErrors("testfiles/parser/php73/nowdoc_mixed_02.php");
+ }
+
+ public void testFlexibleNowdocMixed_03() throws Exception {
+ // no new line at EOF
+ checkErrors("testfiles/parser/php73/nowdoc_mixed_03.php");
}
}
diff --git a/php/php.editor/tools/ASTPHP5Scanner.flex b/php/php.editor/tools/ASTPHP5Scanner.flex
index a2618c0e9992..78165c345e5f 100644
--- a/php/php.editor/tools/ASTPHP5Scanner.flex
+++ b/php/php.editor/tools/ASTPHP5Scanner.flex
@@ -264,6 +264,32 @@ import org.netbeans.modules.web.common.api.ByteStack;
return symbol;
}
+ private boolean isLabelChar(char c) {
+ return c == '_'
+ || (c >= 'a' && c <= 'z')
+ || (c >= 'A' && c <= 'Z')
+ || (c >= 0x7f && c <= 0xff);
+ }
+
+ private boolean isEndHereOrNowdoc(String hereOrNowdoc) {
+ // check whether ID exists
+ String trimedText = yytext().trim();
+ boolean isEnd = false;
+ if (trimedText.startsWith(hereOrNowdoc)) {
+ if (trimedText.length() == hereOrNowdoc.length()) {
+ isEnd = true;
+ } else if (trimedText.length() > hereOrNowdoc.length()
+ && !isLabelChar(trimedText.charAt(hereOrNowdoc.length()))) {
+ // e.g.
+ // $test = <<< END
+ // ENDING
+ // END
+ isEnd = true;
+ }
+ }
+ return isEnd;
+ }
+
public int[] getParamenters(){
return new int[]{zzMarkedPos, zzPushbackPos, zzCurrentPos, zzStartRead, zzEndRead, yyline};
}
@@ -1167,51 +1193,55 @@ yybegin(ST_DOCBLOCK);
yybegin(ST_NOWDOC);
}
-{LABEL}";"?[\r\n] {
- int length = yylength() - 1;
- yypushback(1);
-
- if (yytext().charAt(length - 1) == ';') {
- length--;
- yypushback(1);
- }
- if (length == nowdoc.length() && yytext().substring(0, length).equals(nowdoc)) {
+{TABS_AND_SPACES}{LABEL}";"?[^\n\r]*[\r\n]? {
+ /* {TABS_AND_SPACES}{LABEL}";"?[^\n\r]*[\r\n]? */
+ // there is no [\r\n] if it is the last line
+ // i.e. not [\r\n] but EOF, so check not [\r\n] but [\r\n]?
+ if (isEndHereOrNowdoc(nowdoc)) {
+ int indexOfNowdocId = yytext().indexOf(nowdoc);
+ int back = yylength() - indexOfNowdocId - nowdoc.length();
+ yypushback(back);
nowdoc = null;
+ nowdoc_len = 0;
+ nowdocBody.delete(0, nowdocBody.length());
+ nowdocBodyStart = -1;
+ nowdocBodyLength = 0;
yybegin(ST_IN_SCRIPTING);
return createSymbol(ASTPHP5Symbols.T_END_NOWDOC);
} else {
+ yypushback(1); // [\r\n] length
yybegin(ST_NOWDOC);
updateNowdocBodyInfo();
}
}
-{NOWDOC_CHARS}*{NEWLINE}+{LABEL}";"?[\n\r] {
- /* {NOWDOC_CHARS}*{NEWLINE}+{LABEL}";"?[\n\r] */
- String text = yytext();
-
- if (text.charAt(text.length() - 2)== ';') {
- text = text.substring(0, text.length() - 2);
- yypushback(1);
- } else {
- text = text.substring(0, text.length() - 1);
+ {
+ {NEWLINE}{TABS_AND_SPACES}{LABEL}";"?[^\n\r]*[\r\n]? {
+ /* {NEWLINE}{TABS_AND_SPACES}{LABEL}";"?[^\n\r]*[\r\n]? */
+ if (isEndHereOrNowdoc(nowdoc)) {
+ String yytext = yytext();
+ int newlineLength = yytext.startsWith("\r\n") ? 2 : 1;
+ int back = yylength() - newlineLength;
+ yypushback(back);
+ updateNowdocBodyInfo();
+ yybegin(ST_END_NOWDOC);
+ if (nowdocBodyLength > 0) {
+ return createFullNowdocBodySymbol();
+ }
+ } else {
+ yypushback(1);
+ updateNowdocBodyInfo();
+ }
}
- int textLength = text.length();
- if (textLength > nowdoc_len && text.substring(textLength - nowdoc_len, textLength).equals(nowdoc)) {
- yypushback(nowdoc_len + 1);
- updateNowdocBodyInfo();
- yybegin(ST_END_NOWDOC);
- if (nowdocBodyLength > 0) {
- return createFullNowdocBodySymbol();
- }
- } else {
- yypushback(1);
+ {NOWDOC_CHARS}|{NEWLINE} {
+ /* {NOWDOC_CHARS}|{NEWLINE} */
updateNowdocBodyInfo();
}
}
-{LABEL}";"?[\n\r] {
+{TABS_AND_SPACES}{LABEL}";"? {
/* {LABEL}";"?[\n\r] */
nowdoc=null;
nowdoc_len=0;
@@ -1219,8 +1249,8 @@ yybegin(ST_DOCBLOCK);
nowdocBodyStart = -1;
nowdocBodyLength = 0;
yybegin(ST_IN_SCRIPTING);
- int back = 1;
- if (yytext().charAt(yylength() - 2)==';') {
+ int back = 0;
+ if (yytext().charAt(yylength() - 1)==';') {
back++;
}
yypushback(back);
@@ -1247,8 +1277,8 @@ yybegin(ST_DOCBLOCK);
yybegin(ST_HEREDOC);
}
-{LABEL}";"?[\n\r] {
- /* {LABEL}";"?[\n\r] */
+{TABS_AND_SPACES}{LABEL}";"?[^\n\r]*[\n\r]? {
+ /* {TABS_AND_SPACES}{LABEL}";"?[^\n\r]*[\n\r]? */
int trailingNewLineLength = 1;
int labelLength = yylength() - trailingNewLineLength;
int back = trailingNewLineLength;
@@ -1258,9 +1288,10 @@ yybegin(ST_DOCBLOCK);
labelLength--;
back++;
}
- if (labelLength == heredoc.length()
- && yytext.substring(labelLength - heredoc.length(), labelLength).equals(heredoc)) {
- back = back + heredoc.length();
+
+ if (isEndHereOrNowdoc(heredoc)) {
+ int indexOfHeredocId = yytext().indexOf(heredoc);
+ back += labelLength - indexOfHeredocId;
yypushback(back);
yybegin(ST_END_HEREDOC);
} else {
@@ -1270,8 +1301,8 @@ yybegin(ST_DOCBLOCK);
}
{
- {NEWLINE}{LABEL}";"?[\n\r] {
- /* {NEWLINE}{LABEL}";"?[\n\r] */
+ {NEWLINE}{TABS_AND_SPACES}{LABEL}";"?[^\n\r]*[\n\r]? {
+ /* {NEWLINE}{TABS_AND_SPACES}{LABEL}";"?[^\n\r]*[\n\r]? */
int trailingNewLineLength = 1;
int labelLength = yylength() - trailingNewLineLength;
int back = trailingNewLineLength;
@@ -1280,13 +1311,30 @@ yybegin(ST_DOCBLOCK);
labelLength--;
back++;
}
- if (labelLength > heredoc.length()
- && yytext().substring(labelLength - heredoc.length(), labelLength).equals(heredoc)) {
- back += heredoc.length();
+
+ if (isEndHereOrNowdoc(heredoc)) {
+ int indexOfHeredocId = yytext().indexOf(heredoc);
+ back += labelLength - indexOfHeredocId;
yypushback(back);
yybegin(ST_END_HEREDOC);
} else {
- yypushback(trailingNewLineLength);
+ int indexOfVariable1 = yytext().indexOf("$");
+ int indexOfVariable2 = yytext().indexOf("{$");
+ if (indexOfVariable1 > 0 && indexOfVariable2 == -1) {
+ yypushback(yylength() - indexOfVariable1);
+ updateHeredocBodyInfo();
+ return createFullHeredocBodySymbol();
+ } else if (indexOfVariable2 > 0 && indexOfVariable1 == -1) {
+ yypushback(yylength() - indexOfVariable2);
+ updateHeredocBodyInfo();
+ return createFullHeredocBodySymbol();
+ } else if (indexOfVariable1 > 0 && indexOfVariable2 > 0) {
+ yypushback(yylength() - Math.min(indexOfVariable1, indexOfVariable2));
+ updateHeredocBodyInfo();
+ return createFullHeredocBodySymbol();
+ } else {
+ yypushback(trailingNewLineLength);
+ }
}
updateHeredocBodyInfo();
if (yystate() == ST_END_HEREDOC) {
@@ -1321,14 +1369,14 @@ yybegin(ST_DOCBLOCK);
}
}
-{LABEL}";"?[\n\r] {
- /* {LABEL}";"?[\n\r] { */
+{TABS_AND_SPACES}{LABEL}";"? {
+ /* {TABS_AND_SPACES}{LABEL}";"? */
heredoc=null;
resetHeredocBodyInfo();
yybegin(ST_IN_SCRIPTING);
- int back = 1;
+ int back = 0;
// mark just the label
- if (yytext().charAt(yylength() - 2)==';') {
+ if (yytext().charAt(yylength() - 1)==';') {
back++;
}
yypushback(back);
diff --git a/php/php.editor/tools/Php5ColoringScanner.flex b/php/php.editor/tools/Php5ColoringScanner.flex
index 44dcea34124d..23879167a358 100644
--- a/php/php.editor/tools/Php5ColoringScanner.flex
+++ b/php/php.editor/tools/Php5ColoringScanner.flex
@@ -211,6 +211,47 @@ import org.netbeans.modules.web.common.api.ByteStack;
yybegin(state);
}
+ private boolean isLabelChar(char c) {
+ return c == '_'
+ || (c >= 'a' && c <= 'z')
+ || (c >= 'A' && c <= 'Z')
+ || (c >= 0x7f && c <= 0xff);
+ }
+
+ private boolean isEndNowdoc() {
+ String yytext = yytext().trim();
+ int lastIndexOfNewline = yytext.lastIndexOf('\n');
+ if (lastIndexOfNewline == -1) {
+ lastIndexOfNewline = yytext.lastIndexOf('\r');
+ }
+ if (lastIndexOfNewline != -1) {
+ yytext = yytext.substring(lastIndexOfNewline);
+ }
+ return isEndHereOrNowdoc(yytext);
+ }
+
+ private boolean isEndHeredoc() {
+ return isEndHereOrNowdoc(yytext());
+ }
+
+ private boolean isEndHereOrNowdoc(String text) {
+ // check whether ID exists
+ String trimedText = text.trim();
+ boolean isEnd = false;
+ if (trimedText.startsWith(heredoc)) {
+ if (trimedText.length() == heredoc.length()) {
+ isEnd = true;
+ } else if (trimedText.length() > heredoc.length()
+ && !isLabelChar(trimedText.charAt(heredoc.length()))) {
+ // e.g.
+ // $test = <<< END
+ // ENDING
+ // END
+ isEnd = true;
+ }
+ }
+ return isEnd;
+ }
// End user code
@@ -1095,49 +1136,55 @@ PHP_TYPE_OBJECT=[o][b][j][e][c][t]
yybegin(ST_PHP_NOWDOC);
}
-{LABEL}";"?[\r\n] {
- int label_len = yylength() - 1;
-
- if (yytext().charAt(label_len-1)==';') {
- label_len--;
- }
-
- if (label_len==hereocLength && yytext().substring(0,label_len).equals(heredoc)) {
+{TABS_AND_SPACES}{LABEL}";"?[^\n\r]*[\r\n]? {
+ /* {TABS_AND_SPACES}{LABEL}";"?[^\n\r]*[\r\n]? */
+ // there is no [\r\n] if it is the last line
+ // i.e. not [\r\n] but EOF, so check not [\r\n] but [\r\n]?
+ if (isEndNowdoc()) {
+ int indexOfNowdocId = yytext().indexOf(heredoc);
+ int back = yylength() - indexOfNowdocId - heredoc.length();
+ yypushback(back);
heredoc=null;
hereocLength=0;
yybegin(ST_PHP_IN_SCRIPTING);
return PHPTokenId.PHP_NOWDOC_TAG_END;
} else {
- return PHPTokenId.PHP_CONSTANT_ENCAPSED_STRING;
+ yypushback(1);
+ yybegin(ST_PHP_NOWDOC);
}
}
-
-{NOWDOC_CHARS}*{NEWLINE}+{LABEL}";"?[\n\r] {
- int label_len = yylength() - 1;
- int back = 1;
-
- if (yytext().charAt(label_len-1)==';') {
- label_len--;
- back++;
- }
- if (label_len > hereocLength && yytext().substring(label_len - hereocLength,label_len).equals(heredoc)) {
- back = back + hereocLength;
- yypushback(back);
- yybegin(ST_PHP_END_NOWDOC);
+ {
+ {NEWLINE}{TABS_AND_SPACES}{LABEL}";"?[^\n\r]*[\r\n]? {
+ /* {NEWLINE}{TABS_AND_SPACES}{LABEL}";"?[^\n\r]*[\r\n]? */
+ if (isEndNowdoc()) {
+ String yytext = yytext();
+ int trailingNewlineOffset = (yytext.endsWith("\n") || yytext.endsWith("\r")) ? 2 : 0;
+ int lastIndexOfNewline = yytext.lastIndexOf('\n', yylength() - trailingNewlineOffset);
+ if (lastIndexOfNewline == -1) {
+ lastIndexOfNewline = yytext.lastIndexOf('\r', yylength() - trailingNewlineOffset);
+ }
+ int back = yylength() - lastIndexOfNewline - 1; // -1 [\r\n] length
+ yypushback(back);
+ yybegin(ST_PHP_END_NOWDOC);
+ return PHPTokenId.PHP_CONSTANT_ENCAPSED_STRING;
+ } else {
+ yypushback(1); // [\r\n] length
+ }
}
- else {
- yypushback(1);
+
+ {NOWDOC_CHARS}|{NEWLINE} {
+ /* {NOWDOC_CHARS}|{NEWLINE} */
+ // retrun PHPTokenId when the closing marker is found
}
- return PHPTokenId.PHP_CONSTANT_ENCAPSED_STRING;
}
-{LABEL}";"?[\n\r] {
+{NEWLINE}*{TABS_AND_SPACES}{LABEL}";"? {
heredoc=null; hereocLength=0;
yybegin(ST_PHP_IN_SCRIPTING);
- int back = 1;
+ int back = 0;
// mark just the label
- if (yytext().charAt(yylength() - 2)==';') {
+ if (yytext().charAt(yylength() - 1)==';') {
back++;
}
yypushback(back);
@@ -1163,17 +1210,19 @@ PHP_TYPE_OBJECT=[o][b][j][e][c][t]
}
{
- {LABEL}";"?[\n\r] {
+ {TABS_AND_SPACES}{LABEL}";"?[^\n\r]*[\n\r]? {
int trailingNewLineLength = 1;
int label_len = yylength() - trailingNewLineLength;
int back = trailingNewLineLength;
- if (yytext().charAt(label_len-1)==';') {
+ if (yytext().charAt(label_len - 1)==';') {
label_len--;
back++;
}
- if (label_len == hereocLength && yytext().substring(label_len - hereocLength,label_len).equals(heredoc)) {
- back = back + hereocLength;
+
+ if (isEndHeredoc()) {
+ int indexOfHeredocId = yytext().indexOf(heredoc);
+ back += label_len - indexOfHeredocId;
yypushback(back);
yybegin(ST_PHP_END_HEREDOC);
} else {
@@ -1188,23 +1237,32 @@ PHP_TYPE_OBJECT=[o][b][j][e][c][t]
}
{
- {NEWLINE}{LABEL}";"?[\n\r] {
+ {NEWLINE}{TABS_AND_SPACES}{LABEL}";"?[^\n\r]*[\n\r]? {
+ /* {NEWLINE}{TABS_AND_SPACES}{LABEL}";"?[^\n\r]*[\n\r]? */
int trailingNewLineLength = 1;
- int label_len = yylength() - trailingNewLineLength;
- int back = trailingNewLineLength;
-
- if (yytext().charAt(label_len-1)==';') {
- label_len--;
- back++;
- }
- if (label_len > hereocLength && yytext().substring(label_len - hereocLength,label_len).equals(heredoc)) {
- back = back + hereocLength;
+ if (isEndHeredoc()) {
+ String yytext = yytext();
+ int newlineLength = yytext.startsWith("\r\n") ? 2 : 1;
+ int back = yylength() - newlineLength;
yypushback(back);
yybegin(ST_PHP_END_HEREDOC);
} else {
- yypushback(trailingNewLineLength);
- return PHPTokenId.PHP_CONSTANT_ENCAPSED_STRING;
+ int indexOfVariable1 = yytext().indexOf("$");
+ int indexOfVariable2 = yytext().indexOf("{$");
+ if (indexOfVariable1 > 0 && indexOfVariable2 == -1) {
+ yypushback(yylength() - indexOfVariable1);
+ return PHPTokenId.PHP_ENCAPSED_AND_WHITESPACE;
+ } else if (indexOfVariable2 > 0 && indexOfVariable1 == -1) {
+ yypushback(yylength() - indexOfVariable2);
+ return PHPTokenId.PHP_ENCAPSED_AND_WHITESPACE;
+ } else if (indexOfVariable1 > 0 && indexOfVariable2 > 0) {
+ yypushback(yylength() - Math.min(indexOfVariable1, indexOfVariable2));
+ return PHPTokenId.PHP_ENCAPSED_AND_WHITESPACE;
+ } else {
+ yypushback(trailingNewLineLength);
+ }
}
+ return PHPTokenId.PHP_CONSTANT_ENCAPSED_STRING;
}
{HEREDOC_CHARS} {
@@ -1233,13 +1291,13 @@ PHP_TYPE_OBJECT=[o][b][j][e][c][t]
return PHPTokenId.PHP_CONSTANT_ENCAPSED_STRING;
}
-{LABEL}";"?[\n\r] {
+{TABS_AND_SPACES}{LABEL}";"? {
heredoc=null;
hereocLength=0;
yybegin(ST_PHP_IN_SCRIPTING);
- int back = 1;
+ int back = 0;
// mark just the label
- if (yytext().charAt(yylength() - 2)==';') {
+ if (yytext().charAt(yylength() - 1)==';') {
back++;
}
yypushback(back);