From 624d8df5aefc725a7226af086aab1ab39d7b8d25 Mon Sep 17 00:00:00 2001
From: Amir Rami <me@amirrami.com>
Date: Wed, 23 Feb 2022 16:16:33 +0100
Subject: [PATCH] New lang path for Laravel 9.x (#33)

---
 composer.json                                   |  5 ++++-
 src/Services/Collectors/DefaultKeyCollector.php |  6 +++---
 src/Services/Collectors/JsonKeyCollector.php    |  2 +-
 src/Services/Writers/DefaultWriter.php          |  2 +-
 src/Services/Writers/JsonWriter.php             |  2 +-
 src/helpers.php                                 | 12 ++++++++++++
 tests/Concerns/CreatesTestFiles.php             |  8 ++++----
 tests/Concerns/ImportsLangFiles.php             |  2 +-
 tests/TestCase.php                              |  2 +-
 9 files changed, 28 insertions(+), 13 deletions(-)
 create mode 100644 src/helpers.php

diff --git a/composer.json b/composer.json
index d6bd9f9..ac6b5c4 100644
--- a/composer.json
+++ b/composer.json
@@ -29,7 +29,10 @@
     "autoload": {
         "psr-4": {
             "Amirami\\Localizator\\": "src"
-        }
+        },
+        "files": [
+            "src/helpers.php"
+        ]
     },
     "autoload-dev": {
         "psr-4": {
diff --git a/src/Services/Collectors/DefaultKeyCollector.php b/src/Services/Collectors/DefaultKeyCollector.php
index cc3db8c..f675d2d 100644
--- a/src/Services/Collectors/DefaultKeyCollector.php
+++ b/src/Services/Collectors/DefaultKeyCollector.php
@@ -36,7 +36,7 @@ public function getTranslated(string $locale): Collection
      */
     protected function getFiles(string $locale): Collection
     {
-        $dir = resource_path('lang'.DIRECTORY_SEPARATOR.$locale);
+        $dir = lang_path($locale);
 
         if (! file_exists($dir)) {
             if (! mkdir($dir, 0755) && ! is_dir($dir)) {
@@ -59,8 +59,8 @@ protected function getFiles(string $locale): Collection
      */
     protected function requireFile(string $locale, SplFileInfo $fileInfo): array
     {
-        return require resource_path(
-            'lang'.DIRECTORY_SEPARATOR.$locale.DIRECTORY_SEPARATOR.$fileInfo->getRelativePathname()
+        return require lang_path(
+            $locale.DIRECTORY_SEPARATOR.$fileInfo->getRelativePathname()
         );
     }
 }
diff --git a/src/Services/Collectors/JsonKeyCollector.php b/src/Services/Collectors/JsonKeyCollector.php
index 2f913e3..0c8a3a7 100644
--- a/src/Services/Collectors/JsonKeyCollector.php
+++ b/src/Services/Collectors/JsonKeyCollector.php
@@ -14,7 +14,7 @@ class JsonKeyCollector implements Collectable
      */
     public function getTranslated(string $locale): Collection
     {
-        $file = resource_path('lang'.DIRECTORY_SEPARATOR."{$locale}.json");
+        $file = lang_path("{$locale}.json");
 
         if (! file_exists($file)) {
             return new JsonKeyCollection;
diff --git a/src/Services/Writers/DefaultWriter.php b/src/Services/Writers/DefaultWriter.php
index 95b038f..61863f6 100644
--- a/src/Services/Writers/DefaultWriter.php
+++ b/src/Services/Writers/DefaultWriter.php
@@ -73,6 +73,6 @@ protected function exportArray(array $contents): string
      */
     protected function getFile(string $locale, string $fileName): string
     {
-        return resource_path('lang'.DIRECTORY_SEPARATOR.$locale.DIRECTORY_SEPARATOR.$fileName.'.php');
+        return lang_path($locale.DIRECTORY_SEPARATOR.$fileName.'.php');
     }
 }
diff --git a/src/Services/Writers/JsonWriter.php b/src/Services/Writers/JsonWriter.php
index e7930c2..1f5ca4c 100644
--- a/src/Services/Writers/JsonWriter.php
+++ b/src/Services/Writers/JsonWriter.php
@@ -14,7 +14,7 @@ class JsonWriter implements Writable
      */
     public function put(string $locale, Translatable $keys): void
     {
-        $file = resource_path('lang'.DIRECTORY_SEPARATOR."{$locale}.json");
+        $file = lang_path("{$locale}.json");
 
         (new Filesystem)->put(
             $file,
diff --git a/src/helpers.php b/src/helpers.php
new file mode 100644
index 0000000..28221d7
--- /dev/null
+++ b/src/helpers.php
@@ -0,0 +1,12 @@
+<?php
+
+if (! function_exists('lang_path')) {
+    /**
+     * @param string $path
+     * @return string
+     */
+    function lang_path($path = '')
+    {
+        return resource_path('lang'.($path !== '' ? DIRECTORY_SEPARATOR.$path : ''));
+    }
+}
diff --git a/tests/Concerns/CreatesTestFiles.php b/tests/Concerns/CreatesTestFiles.php
index 5c67714..8233245 100644
--- a/tests/Concerns/CreatesTestFiles.php
+++ b/tests/Concerns/CreatesTestFiles.php
@@ -39,9 +39,9 @@ protected function createTestView(string $contents, string $fileName = 'test'):
      */
     protected function createTestLangFile(string $contents, string $fileName): void
     {
-        $this->createTestFile(
-            $contents,
-            'lang'.DIRECTORY_SEPARATOR.$fileName
+        file_put_contents(
+            lang_path($fileName),
+            $contents
         );
     }
 
@@ -67,7 +67,7 @@ protected function createTestJsonLangFile(array $contents, string $locale): void
     protected function createTestDefaultLangFile(array $contents, string $fileName, string $locale): void
     {
         $export = sprintf("<?php\n\nreturn %s;\n", var_export($contents, true));
-        $dir = resource_path('lang'.DIRECTORY_SEPARATOR.$locale);
+        $dir = lang_path($locale);
 
         if (! file_exists($dir) && ! mkdir($dir, 0755) && ! is_dir($dir)) {
             throw new RuntimeException(sprintf('Directory "%s" was not created', $dir));
diff --git a/tests/Concerns/ImportsLangFiles.php b/tests/Concerns/ImportsLangFiles.php
index bbdb11b..5047fce 100644
--- a/tests/Concerns/ImportsLangFiles.php
+++ b/tests/Concerns/ImportsLangFiles.php
@@ -10,7 +10,7 @@ trait ImportsLangFiles
      */
     protected function getLangFilePath(string $fileName): string
     {
-        return resource_path('lang'.DIRECTORY_SEPARATOR.$fileName);
+        return lang_path($fileName);
     }
 
     /**
diff --git a/tests/TestCase.php b/tests/TestCase.php
index f07f244..ee32597 100644
--- a/tests/TestCase.php
+++ b/tests/TestCase.php
@@ -66,7 +66,7 @@ public function getEnvironmentSetUp($app): void
     protected static function assertLangFileExists(string $fileName, string $message = ''): void
     {
         static::assertFileExists(
-            resource_path('lang'.DIRECTORY_SEPARATOR.$fileName),
+            lang_path($fileName),
             $message
         );
     }