Bugfix: File path handling for override (#46)

stefro · Oct 19, 2023 · 6506dfc · 6506dfc
1 parent c4dc742
commit 6506dfc
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/src/LangCountry.php b/src/LangCountry.php
@@ -313,10 +313,11 @@ private function getDataFromFile(?string $lang_country): array
             throw new Exception('The lang_country session is not set');
         }
 
-        if (file_exists(lang_path('lang-country-overrides') . $lang_country . '.json')) {
-            $resource = lang_path('lang-country-overrides') . $lang_country . '.json';
+        $filename = $lang_country . '.json';
+        if (file_exists(lang_path('lang-country-overrides/' . $filename))) {
+            $resource = lang_path('lang-country-overrides/' . $filename);
         } else {
-            $resource = __DIR__ . '/LangCountryData/' . $lang_country . '.json';
+            $resource = __DIR__ . '/LangCountryData/' . $filename;
         }
 
         return json_decode(file_get_contents($resource), true);

diff --git a/tests/Feature/LangCountry/LangCountryTest.php b/tests/Feature/LangCountry/LangCountryTest.php
@@ -301,12 +301,13 @@ function ($fallbackBasedOnCurrentLocale, $langCountrySession, $appLocale, $expec
 
     $file = __DIR__ . '/../../Support/Files/lang-country-overrides/nl-NL.json';
     $dir = lang_path('lang-country-overrides');
+    $filename = 'nl-NL.json';
 
     if (! is_dir($dir)) {
         mkdir($dir);
     }
     if (! is_file($dir)) {
-        $dest = $dir . 'nl-NL.json';
+        $dest = lang_path('lang-country-overrides/' . $filename);
     }
 
     copy($file, $dest);
@@ -316,7 +317,7 @@ function ($fallbackBasedOnCurrentLocale, $langCountrySession, $appLocale, $expec
         ->and(\LangCountry::name())->toEqual('Nederlands override!');
 
     // Remove test files from testbench
-    unlink(lang_path('lang-country-overrides') . 'nl-NL.json');
+    unlink(lang_path('lang-country-overrides/' . $filename));
     rmdir(lang_path('lang-country-overrides'));
 });