Add artisan test, Laravel 9 compat for Collection::dot()

src/Console/Commands/FindMissingTranslationStrings.php

@@ -8,6 +8,7 @@
 use Illuminate\Console\Command;
 use Illuminate\Contracts\Translation\Translator;
 use Illuminate\Filesystem\Filesystem;
+use Illuminate\Support\Arr;
 use Illuminate\Support\Collection;
 use Illuminate\Support\Str;
 use Symfony\Component\Console\Formatter\OutputFormatter;
@@ -131,21 +132,31 @@ protected function printErrors(array $errors, OutputInterface $output): void
      * @return \Illuminate\Support\Collection
      */
     protected function findInArray(string $baseLocale, mixed $locale)
+
     {
         if ($baseLocale === $locale) {
             return Collection::empty();
         }
-        return Collection::make($this->files->files(lang_path($baseLocale)))
-            ->mapWithKeys(function (SplFileInfo $file) {
-                return [$file->getFilenameWithoutExtension() => $this->translator->get($file->getFilenameWithoutExtension())];
-            })
-            ->dot()
-            ->keys()
+
+        $data = Collection::make($this->translator->get('*'));
+
+        if ($this->files->exists(lang_path($baseLocale))) {
+            $data = $data->merge(
+                Arr::dot(
+                    Collection::make($this->files->files(lang_path($baseLocale)))
+                        ->mapWithKeys(function (SplFileInfo $file) {
+                            return [$file->getFilenameWithoutExtension() => $this->translator->get($file->getFilenameWithoutExtension())];
+                        })
+                        ->toArray()
+                )
+            );
+        }
+
+        return $data->keys()
             ->filter(function ($key) use ($locale) {
                 return !$this->translator->hasForLocale($key, $locale);
             });
     }
-
     /**
      * @return mixed
      */
@@ -161,4 +172,4 @@ protected function collectFiles()
                 return Str::endsWith($file->getExtension(), 'php');
             });
     }
-}
+}

tests/Console/Commands/FindMissingTranslationStringsTest.php

@@ -0,0 +1,47 @@
+<?php
+
+namespace CodingSocks\LostInTranslation\Tests\Console\Commands;
+
+use CodingSocks\LostInTranslation\LostInTranslationServiceProvider;
+use CodingSocks\LostInTranslation\Tests\TestCase;
+use Illuminate\Config\Repository;
+use Illuminate\Support\Facades\Artisan;
+
+class FindMissingTranslationStringsTest extends TestCase
+{
+    public function testBasicCommand(): void
+    {
+        $exit_code = $this
+            ->withoutMockingConsoleOutput()
+            ->artisan('lost-in-translation:find ja --no-progress --sorted');
+
+        $output = Artisan::output();
+
+        $this->assertSame("foobar\nglobal_key\nmessages.namespaced_key\n", $output);
+        $this->assertSame(0, $exit_code);
+    }
+
+    public function testMissingLocale(): void
+    {
+        $exit_code = $this
+            ->withoutMockingConsoleOutput()
+            ->artisan('lost-in-translation:find zh --no-progress --sorted');
+
+        $output = Artisan::output();
+
+        $this->assertSame("foobar\nglobal_key\nkey_in_both\nmessages.namespaced_key\n", $output);
+        $this->assertSame(0, $exit_code);
+    }
+
+    public function defineEnvironment($app)
+    {
+        $appPath = __DIR__ . '/../../application';
+        $app->useLangPath($appPath . '/lang');
+
+        tap($app['config'], static function (Repository $config) use ($appPath) {
+            $config->set('lost-in-translation.paths', [
+                $appPath . '/resources/views'
+            ]);
+        });
+    }
+}

tests/application/lang/en.json

@@ -0,0 +1,4 @@
+{
+  "global_key": "this is a global key",
+  "key_in_both": "both should have this key"
+}

tests/application/lang/en/messages.php

@@ -0,0 +1,3 @@
+<?php return [
+    'namespaced_key' => 'this is a namespaced key',
+];

tests/application/lang/ja.json

@@ -0,0 +1,4 @@
+{
+  "another_global_key": "this is another global key",
+  "key_in_both": "both should have this key"
+}

tests/application/lang/ja/messages.php

@@ -0,0 +1,3 @@
+<?php return [
+    'another_namespaced_key' => 'this is another namespaced key',
+];

tests/application/resources/views/sample.blade.php

@@ -0,0 +1 @@
+{{ __('foobar') }}