Fixed test validation bug

Laravel-Lang · May 19, 2021 · baa494f · baa494f
1 parent 1380030
commit baa494f
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 13 deletions.
diff --git a/app/main/Services/Filesystem/Base.php b/app/main/Services/Filesystem/Base.php
@@ -3,7 +3,7 @@
 namespace LaravelLang\Lang\Services\Filesystem;
 
 use Helldar\Support\Concerns\Makeable;
-use Helldar\Support\Facades\Helpers\Arr;
+use Helldar\Support\Facades\Helpers\Ables\Arrayable;
 use LaravelLang\Lang\Application;
 use LaravelLang\Lang\Concerns\Storable;
 use LaravelLang\Lang\Contracts\Filesystem;
@@ -31,8 +31,9 @@ protected function correctValues(array $items): array
     {
         $callback = static fn ($value) => stripslashes($value);
 
-        $items = Arr::map($items, $callback, true);
-
-        return Arr::renameKeys($items, $callback);
+        return Arrayable::of($items)
+            ->map($callback, true)
+            ->renameKeys($callback)
+            ->get();
     }
 }
diff --git a/app/tests/TestCase.php b/app/tests/TestCase.php
@@ -3,6 +3,7 @@
 namespace Tests;
 
 use Helldar\PrettyArray\Services\File;
+use Helldar\Support\Facades\Helpers\Ables\Arrayable;
 use Helldar\Support\Facades\Helpers\Arr;
 use Helldar\Support\Facades\Helpers\Filesystem\Directory;
 use Helldar\Support\Facades\Helpers\Filesystem\File as Filesystem;
@@ -27,11 +28,11 @@ protected function source(string $filename): array
             $custom     = Arr::get($content, 'custom', []);
             $attributes = Arr::get($content, 'attributes', []);
 
-            $content = Arr::except($content, ['custom', 'attributes']);
-
-            $content = Arr::ksort($content);
-
-            return array_merge($content, compact('custom', 'attributes'));
+            return Arrayable::of($content)
+                ->except(['custom', 'attributes'])
+                ->ksort()
+                ->merge(compact('custom', 'attributes'))
+                ->get();
         }
 
         return Arr::ksort($content);
@@ -106,8 +107,9 @@ protected function correctValues(array $items): array
     {
         $callback = static fn ($value) => stripslashes($value);
 
-        $items = Arr::map($items, $callback, true);
-
-        return Arr::renameKeys($items, $callback);
+        return Arrayable::of($items)
+            ->map($callback, true)
+            ->renameKeys($callback)
+            ->get();
     }
 }
diff --git a/composer.json b/composer.json
@@ -24,7 +24,7 @@
     "require-dev": {
         "php": "^8.0",
         "andrey-helldar/pretty-array": "^2.3",
-        "andrey-helldar/support": "^3.13",
+        "andrey-helldar/support": "^3.16.1",
         "guzzlehttp/guzzle": "^7.3",
         "laravel/fortify": "^1.7",
         "laravel/jetstream": "^2.3",