use fallback in attributesToArray (#503)

* use fallback in attributesToArray #448 * fix empty line * define locale that's not present * fix getAttributeOrFallback() * fix php cs
dimsav · Jul 24, 2018 · 476e0ea · 476e0ea
1 parent 35b3837
commit 476e0ea
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 9 deletions.
diff --git a/src/Translatable/Translatable.php b/src/Translatable/Translatable.php
@@ -162,17 +162,23 @@ private function usePropertyFallback()
      */
     private function getAttributeOrFallback($locale, $attribute)
     {
-        $value = $this->getTranslation($locale)->$attribute;
+        $translation = $this->getTranslation($locale);
 
         if (
-            empty($value) &&
-            $this->usePropertyFallback() &&
-            ($fallback = $this->getTranslation($this->getFallbackLocale(), true))
+            (
+                ! $translation instanceof Model ||
+                empty($translation->$attribute)
+            ) &&
+            $this->usePropertyFallback()
         ) {
-            return $fallback->$attribute;
+            $translation = $this->getTranslation($this->getFallbackLocale(), true);
         }
 
-        return $value;
+        if ($translation instanceof Model) {
+            return $translation->$attribute;
+        }
+
+        return null;
     }
 
     /**
@@ -723,9 +729,7 @@ public function attributesToArray()
                 continue;
             }
 
-            if ($translations = $this->getTranslation()) {
-                $attributes[$field] = $translations->$field;
-            }
+            $attributes[$field] = $this->getAttributeOrFallback(null, $field);
         }
 
         return $attributes;

diff --git a/tests/TranslatableTest.php b/tests/TranslatableTest.php
@@ -422,6 +422,7 @@ public function test_fallback_for_country_based_locales_with_no_base_locale()
 
     public function test_to_array_and_fallback_with_country_based_locales_enabled()
     {
+        $this->app->config->set('translatable.locale', 'en-GB');
         $this->app->config->set('translatable.use_fallback', true);
         $this->app->config->set('translatable.fallback_locale', 'fr');
         $this->app->config->set('translatable.locales', ['en' => ['GB'], 'fr']);