Merge pull request #5 from SolumDeSignum/dev

Dev

Author: Faks

composer.json

@@ -39,7 +39,7 @@
     },
     "autoload-dev": {
         "psr-4": {
-            "SolumDeSignum\\PackageTranslatorLoader\\Tests\\": "tests"
+            "SolumDeSignum\\PackageTranslatorLoader\\Tests\\": "tests/"
         }
     },
     "extra": {

src/PackageTranslatorLoader.php

@@ -8,20 +8,18 @@
 use Illuminate\Filesystem\Filesystem;
 use Illuminate\Translation\FileLoader;
 use Illuminate\Translation\Translator;
+use Psr\Container\ContainerExceptionInterface;
+use Psr\Container\NotFoundExceptionInterface;
 
 class PackageTranslatorLoader
 {
-    public array $config;
-
     public ?string $locale = null;
 
     public string $translator;
 
-    public Application $app;
-
     public function __construct(
-        Application $app,
-        array $config = [
+        public Application $app,
+        public array $config = [
             'translator' => 'package-translation-loader.translator',
             'nameSpace' => 'solumdesignum/package-translation-loader',
             'packageRootPath' => __DIR__ . '/..',
@@ -30,36 +28,26 @@ public function __construct(
         ],
         ?string $locale = null
     ) {
-        $this->app = $app;
-        $this->config = $config;
         $this->translator = $this->config['translator'];
         $this->localeSetter($locale);
         $this->loadTranslations();
     }
 
     public function localeSetter(?string $locale): void
     {
-        if ($locale !== null) {
-            $this->locale = $locale;
-        } else {
-            $this->setLocale();
-        }
+        $this->locale = $locale ?? $this->setLocale()->locale;
     }
 
     public function setLocale(?string $locale = null): self
     {
-        $this->locale = $locale;
-
+        $this->locale = $locale ?? $this->app->getLocale();
         return $this;
     }
 
     /**
      * Custom Translation Loader
-     *  When registering the translator component, we'll need to set the default
-     * locale as well as the fallback locale. So, we'll grab the application
-     * configuration so we can easily get both of these values from there.
-     *
-     * @return void
+     * Registers the translator component with the application.
+     * Sets the locale and fallback locale.
      */
     public function loadTranslations(): void
     {
@@ -68,44 +56,58 @@ public function loadTranslations(): void
             function ($app) {
                 $trans = new Translator(
                     $this->loader(),
-                    (string)($this->locale !== null
-                        ? $this->locale
-                        : $this->locale($app))
-                );
-                $this->locale !== null
-                    ? $this->locale
-                    : $trans->setFallback(
-                    $app['config']['app.fallback_locale']
+                    $this->locale ?? $this->locale($app)
                 );
+                if ($this->locale !== null) {
+                    $trans->setFallback($app['config']['app.fallback_locale']);
+                }
                 $trans->addNamespace(
                     $this->config['nameSpace'],
-                    __DIR__ .
-                    $this->config['loadLangPath']
+                    $this->config['packageRootPath'] . $this->config['loadLangPath']
                 );
 
                 return $trans;
             }
         );
     }
 
+    /**
+     * Creates and returns a FileLoader instance.
+     *
+     * @return FileLoader
+     */
     public function loader(): FileLoader
     {
         $filesystem = new Filesystem();
         $resourcesLangPath = $this->config['packageRootPath'] . $this->config['loaderLangPath'];
-        $filesystem->allFiles($resourcesLangPath);
+
+        if (!is_dir($resourcesLangPath)) {
+            throw new \RuntimeException("Translation directory not found: $resourcesLangPath");
+        }
 
         return new FileLoader($filesystem, $resourcesLangPath);
     }
 
+    /**
+     * Determines the locale from the request or defaults to the application locale.
+     *
+     * @param Application $app
+     * @return string
+     * @throws ContainerExceptionInterface
+     * @throws NotFoundExceptionInterface
+     */
     public function locale(Application $app): string
     {
-        return $app
-            ->get('request')
-            ->segment(
-                config('package-translator-loader.segment', 1)
-            ) ?: $app->getLocale();
+        return $app->get('request')
+            ->segment(config('package-translator-loader.segment', 1))
+            ?: $app->getLocale();
     }
 
+    /**
+     * Retrieves the translator instance from the service container.
+     *
+     * @return mixed
+     */
     public function trans(): mixed
     {
         return app($this->translator);

tests/Feature/PackageTranslatorLoaderFeatureTest.php

@@ -0,0 +1,86 @@
+<?php
+
+declare(strict_types=1);
+
+namespace SolumDeSignum\PackageTranslatorLoader\Tests\Feature;
+
+use Illuminate\Foundation\Application;
+use Illuminate\Support\Facades\Config;
+use Orchestra\Testbench\TestCase;
+use SolumDeSignum\PackageTranslatorLoader\PackageTranslatorLoaderServiceProvider;
+
+class PackageTranslatorLoaderFeatureTest extends TestCase
+{
+    /**
+     * @test
+     */
+    public function itTranslatesTextInEnglish(): void
+    {
+        $translator = $this->app->get('package-translator-loader');
+        $translator->setLocale('en');
+        $translation = $translator->trans()->get('package-translator-loader.run');
+
+        $this->assertEquals('I am running.', $translation);
+    }
+
+    /**
+     * @test
+     */
+    public function itTranslatesTextInLatvian(): void
+    {
+        $translator = $this->app->get('package-translator-loader');
+        $translator->setLocale('lv');
+        $translation = $translator->trans()->get('package-translator-loader.run');
+
+        $this->assertEquals('Es strādāju.', $translation);
+    }
+
+    /**
+     * @test
+     */
+    public function itSetsAndRetrievesLocaleCorrectly(): void
+    {
+        $translator = $this->app->get('package-translator-loader');
+        $translator->setLocale('fr');
+
+        $this->assertEquals('fr', $translator->locale);
+    }
+
+    /**
+     * @test
+     */
+    public function itFallsBackToDefaultLocale(): void
+    {
+        Config::set('app.fallback_locale', 'en');
+
+        $translator = $this->app->get('package-translator-loader');
+        $translator->setLocale('invalid-locale');
+        $translation = $translator->trans()->get('package-translator-loader.run');
+
+        $this->assertEquals('I am running.', $translation);
+    }
+
+    /**
+     * @test
+     */
+    public function itUsesDefaultLocaleWhenNoLocaleIsSet(): void
+    {
+        $translator = $this->app->get('package-translator-loader');
+        $translator->setLocale(null); // Or leave it unset
+
+        $translation = $translator->trans()->get('package-translator-loader.run');
+        $this->assertEquals('I am running.', $translation); // Assuming default locale is 'en'
+    }
+
+    /**
+     * @param Application $app
+     *
+     * @return array
+     */
+    protected function getPackageProviders($app): array
+    {
+        return [
+            PackageTranslatorLoaderServiceProvider::class,
+        ];
+    }
+}