Fix #77812: Interactive mode does not support PHP 7.3-style heredoc #4590
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
carusogabriel
suggested changes
Aug 21, 2019
nikic
reviewed
Aug 21, 2019
Member
Author
|
This PR is blocked by bug #78441. |
As of PHP 7.3.0, the rules regarding the heredoc and nowdoc closing identifier have been relaxed. While formerly, the closing identifier was required to be placed at the beginning of a line and to be immediately followed by a semicolon and a line break, it may now be preceeded by whitespace, and may be followed by any non-word character. We adjust the recognition logic respectively.
This case is already handled by the more general following elseif-then, so we can drop it.
Member
Author
|
Rebased onto current PHP-7.3 (to get the fix for bug # 78441), and added a test with a trailing digit. I've also catered to extended ASCII characters, which are permissible in (heredoc) labels. |
nikic
reviewed
Aug 22, 2019
nikic
reviewed
Aug 23, 2019
nikic
approved these changes
Aug 23, 2019
Member
Author
|
Thanks! Applied as 03c7749. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
As of PHP 7.3.0, the rules regarding the heredoc and nowdoc closing
identifier have been relaxed. While formerly, the closing identifier
was required to be placed at the beginning of a line and to be
immediately followed by a semicolon and a line break, it may now be
preceeded by whitespace, and may be followed by any non-word character.
We adjust the recognition logic respectively.