v11.11.0

Astrotomic · Oct 10, 2022 · 14335e3 · 14335e3
1 parent 2a7e74a
commit 14335e3
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 2 deletions.
diff --git a/docs/changelog.md b/docs/changelog.md
@@ -2,6 +2,10 @@
 
 ## v11
 
+### v11.11.0
+
+- Change `\Astrotomic\Translatable\Traits\Relationship::translation()` relation to use the new `ofMany` - [#297](https://github.com/Astrotomic/laravel-translatable/pull/297)
+
 ### v11.10.0
 
 - Drop PHP7 support

diff --git a/src/Translatable/Traits/Relationship.php b/src/Translatable/Traits/Relationship.php
@@ -2,6 +2,7 @@
 
 namespace Astrotomic\Translatable\Traits;
 
+use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\Relations\HasMany;
 use Illuminate\Database\Eloquent\Relations\HasOne;
 
@@ -67,7 +68,7 @@ public function translation(): HasOne
             ->hasOne($this->getTranslationModelName(), $this->getTranslationRelationKey())
             ->ofMany([
                 $this->getTranslationRelationKey() => 'max',
-            ], function ($query) {
+            ], function (Builder $query): void {
                 $query->where($this->getLocaleKey(), $this->localeOrFallback());
             });
     }

diff --git a/tests/TranslatableTest.php b/tests/TranslatableTest.php
@@ -804,7 +804,10 @@ public function translation_relation(): void
         $this->app->make('config')->set('translatable.use_fallback', true);
         $this->app->setLocale('en');
 
-        $peas = factory(Vegetable::class)->create(['name:en' => 'Peas']);
+        $peas = factory(Vegetable::class)->create([
+            'name:en' => 'Peas',
+            'name:fr' => 'Pois',
+        ]);
 
         static::assertInstanceOf(VegetableTranslation::class, $peas->translation);
         static::assertEquals('en', $peas->translation->locale);
@@ -819,6 +822,7 @@ public function translation_relation_can_use_fallback_locale(): void
 
         $peas = factory(Vegetable::class)->create(['name:fr' => 'Pois']);
 
+        static::assertInstanceOf(VegetableTranslation::class, $peas->translation);
         static::assertEquals('fr', $peas->translation->locale);
     }