Fix conflicts

MohmmedAshraf · Jan 19, 2024 · 8bdbb7e · 8bdbb7e
1 parent 45cb070
commit 8bdbb7e
Show file tree

Hide file tree

Showing 21 changed files with 481 additions and 385 deletions.
diff --git a/composer.json b/composer.json
@@ -36,6 +36,8 @@
         "nunomaduro/collision": "^7.0",
         "orchestra/testbench": "^8.0",
         "pestphp/pest": "^2.18",
+        "pestphp/pest-plugin-faker": "^2.0",
+        "pestphp/pest-plugin-laravel": "^2.2",
         "phpstan/extension-installer": "^1.1",
         "phpstan/phpstan-deprecation-rules": "^1.0",
         "phpstan/phpstan-phpunit": "^1.0",

diff --git a/database/factories/LanguageFactory.php b/database/factories/LanguageFactory.php
@@ -12,9 +12,9 @@ class LanguageFactory extends Factory
     public function definition(): array
     {
         return [
+            'rtl' => $this->faker->boolean(),
             'code' => $this->faker->randomElement(['en', 'nl', 'fr', 'de', 'es', 'it', 'pt', 'ru', 'ja', 'zh']),
             'name' => $this->faker->randomElement(['English', 'Dutch', 'French', 'German', 'Spanish', 'Italian', 'Portuguese', 'Russian', 'Japanese', 'Chinese']),
-            'rtl' => $this->faker->boolean(),
         ];
     }
 }
diff --git a/database/factories/TranslationFileFactory.php b/database/factories/TranslationFileFactory.php
@@ -13,8 +13,15 @@ public function definition(): array
     {
         return [
             'name' => $this->faker->randomElement(['app', 'auth', 'pagination', 'passwords', 'validation']),
-            'extension' => $this->faker->randomElement(['json', 'php']),
+            'extension' => 'php',
             'is_root' => false,
         ];
     }
+
+    public function json(): self
+    {
+        return $this->state([
+            'extension' => 'json',
+        ]);
+    }
 }
diff --git a/database/migrations/add_is_root_to_translation_files_table.php b/database/migrations/add_is_root_to_translation_files_table.php
@@ -6,24 +6,14 @@
 
 return new class() extends Migration
 {
-    /**
-     * Run the migrations.
-     *
-     * @return void
-     */
-    public function up()
+    public function up(): void
     {
         Schema::table('ltu_translation_files', function (Blueprint $table) {
             $table->boolean('is_root')->default(false)->after('extension');
         });
     }
 
-    /**
-     * Reverse the migrations.
-     *
-     * @return void
-     */
-    public function down()
+    public function down(): void
     {
         Schema::table('ltu_translation_files', function (Blueprint $table) {
             $table->dropColumn('is_root');

diff --git a/src/Actions/CopyPhrasesFromSourceAction.php b/src/Actions/CopyPhrasesFromSourceAction.php
@@ -3,6 +3,7 @@
 namespace Outhebox\TranslationsUI\Actions;
 
 use Outhebox\TranslationsUI\Models\Translation;
+use Outhebox\TranslationsUI\Models\TranslationFile;
 
 class CopyPhrasesFromSourceAction
 {
@@ -11,14 +12,24 @@ public static function execute(Translation $translation): void
         $sourceTranslation = Translation::where('source', true)->first();
 
         $sourceTranslation->phrases()->with('file')->get()->each(function ($sourcePhrase) use ($translation) {
+            $file = $sourcePhrase->file;
+
+            if ($file->is_root) {
+                $file = TranslationFile::firstOrCreate([
+                    'is_root' => true,
+                    'extension' => $file->extension,
+                    'name' => $translation->language->code,
+                ]);
+            }
+
             $translation->phrases()->create([
                 'value' => null,
                 'uuid' => str()->uuid(),
                 'key' => $sourcePhrase->key,
-                'group' => $sourcePhrase->group,
+                'group' => $file->name,
                 'phrase_id' => $sourcePhrase->id,
                 'parameters' => $sourcePhrase->parameters,
-                'translation_file_id' => $sourcePhrase->file->id,
+                'translation_file_id' => $file->id,
             ]);
         });
     }

diff --git a/src/Actions/SyncPhrasesAction.php b/src/Actions/SyncPhrasesAction.php
@@ -25,11 +25,16 @@ public static function execute(Translation $source, $key, $value, $locale, $file
             'source' => config('translations.source_language') === $locale,
         ]);
 
+        $isRoot = $file === $locale.'.json' || $file === $locale.'.php';
+
         $translationFile = TranslationFile::firstOrCreate([
             'name' => pathinfo($file, PATHINFO_FILENAME),
             'extension' => pathinfo($file, PATHINFO_EXTENSION),
+            'is_root' => $isRoot,
         ]);
 
+        $key = config('translations.include_file_in_key') && ! $isRoot ? "{$translationFile->name}.{$key}" : $key;
+
         $translation->phrases()->updateOrCreate([
             'key' => $key,
             'group' => $translationFile->name,

diff --git a/src/Http/Controllers/TranslationController.php b/src/Http/Controllers/TranslationController.php
@@ -72,8 +72,7 @@ public function store(Request $request): RedirectResponse
             'languages' => 'required|array',
         ]);
 
-        $selectedLanguageIds = $request->input('languages');
-        $languages = Language::whereIn('id', $selectedLanguageIds)->get();
+        $languages = Language::whereIn('id', $request->input('languages'))->get();
 
         foreach ($languages as $language) {
             CreateTranslationForLanguageAction::execute($language);

diff --git a/src/TranslationsManager.php b/src/TranslationsManager.php
@@ -12,7 +12,7 @@
 class TranslationsManager
 {
     public function __construct(
-        protected Filesystem $filesystem,
+        protected Filesystem $filesystem
     ) {
     }
 
@@ -106,10 +106,10 @@ public function export(): void
 
             foreach ($phrasesTree as $locale => $groups) {
                 foreach ($groups as $file => $phrases) {
-                    $path = lang_path($file);
+                    $path = lang_path("$locale/$file");
 
                     if (! $this->filesystem->isDirectory(dirname($path))) {
-                        $this->filesystem->makeDirectory(dirname($path), 0o755, true);
+                        $this->filesystem->makeDirectory(dirname($path), 0755, true);
                     }
 
                     if (! $this->filesystem->exists($path)) {

diff --git a/src/TranslationsUIServiceProvider.php b/src/TranslationsUIServiceProvider.php
@@ -31,6 +31,7 @@ public function configurePackage(Package $package): void
                 'create_contributors_table',
                 'create_contributor_languages_table',
                 'create_invites_table',
+                'add_is_root_to_translation_files_table',
             ])
             ->hasCommands([
                 PublishCommand::class,

diff --git a/tests/Helpers.php b/tests/Helpers.php
@@ -1,10 +1,10 @@
 <?php
 
-use Illuminate\Support\Str;
-use Illuminate\Support\Facades\File;
 use Brick\VarExporter\VarExporter;
+use Illuminate\Support\Facades\File;
+use Illuminate\Support\Str;
 
-function createDirectoryIfNotExits($path)
+function createDirectoryIfNotExits($path): void
 {
     // check if $path is a filename or a directory
     if (Str::contains($path, '.')) {
@@ -16,16 +16,16 @@ function createDirectoryIfNotExits($path)
     }
 }
 
-function createPhpLanguageFile($path, array $content)
+function createPhpLanguageFile($path, array $content): void
 {
     $path = lang_path($path);
 
     createDirectoryIfNotExits($path);
 
-    File::put($path, "<?php\n\nreturn " . VarExporter::export($content, VarExporter::TRAILING_COMMA_IN_ARRAY) . ';' . PHP_EOL);
+    File::put($path, "<?php\n\nreturn ".VarExporter::export($content, VarExporter::TRAILING_COMMA_IN_ARRAY).';'.PHP_EOL);
 }
 
-function createJsonLangaueFile($path, array $content)
+function createJsonLanguageFile($path, array $content): void
 {
     $path = lang_path($path);
 

diff --git a/tests/Http/Controllers/Auth/AuthenticatedSessionControllerTest.php b/tests/Http/Controllers/Auth/AuthenticatedSessionControllerTest.php
@@ -1,74 +1,55 @@
 <?php
 
-namespace Outhebox\TranslationsUI\Tests\Http\Controllers\Auth;
-
 use Illuminate\Support\Facades\Hash;
 use Illuminate\Validation\ValidationException;
 use Outhebox\TranslationsUI\Enums\RoleEnum;
 use Outhebox\TranslationsUI\Models\Contributor;
-use Outhebox\TranslationsUI\Tests\TestCase;
-
-class AuthenticatedSessionControllerTest extends TestCase
-{
-    /** @test */
-    public function login_page_can_be_rendered()
-    {
-        $this->get(route('ltu.login'))
-            ->assertStatus(200);
-
-    }
-
-    /** @test */
-    public function login_request_will_validate_email(): void
-    {
-        $response = $this->post(route('ltu.login.attempt'), [
-            'email' => 'not-an-email',
-            'password' => 'password',
-        ])->assertRedirect(route('ltu.login'));
-
-        $this->assertInstanceOf(ValidationException::class, $response->exception);
-    }
-
-    /** @test */
-    public function login_request_will_validate_password(): void
-    {
-        $response = $this->post(route('ltu.login.attempt'), [
-            'email' => $this->owner->email,
-            'password' => 'what-is-my-password',
-        ])->assertSessionHasErrors();
-
-        $this->assertInstanceOf(ValidationException::class, $response->exception);
-    }
-
-    /** @test */
-    public function login_request_will_authenticate_user(): void
-    {
-        $this->withoutExceptionHandling();
-
-        $user = Contributor::factory([
-            'role' => RoleEnum::owner,
-            'password' => Hash::make('password'),
-        ])->create();
-
-        $this->post(route('ltu.login.attempt'), [
-            'email' => $user->email,
-            'password' => 'password',
-        ])->assertRedirect(route('ltu.translation.index'));
-    }
-
-    /** @test */
-    public function authenticated_users_can_access_dashboard(): void
-    {
-        $this->actingAs($this->owner, 'translations')
-            ->get(route('ltu.login'))
-            ->assertRedirect(route('ltu.translation.index'));
-    }
 
-    /** @test */
-    public function authenticated_users_can_logout(): void
-    {
-        $this->actingAs($this->owner, 'translations')
-            ->get(route('ltu.logout'))
-            ->assertRedirect(route('ltu.login'));
-    }
-}
+it('login page can be rendered', function () {
+    $this->get(route('ltu.login'))
+        ->assertStatus(200);
+});
+
+it('login request will validate email', function () {
+    $response = $this->post(route('ltu.login.attempt'), [
+        'email' => 'not-an-email',
+        'password' => 'password',
+    ])->assertRedirect(route('ltu.login'));
+
+    expect($response->exception)->toBeInstanceOf(ValidationException::class);
+});
+
+it('login request will validate password', function () {
+    $response = $this->post(route('ltu.login.attempt'), [
+        'email' => $this->owner->email,
+        'password' => 'what-is-my-password',
+    ])->assertSessionHasErrors();
+
+    expect($response->exception)->toBeInstanceOf(ValidationException::class);
+});
+
+it('login request will authenticate user', function () {
+    $this->withoutExceptionHandling();
+
+    $user = Contributor::factory([
+        'role' => RoleEnum::owner,
+        'password' => Hash::make('password'),
+    ])->create();
+
+    $this->post(route('ltu.login.attempt'), [
+        'email' => $user->email,
+        'password' => 'password',
+    ])->assertRedirect(route('ltu.translation.index'));
+});
+
+it('authenticated users can access dashboard', function () {
+    $this->actingAs($this->owner, 'translations')
+        ->get(route('ltu.login'))
+        ->assertRedirect(route('ltu.translation.index'));
+});
+
+it('authenticated users can logout', function () {
+    $this->actingAs($this->owner, 'translations')
+        ->get(route('ltu.logout'))
+        ->assertRedirect(route('ltu.login'));
+});