Fixed DocParser lookahead to work in PHP 7.4#284
Closed
davidbyoung wants to merge 1 commit intodoctrine:masterfrom
Closed
Fixed DocParser lookahead to work in PHP 7.4#284davidbyoung wants to merge 1 commit intodoctrine:masterfrom
davidbyoung wants to merge 1 commit intodoctrine:masterfrom
Conversation
greg0ire
reviewed
Sep 28, 2019
Fixed spl autoload function to return void per PHP documentation Removed unnecessary ignored error message from phpstan config that is no longer thrown because of the fixes to DocParser
e6d156c to
3609955
Compare
greg0ire
approved these changes
Sep 28, 2019
Member
|
We should rather merge #276 up as it's doing mostly the same thing and is already in |
Member
|
So we should just merge up? Is this repo using a merge up policy? |
Member
|
@greg0ire I assumed it does although I don't know how much master diverged from |
Member
|
I'll merge up soon. I wanted to fix the 1.7 vs. 1.8 issue first (some PRs were marked for 1.7 but only merged to master), then solve the issue by merging up to master. For what it's worth, we use merge-up strategy here as it requires less work (merging up is generally easier and less error-prone than backporting). As such I'm closing this PR, but I'll leave the related issue open until I've done the merge. |
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Fixes #283 by explicitly checking if the lookahead position is null before using it (started becoming a problem in PHP 7.4). Also fixed spl autoload function to have a void return type rather than bool. Removed an error message from the PHPStan config because it is no longer thrown by the fixed DocParser