diff --git a/config/translation-linter.php b/config/translation-linter.php index f7c7417..4536475 100644 --- a/config/translation-linter.php +++ b/config/translation-linter.php @@ -113,7 +113,6 @@ */ 'fields' => [ 'locale' => true, - 'namespace' => false, 'key' => true, 'value' => true, ], diff --git a/src/Data/ResultObject.php b/src/Data/ResultObject.php index 3f14222..7873114 100644 --- a/src/Data/ResultObject.php +++ b/src/Data/ResultObject.php @@ -20,8 +20,7 @@ public function toArray() { return [ 'locale' => $this->locale, - 'namespace' => $this->namespaceHint, - 'key' => $this->key, + 'key' => $this->namespaceHintedKey, 'value' => $this->value, ]; } diff --git a/tests/.pest/snapshots/Commands/UnusedCommandTest/it_errors_with_default_no_filters.snap b/tests/.pest/snapshots/Commands/UnusedCommandTest/it_errors_with_default_no_filters.snap index 72b1826..8f5d3a7 100644 --- a/tests/.pest/snapshots/Commands/UnusedCommandTest/it_errors_with_default_no_filters.snap +++ b/tests/.pest/snapshots/Commands/UnusedCommandTest/it_errors_with_default_no_filters.snap @@ -1,29 +1,29 @@ ERROR 22 unused translations found. -+--------+-----------+------------------------------------+------------------------------+ -| Locale | Namespace | Key | Value | -+--------+-----------+------------------------------------+------------------------------+ -| en | example | Unused Vendor PHP Class | I am unused in php class | -| en | example | Unused Vendor Blade File | I am unused in blade | -| en | example | Unused Vendor Vue Component | I am unused in vue component | -| en | example | example.unused | I am unused in php class | -| en | example | example.blade.choice.unused | I am unused in blade | -| en | example | example.blade.lang.unused | I am unused in blade | -| en | example | example.vue.unused | I am unused in vue component | -| en | example | folder/example.unused | I am unused in php class | -| en | example | folder/example.blade.choice.unused | I am unused in blade | -| en | example | folder/example.blade.lang.unused | I am unused in blade | -| en | example | folder/example.vue.unused | I am unused in vue component | -| en | | Unused PHP Class | I am unused in php class | -| en | | Unused Blade File | I am unused in blade | -| en | | Unused Vue Component | I am unused in vue component | -| en | | example.unused | I am unused in php class | -| en | | example.blade.choice.unused | I am unused in blade | -| en | | example.blade.lang.unused | I am unused in blade | -| en | | example.vue.unused | I am unused in vue component | -| en | | folder/example.unused | I am unused in php class | -| en | | folder/example.blade.choice.unused | I am unused in blade | -| en | | folder/example.blade.lang.unused | I am unused in blade | -| en | | folder/example.vue.unused | I am unused in vue component | -+--------+-----------+------------------------------------+------------------------------+ ++--------+---------------------------------------------+------------------------------+ +| Locale | Key | Value | ++--------+---------------------------------------------+------------------------------+ +| en | Unused Vendor PHP Class | I am unused in php class | +| en | Unused Vendor Blade File | I am unused in blade | +| en | Unused Vendor Vue Component | I am unused in vue component | +| en | example::example.unused | I am unused in php class | +| en | example::example.blade.choice.unused | I am unused in blade | +| en | example::example.blade.lang.unused | I am unused in blade | +| en | example::example.vue.unused | I am unused in vue component | +| en | example::folder/example.unused | I am unused in php class | +| en | example::folder/example.blade.choice.unused | I am unused in blade | +| en | example::folder/example.blade.lang.unused | I am unused in blade | +| en | example::folder/example.vue.unused | I am unused in vue component | +| en | Unused PHP Class | I am unused in php class | +| en | Unused Blade File | I am unused in blade | +| en | Unused Vue Component | I am unused in vue component | +| en | example.unused | I am unused in php class | +| en | example.blade.choice.unused | I am unused in blade | +| en | example.blade.lang.unused | I am unused in blade | +| en | example.vue.unused | I am unused in vue component | +| en | folder/example.unused | I am unused in php class | +| en | folder/example.blade.choice.unused | I am unused in blade | +| en | folder/example.blade.lang.unused | I am unused in blade | +| en | folder/example.vue.unused | I am unused in vue component | ++--------+---------------------------------------------+------------------------------+ diff --git a/tests/.pest/snapshots/Commands/UnusedCommandTest/it_errors_with_multiple_locales_and_no_filters.snap b/tests/.pest/snapshots/Commands/UnusedCommandTest/it_errors_with_multiple_locales_and_no_filters.snap index 227335b..705e89a 100644 --- a/tests/.pest/snapshots/Commands/UnusedCommandTest/it_errors_with_multiple_locales_and_no_filters.snap +++ b/tests/.pest/snapshots/Commands/UnusedCommandTest/it_errors_with_multiple_locales_and_no_filters.snap @@ -1,43 +1,43 @@ ERROR 36 unused translations found. -+--------+-----------+------------------------------------+----------------------------------------------------+ -| Locale | Namespace | Key | Value | -+--------+-----------+------------------------------------+----------------------------------------------------+ -| en | example | Unused Vendor PHP Class | I am unused in php class | -| en | example | Unused Vendor Blade File | I am unused in blade | -| en | example | Unused Vendor Vue Component | I am unused in vue component | -| en | example | example.unused | I am unused in php class | -| en | example | example.blade.choice.unused | I am unused in blade | -| en | example | example.blade.lang.unused | I am unused in blade | -| en | example | example.vue.unused | I am unused in vue component | -| en | example | folder/example.unused | I am unused in php class | -| en | example | folder/example.blade.choice.unused | I am unused in blade | -| en | example | folder/example.blade.lang.unused | I am unused in blade | -| en | example | folder/example.vue.unused | I am unused in vue component | -| en | | Unused PHP Class | I am unused in php class | -| en | | Unused Blade File | I am unused in blade | -| en | | Unused Vue Component | I am unused in vue component | -| en | | example.unused | I am unused in php class | -| en | | example.blade.choice.unused | I am unused in blade | -| en | | example.blade.lang.unused | I am unused in blade | -| en | | example.vue.unused | I am unused in vue component | -| en | | folder/example.unused | I am unused in php class | -| en | | folder/example.blade.choice.unused | I am unused in blade | -| en | | folder/example.blade.lang.unused | I am unused in blade | -| en | | folder/example.vue.unused | I am unused in vue component | -| de | example | Unused Vendor PHP Class | Ich werde in einer PHP-Klasse nicht verwendet | -| de | example | Unused Vendor Blade File | Ich werde in Blade nicht verwendet | -| de | example | Unused Vendor Vue Component | Ich werde in einem Vue-Komponenten nicht verwendet | -| de | | Unused PHP Class | Ich werde in einer PHP-Klasse nicht verwendet | -| de | | Unused Blade File | Ich werde in Blade nicht verwendet | -| de | | Unused Vue Component | Ich werde in einem Vue-Komponenten nicht verwendet | -| de | | example.unused | Ich werde in einer PHP-Klasse nicht verwendet | -| de | | example.blade.choice.unused | Ich werde in Blade nicht verwendet | -| de | | example.blade.lang.unused | Ich werde in Blade nicht verwendet | -| de | | example.vue.unused | Ich werde in einem Vue-Komponenten nicht verwendet | -| de | | folder/example.unused | Ich werde in einer PHP-Klasse nicht verwendet | -| de | | folder/example.blade.choice.unused | Ich werde in Blade nicht verwendet | -| de | | folder/example.blade.lang.unused | Ich werde in Blade nicht verwendet | -| de | | folder/example.vue.unused | Ich werde in einem Vue-Komponenten nicht verwendet | -+--------+-----------+------------------------------------+----------------------------------------------------+ ++--------+---------------------------------------------+----------------------------------------------------+ +| Locale | Key | Value | ++--------+---------------------------------------------+----------------------------------------------------+ +| en | Unused Vendor PHP Class | I am unused in php class | +| en | Unused Vendor Blade File | I am unused in blade | +| en | Unused Vendor Vue Component | I am unused in vue component | +| en | example::example.unused | I am unused in php class | +| en | example::example.blade.choice.unused | I am unused in blade | +| en | example::example.blade.lang.unused | I am unused in blade | +| en | example::example.vue.unused | I am unused in vue component | +| en | example::folder/example.unused | I am unused in php class | +| en | example::folder/example.blade.choice.unused | I am unused in blade | +| en | example::folder/example.blade.lang.unused | I am unused in blade | +| en | example::folder/example.vue.unused | I am unused in vue component | +| en | Unused PHP Class | I am unused in php class | +| en | Unused Blade File | I am unused in blade | +| en | Unused Vue Component | I am unused in vue component | +| en | example.unused | I am unused in php class | +| en | example.blade.choice.unused | I am unused in blade | +| en | example.blade.lang.unused | I am unused in blade | +| en | example.vue.unused | I am unused in vue component | +| en | folder/example.unused | I am unused in php class | +| en | folder/example.blade.choice.unused | I am unused in blade | +| en | folder/example.blade.lang.unused | I am unused in blade | +| en | folder/example.vue.unused | I am unused in vue component | +| de | Unused Vendor PHP Class | Ich werde in einer PHP-Klasse nicht verwendet | +| de | Unused Vendor Blade File | Ich werde in Blade nicht verwendet | +| de | Unused Vendor Vue Component | Ich werde in einem Vue-Komponenten nicht verwendet | +| de | Unused PHP Class | Ich werde in einer PHP-Klasse nicht verwendet | +| de | Unused Blade File | Ich werde in Blade nicht verwendet | +| de | Unused Vue Component | Ich werde in einem Vue-Komponenten nicht verwendet | +| de | example.unused | Ich werde in einer PHP-Klasse nicht verwendet | +| de | example.blade.choice.unused | Ich werde in Blade nicht verwendet | +| de | example.blade.lang.unused | Ich werde in Blade nicht verwendet | +| de | example.vue.unused | Ich werde in einem Vue-Komponenten nicht verwendet | +| de | folder/example.unused | Ich werde in einer PHP-Klasse nicht verwendet | +| de | folder/example.blade.choice.unused | Ich werde in Blade nicht verwendet | +| de | folder/example.blade.lang.unused | Ich werde in Blade nicht verwendet | +| de | folder/example.vue.unused | Ich werde in einem Vue-Komponenten nicht verwendet | ++--------+---------------------------------------------+----------------------------------------------------+ diff --git a/tests/Commands/UnusedCommandTest.php b/tests/Commands/UnusedCommandTest.php index a0f524b..d4006a3 100644 --- a/tests/Commands/UnusedCommandTest.php +++ b/tests/Commands/UnusedCommandTest.php @@ -19,7 +19,6 @@ }); it('errors with default no filters', function () { - config()->set('translation-linter.unused.fields.namespace', true); config()->set('translation-linter.unused.filters', []); withoutMockingConsoleOutput(); @@ -41,7 +40,6 @@ it('errors with default no fields', function () { config()->set('translation-linter.unused.fields.locale', false); - config()->set('translation-linter.unused.fields.namespace', false); config()->set('translation-linter.unused.fields.key', false); config()->set('translation-linter.unused.fields.value', false); @@ -63,7 +61,6 @@ it('errors with multiple locales and no filters', function () { config()->set('translation-linter.lang.locales', ['en', 'de']); - config()->set('translation-linter.unused.fields.namespace', true); config()->set('translation-linter.unused.filters', []); withoutMockingConsoleOutput(); @@ -75,7 +72,6 @@ it('generates baseline file then successfully ignores baseline keys', function () { config()->set('translation-linter.lang.locales', ['en', 'de']); - config()->set('translation-linter.unused.fields.namespace', true); config()->set('translation-linter.unused.filters', [IgnoreKeysFromUnusedBaselineFileFilter::class]); withoutMockingConsoleOutput();