[PhpUnitBridge] fixed PHPUnit 8.3 compatibility: method handleError was renamed to __invoke #32933
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
karser
commented
Aug 4, 2019
a505eab to
b253eb6
Compare
nicolas-grekas
approved these changes
Aug 5, 2019
…as renamed to __invoke
b253eb6 to
0c9539f
Compare
|
I see. Anyways I'm glad I could help you with the research part and learnt some error handling stuff. Still have one question though, why do you return a |
the return value is used with |
|
Should I apply fabbot patch? |
|
Nope, fabbot doesn't work for the bridge. |
|
Thank you @karser. |
nicolas-grekas
added a commit
that referenced
this pull request
Aug 5, 2019
…ndleError was renamed to __invoke (karser) This PR was merged into the 3.4 branch. Discussion ---------- [PhpUnitBridge] fixed PHPUnit 8.3 compatibility: method handleError was renamed to __invoke | Q | A | ------------- | --- | Branch? | 4.3 | Bug fix? | yes | New feature? | no <!-- please update src/**/CHANGELOG.md files --> | BC breaks? | no <!-- see https://symfony.com/bc --> | Deprecations? | no <!-- please update UPGRADE-*.md and src/**/CHANGELOG.md files --> | Tests pass? | yes <!-- please add some, will be required by reviewers --> | Fixed tickets | #32879 <!-- #-prefixed issue number(s), if any --> | License | MIT The PHPUnit method [handleError](https://github.com/sebastianbergmann/phpunit/blob/8.2.5/src/Util/ErrorHandler.php#L38) was renamed to [__invoke](https://github.com/sebastianbergmann/phpunit/blob/8.3/src/Util/ErrorHandler.php#L71) in v8.3. So we should check in Symfony [DeprecationErrorHandler](https://github.com/symfony/symfony/blob/v4.3.3/src/Symfony/Bridge/PhpUnit/DeprecationErrorHandler.php) if method `handleError` exists, otherwise call `__invoke` It works with phpunit v8.2.5 and 8.3.2. The PHPUnit handler is called when I trigger some error, e.g `iconv('fdsfs', 'fsdfds', '');` Commits ------- 0c9539f [PhpUnitBridge] fixed PHPUnit 8.3 compatibility: method handleError was renamed to __invoke
jderusse
reviewed
Aug 5, 2019
| @@ -44,6 +48,7 @@ public static function register($mode = 0) | |||
| } | |||
|
|
|||
| $UtilPrefix = class_exists('PHPUnit_Util_ErrorHandler') ? 'PHPUnit_Util_' : 'PHPUnit\Util\\'; | |||
| self::$isAtLeastPhpUnit83 = method_exists('PHPUnit\Util\ErrorHandler', '__invoke'); | |||
There was a problem hiding this comment.
nvm. Didn't notice that version were 3.4
| public static function getPhpUnitErrorHandler() | ||
| { | ||
| if (!self::$isAtLeastPhpUnit83) { | ||
| return (class_exists('PHPUnit_Util_ErrorHandler', false) ? 'PHPUnit_Util_' : 'PHPUnit\Util\\').'ErrorHandler::handleError'; |
There was a problem hiding this comment.
return [ErrorHandler::class, 'handleError'] since #32940
There was a problem hiding this comment.
nvm. Didn't notice that version were 3.4
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.
The PHPUnit method handleError was renamed to __invoke in v8.3.
So we should check in Symfony DeprecationErrorHandler if method
handleErrorexists, otherwise call__invokeIt works with phpunit v8.2.5 and 8.3.2.
The PHPUnit handler is called when I trigger some error, e.g
iconv('fdsfs', 'fsdfds', '');