Remove PHP<7 leftovers #22894
Merged
Remove PHP<7 leftovers #22894
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
37b31ab to
ff80b2e
Compare
stof
reviewed
May 24, 2017
| } finally { | ||
| if (PHP_VERSION_ID < 70000 && false !== self::$previousErrorHandler) { | ||
| restore_error_handler(); | ||
| self::$previousErrorHandler = false; |
There was a problem hiding this comment.
do we still need self::$previousErrorHandler ?
There was a problem hiding this comment.
no indeed, removed self::$errorHandlerand handleError() which were unused also
There was a problem hiding this comment.
when was self::$previousErrorHandler set to something else than false?
There was a problem hiding this comment.
|
build failure unrelated |
xabbuh
reviewed
May 24, 2017
| @@ -17,7 +17,7 @@ | |||
|
|
|||
| class JsonEncodeTest extends TestCase | |||
| { | |||
| private $encoder; | |||
| private $encode; | |||
There was a problem hiding this comment.
should probably be done in older branches too
There was a problem hiding this comment.
and we should rename to "encoder" everywhere also
There was a problem hiding this comment.
hmm, altough I find the name weird, the tested class is JsonEncode, not JsonEncoder
xabbuh
approved these changes
May 24, 2017
ogizanagi
approved these changes
May 24, 2017
|
Thank you @chalasr. |
nicolas-grekas
added a commit
that referenced
this pull request
May 25, 2017
This PR was merged into the 4.0-dev branch. Discussion ---------- Remove PHP<7 leftovers | Q | A | ------------- | --- | Branch? | master | Bug fix? | no | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | n/a | License | MIT | Doc PR | n/a Forgot while cleaning up Commits ------- f0147da Remove PHP < 7.1 leftovers
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.
Forgot while cleaning up