Revert "Keep null value"

This reverts commit abecffc.
spatie · Dec 6, 2023 · d6dc7c9 · d6dc7c9
1 parent 867223c
commit d6dc7c9
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 36 deletions.
diff --git a/src/HasTranslations.php b/src/HasTranslations.php
@@ -65,7 +65,7 @@ public function getTranslation(string $key, string $locale, bool $useFallbackLoc
 
         $translations = $this->getTranslations($key);
 
-        $translation = $translations[$normalizedLocale] ?? null;
+        $translation = $translations[$normalizedLocale] ?? '';
 
         $translatableConfig = app(Translatable::class);
 
@@ -101,20 +101,20 @@ public function getTranslationWithoutFallback(string $key, string $locale): mixe
         return $this->getTranslation($key, $locale, false);
     }
 
-    public function getTranslations(string $key = null, array $allowedLocales = null, bool $keepNullValues = true): array
+    public function getTranslations(string $key = null, array $allowedLocales = null): array
     {
         if ($key !== null) {
             $this->guardAgainstNonTranslatableAttribute($key);
 
             return array_filter(
                 json_decode($this->getAttributes()[$key] ?? '' ?: '{}', true) ?: [],
-                fn ($value, $locale) => $this->filterTranslations($value, $locale, $allowedLocales, $keepNullValues),
+                fn ($value, $locale) => $this->filterTranslations($value, $locale, $allowedLocales),
                 ARRAY_FILTER_USE_BOTH,
             );
         }
 
-        return array_reduce($this->getTranslatableAttributes(), function ($result, $item) use ($allowedLocales, $keepNullValues) {
-            $result[$item] = $this->getTranslations($item, $allowedLocales, $keepNullValues);
+        return array_reduce($this->getTranslatableAttributes(), function ($result, $item) use ($allowedLocales) {
+            $result[$item] = $this->getTranslations($item, $allowedLocales);
 
             return $result;
         });
@@ -204,7 +204,7 @@ public function forgetAllTranslations(string $locale): self
 
     public function getTranslatedLocales(string $key): array
     {
-        return array_keys($this->getTranslations($key, null, false));
+        return array_keys($this->getTranslations($key));
     }
 
     public function isTranslatableAttribute(string $key): bool
@@ -268,16 +268,14 @@ protected function normalizeLocale(string $key, string $locale, bool $useFallbac
         return $locale;
     }
 
-    protected function filterTranslations(mixed $value = null, string $locale = null, array $allowedLocales = null, bool $keepNullValues = true): bool
+    protected function filterTranslations(mixed $value = null, string $locale = null, array $allowedLocales = null): bool
     {
-        if (! $keepNullValues) {
-            if ($value === null) {
-                return false;
-            }
+        if ($value === null) {
+            return false;
+        }
 
-            if ($value === '') {
-                return false;
-            }
+        if ($value === '') {
+            return false;
         }
 
         if ($allowedLocales === null) {

diff --git a/tests/TranslatableTest.php b/tests/TranslatableTest.php
@@ -39,7 +39,7 @@
     $this->testModel->setTranslation('name', 'en', 'testValue_en');
     $this->testModel->save();
 
-    expect($this->testModel->getTranslation('name', 'fr', false))->toBe(null);
+    expect($this->testModel->getTranslation('name', 'fr', false))->toBe('');
 });
 
 it('will return fallback locale translation when getting an unknown locale and fallback is true', function () {
@@ -126,7 +126,7 @@
     $this->testModel->setTranslation('name', 'en', 'testValue_en');
     $this->testModel->save();
 
-    expect($this->testModel->getTranslationWithoutFallback('name', 'fr'))->toBe(null);
+    expect($this->testModel->getTranslationWithoutFallback('name', 'fr'))->toBe('');
 });
 
 it('will return an empty string when getting an unknown locale and fallback is empty', function () {
@@ -139,7 +139,7 @@
     $this->testModel->setTranslation('name', 'en', 'testValue_en');
     $this->testModel->save();
 
-    expect($this->testModel->getTranslation('name', 'fr'))->toBe(null);
+    expect($this->testModel->getTranslation('name', 'fr'))->toBe('');
 });
 
 it('can save a translated attribute', function () {
@@ -149,13 +149,6 @@
     expect($this->testModel->name)->toBe('testValue_en');
 });
 
-it('can save null value in a translated attribute', function () {
-    $this->testModel->setTranslation('name', 'en', null);
-    $this->testModel->save();
-
-    expect($this->testModel->name)->toBe(null);
-});
-
 it('can set translated values when creating a model', function () {
     $model = TestModel::create([
         'name' => ['en' => 'testValue_en'],
@@ -455,23 +448,13 @@ public function setNameAttribute($value)
 it('can check if an attribute has translation', function () {
     $this->testModel->setTranslation('name', 'en', 'testValue_en');
     $this->testModel->setTranslation('name', 'nl', null);
-    $this->testModel->setTranslation('name', 'de', null);
     $this->testModel->save();
 
     expect($this->testModel->hasTranslation('name', 'en'))->toBeTrue();
 
     expect($this->testModel->hasTranslation('name', 'pt'))->toBeFalse();
 });
 
-it('will return the same number of translations with the same values as saved', function () {
-    $this->testModel->setTranslation('name', 'en', 'testValue_en');
-    $this->testModel->setTranslation('name', 'nl', null);
-    $this->testModel->setTranslation('name', 'de', '');
-    $this->testModel->save();
-
-    expect($this->testModel->getTranslations('name'))->toEqual(['en' => 'testValue_en', 'nl' => null, 'de' => '']);
-});
-
 it('can correctly set a field when a mutator is defined', function () {
     $testModel = (new class () extends TestModel {
         public function setNameAttribute($value)
@@ -716,7 +699,7 @@ public function setAttributesExternally(array $attributes)
     $this->testModel->save();
 
     $this->testModel->setLocale('it');
-    expect($this->testModel->getTranslation('name', 'it', false))->toBe(null);
+    expect($this->testModel->getTranslation('name', 'it', false))->toBe('');
 });
 
 it('will return default fallback locale translation when getting an unknown locale with fallback any', function () {
@@ -777,7 +760,7 @@ public function setAttributesExternally(array $attributes)
 
     $model->setLocale('fr');
 
-    expect($model->name)->toBe(null);
+    expect($model->name)->toBe('');
 });
 
 it('can set fallback locale on model', function () {