Allow running tests with PHPUnit 10 and 11 #74
Merged
Conversation
This file contains 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
We never call these methods since 5653e3f.
derrabus
previously requested changes
Dec 16, 2024
tests/DeprecationTest.php
Outdated
| @@ -99,6 +80,7 @@ public function testDeprecation(): void | |||
| ); | |||
|
|
|||
| $this->assertEquals(2, Deprecation::getUniqueTriggeredDeprecationsCount()); | |||
| restore_error_handler(); | |||
There was a problem hiding this comment.
This won't restore the error handler if the test fails. We should wrap everything that runs with a custom error handler into a try/finally block.
PHPUnit 11 emits complaints about the error handlers not being removed, which is risky, so I had to add a few calls to restore_error_handler(). This leaves us with PHPUnit deprecations about using @before and @after rather than the corresponding attributes. I do not think those can be addressed without a breaking change (adding the attributes is not enough, you have to remove the annotations).
| $this->assertEquals(1, Deprecation::getUniqueTriggeredDeprecationsCount()); | ||
| $this->assertEquals(1, Deprecation::getUniqueTriggeredDeprecationsCount()); | ||
| } finally { | ||
| restore_error_handler(); |
There was a problem hiding this comment.
Can't tearDown() be used in this test class just like in tests/VerifyDeprecationsTest.php?
There was a problem hiding this comment.
It could, but this is safer: if for some reason something fails before we get to set the error handler, it's better not to restore it.
SenseException
approved these changes
Dec 19, 2024
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.
PHPUnit 11 emits complaints about the error handlers not being removed, which is risky, so I had to add a few calls to
restore_error_handler().This leaves us with PHPUnit deprecations about using @before and @after rather than the corresponding attributes. I do not think those can be addressed without a breaking change (adding the attributes is not enough, you have to remove the annotations).
After this MR is merged,
composer outdatedis almost empty: