Backports #513 to 0.9 branch #626
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
Fixes mockery#512: A fatal error is triggered when an exception occurs during instantiation using unserialisation: PHP Fatal error: Cannot use Exception as Exception because the name is already in use Runtime: PHP 5.6.14-1+deb.sury.org~trusty+1 with Xdebug 2.3.2 The cause of this error is that \Exception is imported as Exception in \Mockery\Instantiator, while a class name Exception already exists in that namespace (\Mockery\Exception). This commit fixes the name collision. I don't quite remember how I got a error to trigger during unserialisation, so there's no regression test.
|
Thanks! |
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 bugfix in #513 was not pushed to the 0.9 branch. I think it's an important fix, so I'm proposing it be backported.