Skip to content

Commit 608fb2e

Browse files
dmason30dmason30
authored
Always use unused namespace key in output (#9)
1 parent 3af5b3d commit 608fb2e

File tree

5 files changed

+67
-73
lines changed

5 files changed

+67
-73
lines changed

‎config/translation-linter.php‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,6 @@
113113
*/
114114
'fields' => [
115115
'locale' => true,
116-
'namespace' => false,
117116
'key' => true,
118117
'value' => true,
119118
],

‎src/Data/ResultObject.php‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,7 @@ public function toArray()
2020
{
2121
return [
2222
'locale' => $this->locale,
23-
'namespace' => $this->namespaceHint,
24-
'key' => $this->key,
23+
'key' => $this->namespaceHintedKey,
2524
'value' => $this->value,
2625
];
2726
}

‎tests/.pest/snapshots/Commands/UnusedCommandTest/it_errors_with_default_no_filters.snap‎

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,29 @@
11

22
ERROR 22 unused translations found.
33

4-
+--------+-----------+------------------------------------+------------------------------+
5-
| Locale | Namespace | Key | Value |
6-
+--------+-----------+------------------------------------+------------------------------+
7-
| en | example | Unused Vendor PHP Class | I am unused in php class |
8-
| en | example | Unused Vendor Blade File | I am unused in blade |
9-
| en | example | Unused Vendor Vue Component | I am unused in vue component |
10-
| en | example | example.unused | I am unused in php class |
11-
| en | example | example.blade.choice.unused | I am unused in blade |
12-
| en | example | example.blade.lang.unused | I am unused in blade |
13-
| en | example | example.vue.unused | I am unused in vue component |
14-
| en | example | folder/example.unused | I am unused in php class |
15-
| en | example | folder/example.blade.choice.unused | I am unused in blade |
16-
| en | example | folder/example.blade.lang.unused | I am unused in blade |
17-
| en | example | folder/example.vue.unused | I am unused in vue component |
18-
| en | | Unused PHP Class | I am unused in php class |
19-
| en | | Unused Blade File | I am unused in blade |
20-
| en | | Unused Vue Component | I am unused in vue component |
21-
| en | | example.unused | I am unused in php class |
22-
| en | | example.blade.choice.unused | I am unused in blade |
23-
| en | | example.blade.lang.unused | I am unused in blade |
24-
| en | | example.vue.unused | I am unused in vue component |
25-
| en | | folder/example.unused | I am unused in php class |
26-
| en | | folder/example.blade.choice.unused | I am unused in blade |
27-
| en | | folder/example.blade.lang.unused | I am unused in blade |
28-
| en | | folder/example.vue.unused | I am unused in vue component |
29-
+--------+-----------+------------------------------------+------------------------------+
4+
+--------+---------------------------------------------+------------------------------+
5+
| Locale | Key | Value |
6+
+--------+---------------------------------------------+------------------------------+
7+
| en | Unused Vendor PHP Class | I am unused in php class |
8+
| en | Unused Vendor Blade File | I am unused in blade |
9+
| en | Unused Vendor Vue Component | I am unused in vue component |
10+
| en | example::example.unused | I am unused in php class |
11+
| en | example::example.blade.choice.unused | I am unused in blade |
12+
| en | example::example.blade.lang.unused | I am unused in blade |
13+
| en | example::example.vue.unused | I am unused in vue component |
14+
| en | example::folder/example.unused | I am unused in php class |
15+
| en | example::folder/example.blade.choice.unused | I am unused in blade |
16+
| en | example::folder/example.blade.lang.unused | I am unused in blade |
17+
| en | example::folder/example.vue.unused | I am unused in vue component |
18+
| en | Unused PHP Class | I am unused in php class |
19+
| en | Unused Blade File | I am unused in blade |
20+
| en | Unused Vue Component | I am unused in vue component |
21+
| en | example.unused | I am unused in php class |
22+
| en | example.blade.choice.unused | I am unused in blade |
23+
| en | example.blade.lang.unused | I am unused in blade |
24+
| en | example.vue.unused | I am unused in vue component |
25+
| en | folder/example.unused | I am unused in php class |
26+
| en | folder/example.blade.choice.unused | I am unused in blade |
27+
| en | folder/example.blade.lang.unused | I am unused in blade |
28+
| en | folder/example.vue.unused | I am unused in vue component |
29+
+--------+---------------------------------------------+------------------------------+

‎tests/.pest/snapshots/Commands/UnusedCommandTest/it_errors_with_multiple_locales_and_no_filters.snap‎

Lines changed: 40 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -1,43 +1,43 @@
11

22
ERROR 36 unused translations found.
33

4-
+--------+-----------+------------------------------------+----------------------------------------------------+
5-
| Locale | Namespace | Key | Value |
6-
+--------+-----------+------------------------------------+----------------------------------------------------+
7-
| en | example | Unused Vendor PHP Class | I am unused in php class |
8-
| en | example | Unused Vendor Blade File | I am unused in blade |
9-
| en | example | Unused Vendor Vue Component | I am unused in vue component |
10-
| en | example | example.unused | I am unused in php class |
11-
| en | example | example.blade.choice.unused | I am unused in blade |
12-
| en | example | example.blade.lang.unused | I am unused in blade |
13-
| en | example | example.vue.unused | I am unused in vue component |
14-
| en | example | folder/example.unused | I am unused in php class |
15-
| en | example | folder/example.blade.choice.unused | I am unused in blade |
16-
| en | example | folder/example.blade.lang.unused | I am unused in blade |
17-
| en | example | folder/example.vue.unused | I am unused in vue component |
18-
| en | | Unused PHP Class | I am unused in php class |
19-
| en | | Unused Blade File | I am unused in blade |
20-
| en | | Unused Vue Component | I am unused in vue component |
21-
| en | | example.unused | I am unused in php class |
22-
| en | | example.blade.choice.unused | I am unused in blade |
23-
| en | | example.blade.lang.unused | I am unused in blade |
24-
| en | | example.vue.unused | I am unused in vue component |
25-
| en | | folder/example.unused | I am unused in php class |
26-
| en | | folder/example.blade.choice.unused | I am unused in blade |
27-
| en | | folder/example.blade.lang.unused | I am unused in blade |
28-
| en | | folder/example.vue.unused | I am unused in vue component |
29-
| de | example | Unused Vendor PHP Class | Ich werde in einer PHP-Klasse nicht verwendet |
30-
| de | example | Unused Vendor Blade File | Ich werde in Blade nicht verwendet |
31-
| de | example | Unused Vendor Vue Component | Ich werde in einem Vue-Komponenten nicht verwendet |
32-
| de | | Unused PHP Class | Ich werde in einer PHP-Klasse nicht verwendet |
33-
| de | | Unused Blade File | Ich werde in Blade nicht verwendet |
34-
| de | | Unused Vue Component | Ich werde in einem Vue-Komponenten nicht verwendet |
35-
| de | | example.unused | Ich werde in einer PHP-Klasse nicht verwendet |
36-
| de | | example.blade.choice.unused | Ich werde in Blade nicht verwendet |
37-
| de | | example.blade.lang.unused | Ich werde in Blade nicht verwendet |
38-
| de | | example.vue.unused | Ich werde in einem Vue-Komponenten nicht verwendet |
39-
| de | | folder/example.unused | Ich werde in einer PHP-Klasse nicht verwendet |
40-
| de | | folder/example.blade.choice.unused | Ich werde in Blade nicht verwendet |
41-
| de | | folder/example.blade.lang.unused | Ich werde in Blade nicht verwendet |
42-
| de | | folder/example.vue.unused | Ich werde in einem Vue-Komponenten nicht verwendet |
43-
+--------+-----------+------------------------------------+----------------------------------------------------+
4+
+--------+---------------------------------------------+----------------------------------------------------+
5+
| Locale | Key | Value |
6+
+--------+---------------------------------------------+----------------------------------------------------+
7+
| en | Unused Vendor PHP Class | I am unused in php class |
8+
| en | Unused Vendor Blade File | I am unused in blade |
9+
| en | Unused Vendor Vue Component | I am unused in vue component |
10+
| en | example::example.unused | I am unused in php class |
11+
| en | example::example.blade.choice.unused | I am unused in blade |
12+
| en | example::example.blade.lang.unused | I am unused in blade |
13+
| en | example::example.vue.unused | I am unused in vue component |
14+
| en | example::folder/example.unused | I am unused in php class |
15+
| en | example::folder/example.blade.choice.unused | I am unused in blade |
16+
| en | example::folder/example.blade.lang.unused | I am unused in blade |
17+
| en | example::folder/example.vue.unused | I am unused in vue component |
18+
| en | Unused PHP Class | I am unused in php class |
19+
| en | Unused Blade File | I am unused in blade |
20+
| en | Unused Vue Component | I am unused in vue component |
21+
| en | example.unused | I am unused in php class |
22+
| en | example.blade.choice.unused | I am unused in blade |
23+
| en | example.blade.lang.unused | I am unused in blade |
24+
| en | example.vue.unused | I am unused in vue component |
25+
| en | folder/example.unused | I am unused in php class |
26+
| en | folder/example.blade.choice.unused | I am unused in blade |
27+
| en | folder/example.blade.lang.unused | I am unused in blade |
28+
| en | folder/example.vue.unused | I am unused in vue component |
29+
| de | Unused Vendor PHP Class | Ich werde in einer PHP-Klasse nicht verwendet |
30+
| de | Unused Vendor Blade File | Ich werde in Blade nicht verwendet |
31+
| de | Unused Vendor Vue Component | Ich werde in einem Vue-Komponenten nicht verwendet |
32+
| de | Unused PHP Class | Ich werde in einer PHP-Klasse nicht verwendet |
33+
| de | Unused Blade File | Ich werde in Blade nicht verwendet |
34+
| de | Unused Vue Component | Ich werde in einem Vue-Komponenten nicht verwendet |
35+
| de | example.unused | Ich werde in einer PHP-Klasse nicht verwendet |
36+
| de | example.blade.choice.unused | Ich werde in Blade nicht verwendet |
37+
| de | example.blade.lang.unused | Ich werde in Blade nicht verwendet |
38+
| de | example.vue.unused | Ich werde in einem Vue-Komponenten nicht verwendet |
39+
| de | folder/example.unused | Ich werde in einer PHP-Klasse nicht verwendet |
40+
| de | folder/example.blade.choice.unused | Ich werde in Blade nicht verwendet |
41+
| de | folder/example.blade.lang.unused | Ich werde in Blade nicht verwendet |
42+
| de | folder/example.vue.unused | Ich werde in einem Vue-Komponenten nicht verwendet |
43+
+--------+---------------------------------------------+----------------------------------------------------+

‎tests/Commands/UnusedCommandTest.php‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919
});
2020

2121
it('errors with default no filters', function () {
22-
config()->set('translation-linter.unused.fields.namespace', true);
2322
config()->set('translation-linter.unused.filters', []);
2423

2524
withoutMockingConsoleOutput();
@@ -41,7 +40,6 @@
4140

4241
it('errors with default no fields', function () {
4342
config()->set('translation-linter.unused.fields.locale', false);
44-
config()->set('translation-linter.unused.fields.namespace', false);
4543
config()->set('translation-linter.unused.fields.key', false);
4644
config()->set('translation-linter.unused.fields.value', false);
4745

@@ -63,7 +61,6 @@
6361

6462
it('errors with multiple locales and no filters', function () {
6563
config()->set('translation-linter.lang.locales', ['en', 'de']);
66-
config()->set('translation-linter.unused.fields.namespace', true);
6764
config()->set('translation-linter.unused.filters', []);
6865

6966
withoutMockingConsoleOutput();
@@ -75,7 +72,6 @@
7572

7673
it('generates baseline file then successfully ignores baseline keys', function () {
7774
config()->set('translation-linter.lang.locales', ['en', 'de']);
78-
config()->set('translation-linter.unused.fields.namespace', true);
7975
config()->set('translation-linter.unused.filters', [IgnoreKeysFromUnusedBaselineFileFilter::class]);
8076

8177
withoutMockingConsoleOutput();

0 commit comments

Comments
 (0)