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

[8.x] Fix assertSoftDeleted & assertNotSoftDeleted #39673

Merged
merged 2 commits into from Nov 18, 2021

Conversation

driesvints
Copy link
Member

@driesvints driesvints commented Nov 18, 2021

This PR fixes an issue where $data wasn't passed along properly as a where clause for the assertSoftDeleted & assertNotSoftDeleted methods. By passing the data properly, more granular assertions can be made.

Fixes #39667

@driesvints driesvints changed the title Fix assertNotSoftDeleted [8.x] Fix assertNotSoftDeleted Nov 18, 2021
@GrahamCampbell
Copy link
Member

Is this an issue on 6.x too?

@driesvints
Copy link
Member Author

@GrahamCampbell no, the method doesn't exists there.

Copy link
Member

@GrahamCampbell GrahamCampbell left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🚢

@driesvints driesvints marked this pull request as draft November 18, 2021 14:07
@driesvints driesvints changed the title [8.x] Fix assertNotSoftDeleted [8.x] Fix assertSoftDeleted & assertNotSoftDeleted Nov 18, 2021
@driesvints driesvints marked this pull request as ready for review November 18, 2021 14:10
@taylorotwell taylorotwell merged commit cefe5cf into 8.x Nov 18, 2021
@taylorotwell taylorotwell deleted the fix-assert-not-deleted branch November 18, 2021 14:54
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.

assertSoftDeleted() and assertNotSoftDeleted() discard $data argument value when first argument is a model
3 participants