Merge pull request #38 from Astrotomic/fix-issue-37

fix fill() conflicting attribute/locale

Author: Gummibeer

src/Translatable/Translatable.php

@@ -96,12 +96,19 @@ public function deleteTranslations($locales = null): void
     public function fill(array $attributes)
     {
         foreach ($attributes as $key => $values) {
-            if ($this->getLocalesHelper()->has($key)) {
+            if (
+                $this->getLocalesHelper()->has($key)
+                && is_array($values)
+            ) {
                 $this->getTranslationOrNew($key)->fill($values);
                 unset($attributes[$key]);
             } else {
                 [$attribute, $locale] = $this->getAttributeAndLocale($key);
-                if ($this->isTranslationAttribute($attribute) and $this->getLocalesHelper()->has($locale)) {
+
+                if (
+                    $this->getLocalesHelper()->has($locale)
+                    && $this->isTranslationAttribute($attribute)
+                ) {
                     $this->getTranslationOrNew($locale)->fill([$attribute => $values]);
                     unset($attributes[$key]);
                 }

tests/TranslatableTest.php

@@ -818,4 +818,37 @@ public function test_translation_relation_not_found()
         $translation = Country::find(1)->translation;
         $this->assertNull($translation);
     }
+
+    public function test_can_fill_conflicting_attribute_locale()
+    {
+        config(['translatable.locales' => ['en', 'id']]);
+        $this->app->make(\Astrotomic\Translatable\Locales::class)->load();
+
+        $city = new class extends \Astrotomic\Translatable\Test\Model\City {
+            protected $guarded = [];
+            protected $table = 'cities';
+            public $translationModel = \Astrotomic\Translatable\Test\Model\CityTranslation::class;
+            public $translationForeignKey = 'city_id';
+        };
+
+        $city->fill([
+            'country_id' => Country::first()->getKey(),
+            'id' => [
+                'name' => 'id:my city',
+            ],
+            'en' => [
+                'name' => 'en:my city',
+            ],
+        ]);
+
+        $city->fill([
+            'id' => 100,
+        ]);
+
+        $city->save();
+
+        $this->assertEquals(100, $city->getKey());
+        $this->assertEquals('id:my city', $city->getTranslation('id', false)->name);
+        $this->assertEquals('en:my city', $city->getTranslation('en', false)->name);
+    }
 }