From c62696f42ec691a065ab743d157954afa3af2d1b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dani=C3=ABl?= Date: Wed, 18 Oct 2023 17:20:47 +0200 Subject: [PATCH] solve MissingAttributeException --- .gitignore | 2 ++ src/Translatable/Traits/Relationship.php | 8 ++------ src/Translatable/Translatable.php | 2 +- 3 files changed, 5 insertions(+), 7 deletions(-) diff --git a/.gitignore b/.gitignore index f792fcc0..e4960c3f 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,5 @@ /.phpunit.result.cache /build/ /coverage.clover +.DS_Store +.idea/* diff --git a/src/Translatable/Traits/Relationship.php b/src/Translatable/Traits/Relationship.php index 606368a6..860294a5 100644 --- a/src/Translatable/Traits/Relationship.php +++ b/src/Translatable/Traits/Relationship.php @@ -25,7 +25,7 @@ public function getRelationKey(): string */ public function getTranslationModelName(): string { - return $this->translationModel ?: $this->getTranslationModelNameDefault(); + return isset($this->translationModel) ? $this->translationModel : $this->getTranslationModelNameDefault(); } /** @@ -55,11 +55,7 @@ public function getTranslationModelNamespace(): ?string */ public function getTranslationRelationKey(): string { - if ($this->translationForeignKey) { - return $this->translationForeignKey; - } - - return $this->getForeignKey(); + return isset($this->translationForeignKey) ? $this->translationForeignKey : $this->getForeignKey(); } public function translation(): HasOne diff --git a/src/Translatable/Translatable.php b/src/Translatable/Translatable.php index 17800bd4..9d9fe7fa 100644 --- a/src/Translatable/Translatable.php +++ b/src/Translatable/Translatable.php @@ -171,7 +171,7 @@ public function getDefaultLocale(): ?string */ public function getLocaleKey(): string { - return $this->localeKey ?: config('translatable.locale_key', 'locale'); + return isset($this->localeKey) ? $this->localeKey : config('translatable.locale_key', 'locale'); } public function getNewTranslation(string $locale): Model