fix dot

Author: QuentinGab

src/Collections/PhpTranslations.php

@@ -6,7 +6,6 @@
 
 use Elegantly\Translator\Drivers\PhpDriver;
 use Illuminate\Support\Arr;
-use Illuminate\Support\Collection;
 use Illuminate\Support\Enumerable;
 use Illuminate\Support\Str;
 
@@ -177,31 +176,29 @@ public function only($keys)
      */
     public static function toDot(array $values): static
     {
-        $translations = collect($values)
-            ->mapWithKeys(fn ($value, $key) => [static::prepareTranslations($key) => static::prepareTranslations($value)])
-            ->dot();
-
-        return new static($translations);
+        return new static(
+            Arr::dot(static::prepareTranslations($values))
+        );
     }
 
     /**
-     * @param  array<array-key, mixed>|Translations  $translations
-     * @return Collection<string, mixed>
+     * @param  Translations|array<array-key, mixed>  $translations
+     * @return array<array-key, mixed> $values
      */
-    public static function toUndot(Translations|array $translations): Collection
+    public static function toUndot(Translations|array $translations): array
     {
-        return collect($translations)
-            ->undot()
-            ->mapWithKeys(fn ($value, $key) => [static::unprepareTranslations($key) => static::unprepareTranslations($value)]);
+        $translations = $translations instanceof Translations ? $translations->all() : $translations;
+
+        return static::unprepareTranslations(Arr::undot((array) $translations));
     }
 
     /**
      * Dot in translations keys might break the initial array structure
      * To prevent that, we encode the dots in unicode
      */
-    public static function prepareTranslations(mixed $values): mixed
+    public static function prepareTranslations(mixed $values, bool $escape = false): mixed
     {
-        if (is_string($values)) {
+        if ($escape && is_string($values)) {
             return Str::replace('.', '&#46;', $values);
         }
 
@@ -215,7 +212,7 @@ public static function prepareTranslations(mixed $values): mixed
 
         return collect($values)
             ->mapWithKeys(fn ($value, $key) => [
-                static::prepareTranslations($key) => static::prepareTranslations($value),
+                static::prepareTranslations($key, true) => static::prepareTranslations($value),
             ])
             ->all();
     }
@@ -224,9 +221,9 @@ public static function prepareTranslations(mixed $values): mixed
      * Dot in translations keys might break the initial array structure
      * To prevent that, we encode the dots in unicode
      */
-    public static function unprepareTranslations(mixed $values): mixed
+    public static function unprepareTranslations(mixed $values, bool $unescape = false): mixed
     {
-        if (is_string($values)) {
+        if ($unescape && is_string($values)) {
             return Str::replace('&#46;', '.', $values);
         }
 
@@ -240,7 +237,7 @@ public static function unprepareTranslations(mixed $values): mixed
 
         return collect($values)
             ->mapWithKeys(fn ($value, $key) => [
-                static::unprepareTranslations($key) => static::unprepareTranslations($value),
+                static::unprepareTranslations($key, true) => static::unprepareTranslations($value),
             ])
             ->all();
     }

src/Drivers/PhpDriver.php

@@ -130,7 +130,7 @@ public function getTranslationsInNamespace(string $locale, string $namespace): a
 
     public function saveTranslations(string $locale, Translations $translations): Translations
     {
-        $undot = PhpTranslations::toUndot($translations)->all();
+        $undot = PhpTranslations::toUndot($translations);
 
         foreach ($undot as $namespace => $values) {
 

tests/Feature/PhpDriverTest.php

@@ -127,7 +127,7 @@
     $translations = $translator->getTranslations('fr_CA');
 
     expect($translations->toArray())->toBe([
-        'dotted.This key contains a dot. In the middle.And it . ha.s children.' => 'And it has children.',
+        'dotted.This key contains a dot. In the middle.And it . ha.s children.' => 'And it has children.',
     ]);
 
 });
@@ -142,7 +142,7 @@
     $translator->saveTranslations('fr_CA', $translations);
 
     expect($translator->getTranslations('fr_CA')->toArray())->toBe([
-        'dotted.This key contains a dot. In the middle.And it . ha.s children.' => 'And it has children.',
+        'dotted.This key contains a dot. In the middle.And it . ha.s children.' => 'And it has children.',
     ]);
 
 });

tests/Unit/PhpTranslationsTest.php

@@ -147,18 +147,18 @@
     ]);
 
     expect($translations->toArray())->toBe([
-        'This key contains a dot. In the middle.And it.has children.' => 'And it has children.',
+        'This key contains a dot. In the middle.And it.has children.' => 'And it has children.',
     ]);
 
 });
 
 it('decodes dot from unicode', function () {
 
     $translations = PhpTranslations::toUndot([
-        'This key contains a dot. In the middle.And it.has children.' => 'And it has children.',
+        'This key contains a dot. In the middle.And it.has children.' => 'And it has children.',
     ]);
 
-    expect($translations->toArray())->toBe([
+    expect($translations)->toBe([
         'This key contains a dot. In the middle' => [
             'And it.has children.' => 'And it has children.',
         ],