Merge pull request #2 from SolumDeSignum/dev

Dev

Author: Faks

composer.json

@@ -20,8 +20,8 @@
     ],
     "homepage": "https://github.com/solumdesignum/package-translator-loader",
     "require": {
-        "php": "^8.0|^8.1|^8.2",
-        "illuminate/support": "^9|^10"
+        "php": "^8.1|^8.2|^8.3",
+        "illuminate/support": "^10|^11"
     },
     "require-dev": {
         "phpunit/phpunit": "~8|~9|~10",

src/PackageTranslatorLoader.php

@@ -9,18 +9,15 @@
 use Illuminate\Translation\FileLoader;
 use Illuminate\Translation\Translator;
 
-use function app;
-use function config;
-
 class PackageTranslatorLoader
 {
     public array $config;
 
     public ?string $locale = null;
 
-    private string $translator;
+    public string $translator;
 
-    private Application $app;
+    public Application $app;
 
     public function __construct(
         Application $app,
@@ -40,7 +37,7 @@ public function __construct(
         $this->loadTranslations();
     }
 
-    private function localeSetter(?string $locale): void
+    public function localeSetter(?string $locale): void
     {
         if ($locale !== null) {
             $this->locale = $locale;
@@ -49,7 +46,7 @@ private function localeSetter(?string $locale): void
         }
     }
 
-    final public function setLocale(?string $locale = null): self
+    public function setLocale(?string $locale = null): self
     {
         $this->locale = $locale;
 
@@ -64,7 +61,7 @@ final public function setLocale(?string $locale = null): self
      *
      * @return void
      */
-    final public function loadTranslations(): void
+    public function loadTranslations(): void
     {
         $this->app->bind(
             $this->translator,
@@ -91,7 +88,7 @@ function ($app) {
         );
     }
 
-    private function loader(): FileLoader
+    public function loader(): FileLoader
     {
         $filesystem = new Filesystem();
         $resourcesLangPath = $this->config['packageRootPath'] . $this->config['loaderLangPath'];
@@ -100,7 +97,7 @@ private function loader(): FileLoader
         return new FileLoader($filesystem, $resourcesLangPath);
     }
 
-    private function locale(Application $app): string
+    public function locale(Application $app): string
     {
         return $app
             ->get('request')
@@ -109,7 +106,7 @@ private function locale(Application $app): string
             ) ?: $app->getLocale();
     }
 
-    final public function trans(): mixed
+    public function trans(): mixed
     {
         return app($this->translator);
     }

src/helpers.php

@@ -13,6 +13,7 @@
      * @return mixed
      * @throws ContainerExceptionInterface
      * @throws NotFoundExceptionInterface
+     * @throws Exception
      */
     function translator(string $translator = null, string $key = null): mixed
     {