Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[5.8] Fix mix exception handling #27569

Merged
merged 1 commit into from
Feb 18, 2019
Merged

[5.8] Fix mix exception handling #27569

merged 1 commit into from
Feb 18, 2019

Conversation

driesvints
Copy link
Member

I noticed that these tests were uncommented so I did some investigating into why. It turns out that two prs referenced below were merged on either the 5.7 and 5.8 branches. I believe that due to a merge gone wrong some of the functionality from the PR sent to 5.7 was removed again causing the tests to fail (which is why they were commented out). I've re-added the changes and re-enable the commented out tests which now pass again.

5.7 PR: #26431
5.8 PR: #26289

I noticed that these tests were uncommented so I did some investigating into why. It turns out that two prs referenced below were merged on either the 5.7 and 5.8 branches. I believe that due to a merge gone wrong some of the functionality from the PR sent to 5.7 was removed again causing the tests to fail (which is why they were commented out). I've re-added the changes and re-enable the commented out tests which now pass again.

5.7 PR: #26431
5.8 PR: #26289
@driesvints
Copy link
Member Author

@timacdonald can you maybe give this a quick look to see if everything is still implemented as you intended? From my point of view it looks good.

@timacdonald
Copy link
Member

Hey! Yea it looks good to me.

@taylorotwell taylorotwell merged commit 861d260 into laravel:5.8 Feb 18, 2019
@driesvints driesvints deleted the fix-mix-exception-handling branch February 18, 2019 22:09
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants