Add version check for lang_path helper

spatie · Feb 22, 2022 · 9aa990a · 9aa990a · zupolgec · Mar 11, 2022
1 parent 1be0f3a
commit 9aa990a
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/src/PackageServiceProvider.php b/src/PackageServiceProvider.php
@@ -65,8 +65,13 @@ public function boot()
             }
 
             if ($this->package->hasTranslations) {
+                // Laravel 8.64 and up uses lang_path().
+                $path = (version_compare(app()->version(), "8.64") >= 0)
+                    ? lang_path("vendor/{$this->package->shortName()}")
+                    : resource_path("lang/vendor/{$this->package->shortName()}");
+
                 $this->publishes([
-                    $this->package->basePath('/../resources/lang') => lang_path("vendor/{$this->package->shortName()}"),
+                    $this->package->basePath('/../resources/lang') => $path,
                 ], "{$this->package->shortName()}-translations");
             }
 

diff --git a/tests/PackageServiceProviderTests/PackageTranslationsTest.php b/tests/PackageServiceProviderTests/PackageTranslationsTest.php
@@ -25,7 +25,12 @@ public function it_can_publish_the_translations()
         $this
             ->artisan('vendor:publish --tag=package-tools-translations')
             ->assertExitCode(0);
+
+        // Laravel 8.64 and up uses lang_path().
+        $path = (version_compare(app()->version(), "8.64") >= 0)
+            ? lang_path("vendor/package-tools/en/translations.php")
+            : resource_path("lang/vendor/package-tools/en/translations.php");
 
-        $this->assertFileExists(lang_path('vendor/package-tools/en/translations.php'));
+        $this->assertFileExists($path);
     }
 }