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.5] show more meaningfull message when json translation file contains errors #22170

Merged
merged 5 commits into from
Nov 22, 2017

Conversation

tweichart
Copy link

  • currently there is a just a php exception tha tells the user that the second parameter for array_merge should be of type array
  • throws now a customized exception when json language file contains invalid json syntax
  • this should help the user to get a faster understanding of the error resulting in faster debugging
    (follow up PR to additional check for loaded language file using json format #22165)

Tobias Weichart added 4 commits November 22, 2017 09:50
* as the json file may contain invalid json this helps to ignore such files
* just merges the language array when it's valid for the rest of the files
* produced a php exception before, as the second parameter for array_merge was null due to invalid json in file
@tillkruss tillkruss changed the title show more meaningfull message when json translation file contains errors [5.5] show more meaningfull message when json translation file contains errors Nov 22, 2017
@taylorotwell taylorotwell merged commit 2a8bcc4 into laravel:5.5 Nov 22, 2017
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