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

[13.x] Fix trialEndsAt more closely represents onTrial #1129

Merged
merged 2 commits into from
Apr 15, 2021

Conversation

benjamindoe
Copy link
Contributor

Closes #1128

The trialEndsAt returns the trial_ends_at attribute by default if there are no arguments passed through and the user is indeed on a generic trial. Without the onGenericTrial check, the function will always return trial_ends_at if no arguments were passed through.

The trialEndsAt function also returns trial_ends_at as a fallback because there may be a use case that an application expects a historical date from trialEndsAt.

@driesvints driesvints changed the title trialEndsAt more closely represents onTrial [13.x] Fix trialEndsAt more closely represents onTrial Apr 15, 2021
@driesvints
Copy link
Member

@benjamindoe Can you confirm this doesn't breaks other tests?

@benjamindoe
Copy link
Contributor Author

All tests pass locally. Tested on 8 and 7.4.

@taylorotwell taylorotwell merged commit 2b570af into laravel:master Apr 15, 2021
@driesvints
Copy link
Member

Thanks @benjamindoe

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