Merge pull request #366 from ChristofVerhoeven/prevent_loss_of_attribute_translations_with_subkeys

Prevent loss of attribute translations with subkeys

Author: andrey-helldar

src/Services/Filesystem/Php.php

@@ -19,6 +19,7 @@
 
 use DragonCode\PrettyArray\Services\File;
 use DragonCode\Support\Facades\Helpers\Arr;
+use DragonCode\Support\Facades\Helpers\Str;
 use DragonCode\Support\Helpers\Ables\Arrayable;
 use Illuminate\Support\Arr as IlluminateArr;
 
@@ -39,11 +40,9 @@ public function store(string $path, $content): string
     {
         $content = $this->sort($content);
 
-        $content = $this->expand($content);
-
-        if ($this->hasValidation($path)) {
-            $content = $this->validationSort($content);
-        }
+        $content = $this->hasValidation($path)
+            ? $this->expandValidation($content)
+            : $this->expand($content);
 
         $content = $this->format($content);
 
@@ -68,20 +67,28 @@ protected function expand(array $values): array
         return $result;
     }
 
-    protected function validationSort(array $items): array
+    protected function expandValidation(array $values): array
     {
-        $attributes = Arr::get($items, 'attributes');
+        $attributes = [];
+        $items      = [];
+
+        foreach ($values as $key => $value) {
+            if (Str::startsWith($key, "attributes.")) {
+                $attributeKey = explode('.', $key, 2)[1];
+                $attributes[$attributeKey] = $value;
+
+                continue;
+            }
+
+            IlluminateArr::set($items, $key, $value);
+        }
+
         $custom = Arr::get($items, 'custom');
 
         return Arr::of($items)
             ->except(['attributes', 'custom'])
-            ->when(! empty($attributes), fn (Arrayable $array) => $array->set('attributes', $this->correctNestedAttributes($attributes)))
+            ->when(! empty($attributes), fn (Arrayable $array) => $array->set('attributes', $attributes))
             ->when(! empty($custom), static fn (Arrayable $array) => $array->set('custom', $custom))
             ->toArray();
     }
-
-    protected function correctNestedAttributes(array $attributes): array
-    {
-        return Arr::flattenKeys($attributes);
-    }
 }

tests/Fixtures/lang/en/validation.php

@@ -30,10 +30,18 @@
         'last_name'  => 'last name',
         'age'        => 'age',
 
+        'timeplan'            => 'Timeplan',
+        'timeplan.monday'     => 'Monday',
         'timeplan.monday.0.0' => 'Monday (from)',
         'timeplan.monday.0.1' => 'Monday (to)',
         'timeplan.monday.1.0' => 'Monday (from)',
         'timeplan.monday.1.1' => 'Monday (to)',
+
+        // manually adding arrays works, but will be flattened in update process
+        'list' => [
+            'jobs'      => 'List of jobs',
+            'vehicles'  => 'List of vehicles',
+        ]
     ],
 
     'custom' => [

tests/Fixtures/lang/fr/validation.php

@@ -30,10 +30,18 @@
         'last_name'  => 'nom',
         'age'        => 'âge',
 
+        'timeplan'            => 'Horaire',
+        'timeplan.monday'     => 'Lundi',
         'timeplan.monday.0.0' => 'Lundi (de)',
         'timeplan.monday.0.1' => 'Lundi (à)',
         'timeplan.monday.1.0' => 'Lundi (de)',
         'timeplan.monday.1.1' => 'Lundi (à)',
+
+        // manually adding arrays works, but will be flattened in update process
+        'list' => [
+            'jobs'      => 'Liste des dossiers',
+            'vehicles'  => 'Liste des véhicules',
+        ]
     ],
 
     'custom' => [

tests/Unit/Console/InlineOff/Update/Success/NestedAttributesTest.php

@@ -51,6 +51,11 @@ public function testNested(): void
                 'first_name' => 'first name',
                 'last_name'  => 'last name',
 
+                'list.jobs'     => 'List of jobs',
+                'list.vehicles' => 'List of vehicles',
+
+                'timeplan'            => 'Timeplan',
+                'timeplan.monday'     => 'Monday',
                 'timeplan.monday.0.0' => 'Monday (from)',
                 'timeplan.monday.0.1' => 'Monday (to)',
                 'timeplan.monday.1.0' => 'Monday (from)',
@@ -80,6 +85,11 @@ public function testNested(): void
                 'first_name' => 'prénom',
                 'last_name'  => 'nom',
 
+                'list.jobs'     => 'Liste des dossiers',
+                'list.vehicles' => 'Liste des véhicules',
+
+                'timeplan'            => 'Horaire',
+                'timeplan.monday'     => 'Lundi',
                 'timeplan.monday.0.0' => 'Lundi (de)',
                 'timeplan.monday.0.1' => 'Lundi (à)',
                 'timeplan.monday.1.0' => 'Lundi (de)',

tests/Unit/Console/InlineOn/Update/Success/NestedAttributesTest.php

@@ -51,6 +51,11 @@ public function testNested(): void
                 'first_name' => 'first name',
                 'last_name'  => 'last name',
 
+                'list.jobs'     => 'List of jobs',
+                'list.vehicles' => 'List of vehicles',
+
+                'timeplan'            => 'Timeplan',
+                'timeplan.monday'     => 'Monday',
                 'timeplan.monday.0.0' => 'Monday (from)',
                 'timeplan.monday.0.1' => 'Monday (to)',
                 'timeplan.monday.1.0' => 'Monday (from)',
@@ -80,6 +85,11 @@ public function testNested(): void
                 'first_name' => 'prénom',
                 'last_name'  => 'nom',
 
+                'list.jobs'     => 'Liste des dossiers',
+                'list.vehicles' => 'Liste des véhicules',
+
+                'timeplan'            => 'Horaire',
+                'timeplan.monday'     => 'Lundi',
                 'timeplan.monday.0.0' => 'Lundi (de)',
                 'timeplan.monday.0.1' => 'Lundi (à)',
                 'timeplan.monday.1.0' => 'Lundi (de)',