New lang path for Laravel 9.x (#33)

Author: Amir Rami

Diff for: composer.json

@@ -29,7 +29,10 @@
     "autoload": {
         "psr-4": {
             "Amirami\\Localizator\\": "src"
-        }
+        },
+        "files": [
+            "src/helpers.php"
+        ]
     },
     "autoload-dev": {
         "psr-4": {

Diff for: 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 for: 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 for: 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 for: 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 for: 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 for: 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 for: 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 for: 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
         );
     }