Validate getTranslation function for avoiding errors #64
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
freekmurze
requested changes
Mar 4, 2018
src/LanguageLine.php
Outdated
| @@ -53,7 +53,11 @@ public static function getCacheKey(string $group, string $locale): string | |||
| */ | |||
| public function getTranslation(string $locale): string | |||
| { | |||
| return $this->text[$locale] ?? $this->text[config('app.fallback_locale')]; | |||
| if(isset($this->text[$locale]) && !is_array($this->text[$locale])) | |||
There was a problem hiding this comment.
I don't like to have if conditions without curly brackets as this can lead to some serious problems
|
Tests added :) Regards |
|
I'm not going to pull this in because If you need this behaviour set your own model in the config key and implement the functionality in your own custom model. |
|
And what about the error when you try to get a not existed translation? it is the expected behavior to get an Exception? |
|
I'd accept a PR (with tests) for that fix alone. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
#61 Validations added for avoiding errors when a translation doesnt exist