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.7] Pass second argument to Lang::getFromJson as an array. #27351

Merged
merged 2 commits into from
Jan 29, 2019
Merged

[5.7] Pass second argument to Lang::getFromJson as an array. #27351

merged 2 commits into from
Jan 29, 2019

Conversation

owenconti
Copy link
Contributor

@owenconti owenconti commented Jan 29, 2019

Fix for #27349

  • Passes the expiration minutes as an array instead of an integer.

I'm willing to add tests, but I don't know where/how they should be structured.

Edit:

Another change I considered was to change the getFromJson() method to accept any type of argument, and then make sure it is transformed into an array before being used.

@owenconti owenconti changed the title Pass second argument to Lang::getFromJson as an array. [5.7] Pass second argument to Lang::getFromJson as an array. Jan 29, 2019
@taylorotwell taylorotwell merged commit 393fea8 into laravel:5.7 Jan 29, 2019
@owenconti owenconti deleted the bug/27349 branch January 29, 2019 22:23
@owenconti
Copy link
Contributor Author

Thanks for cleaning it up @taylorotwell

@edwinheij
Copy link

Thanks you both for fixing it. Was stuck for a moment...

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