Merge pull request #4 from ElegantEngineeringTech/dev

V2 new driver architecture
ElegantEngineeringTech · Nov 17, 2024 · 13be271 · 13be271
2 parents e5928b4 + a035876
commit 13be271
Show file tree

Hide file tree

Showing 42 changed files with 1,784 additions and 1,923 deletions.
diff --git a/README.md b/README.md
diff --git a/config/translator.php b/config/translator.php
@@ -1,7 +1,14 @@
 <?php
 
+use Elegantly\Translator\Drivers\PhpDriver;
+
 return [
 
+    /**
+     * Possible values are: 'php', 'json' or any class-string<Driver>
+     */
+    'driver' => PhpDriver::class,
+
     /*
     |--------------------------------------------------------------------------
     | Language Paths

diff --git a/phpstan.neon.dist b/phpstan.neon.dist
@@ -2,7 +2,7 @@ includes:
     - phpstan-baseline.neon
 
 parameters:
-    level: 5
+    level: 7
     paths:
         - src
         - config

diff --git a/src/Caches/SearchCodeCache.php b/src/Caches/SearchCodeCache.php
@@ -13,13 +13,19 @@ class SearchCodeCache
 {
     const FILENAME = 'translationsByFiles.php';
 
+    /**
+     * @var array<string, array{ created_at: int, translations: string[] }>
+     */
     protected ?array $value = null;
 
     public function __construct(public Filesystem $storage)
     {
         //
     }
 
+    /**
+     * @return array<string, array{ created_at: int, translations: string[] }>
+     */
     public function getValue(): ?array
     {
         if ($this->value) {
@@ -29,6 +35,9 @@ public function getValue(): ?array
         return $this->load();
     }
 
+    /**
+     * @return array<string, array{ created_at: int, translations: string[] }>
+     */
     public function load(): ?array
     {
         if ($this->storage->exists(static::FILENAME)) {

diff --git a/src/Collections/JsonTranslations.php b/src/Collections/JsonTranslations.php
@@ -2,64 +2,11 @@
 
 namespace Elegantly\Translator\Collections;
 
-use Illuminate\Support\Collection;
+use Elegantly\Translator\Drivers\JsonDriver;
 
-/**
- * @extends Collection<string, string|int|float|null>
- */
-final class JsonTranslations extends Collection implements TranslationsInterface
+class JsonTranslations extends Translations
 {
-    public function set(string|int|null $key, mixed $value): static
-    {
-        return $this->put($key, $value);
-    }
+    public string $driver = JsonDriver::class;
 
-    public function sanitize(): static
-    {
-        return $this;
-    }
-
-    public function sortNatural(): static
-    {
-        return $this->sortKeys(SORT_NATURAL);
-    }
-
-    public function toDotTranslations(bool $filter = false): Collection
-    {
-        return $this
-            ->toBase()
-            ->when(
-                $filter,
-                fn ($c) => $c->filter(fn ($value) => ! blank($value))
-            );
-    }
-
-    public function toTranslationsKeys(bool $filter = false): Collection
-    {
-        return $this->toDotTranslations($filter)->keys();
-    }
-
-    public function toTranslationsValues(bool $filter = false): Collection
-    {
-        return $this->toDotTranslations($filter)->values();
-    }
-
-    public function diffTranslationsKeys(Collection $translations): Collection
-    {
-        $translationsKeys = $translations
-            ->dot()
-            ->filter(fn ($item) => ! blank($item))
-            ->keys()
-            ->toBase();
-
-        return $this
-            ->toTranslationsKeys()
-            ->diff($translationsKeys)
-            ->values();
-    }
-
-    public function toFile(): string
-    {
-        return $this->toJson(JSON_UNESCAPED_UNICODE | JSON_PRETTY_PRINT);
-    }
+    //
 }