[5.x] Implement Localization interface on LocalizedTerm (#9496)

statamic · Feb 9, 2024 · 5e6df0a · 5e6df0a
1 parent be95693
commit 5e6df0a
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 6 deletions.
diff --git a/src/Fieldtypes/Entries.php b/src/Fieldtypes/Entries.php
@@ -23,7 +23,6 @@
 use Statamic\Search\Index;
 use Statamic\Search\Result;
 use Statamic\Support\Arr;
-use Statamic\Taxonomies\LocalizedTerm;
 
 class Entries extends Relationship
 {
@@ -322,7 +321,7 @@ protected function collect($value)
     public function augment($values)
     {
         $site = Site::current()->handle();
-        if (($parent = $this->field()->parent()) && ($parent instanceof Localization || $parent instanceof LocalizedTerm)) {
+        if (($parent = $this->field()->parent()) && $parent instanceof Localization) {
             $site = $parent->locale();
         }
 

diff --git a/src/Fieldtypes/Terms.php b/src/Fieldtypes/Terms.php
@@ -22,7 +22,6 @@
 use Statamic\Query\Scopes\Filters\Fields\Terms as TermsFilter;
 use Statamic\Support\Arr;
 use Statamic\Support\Str;
-use Statamic\Taxonomies\LocalizedTerm;
 
 class Terms extends Relationship
 {
@@ -112,7 +111,7 @@ public function augment($values)
         // entry, but could also be something else, like another taxonomy term.
         $parent = $this->field->parent();
 
-        $site = $parent && ($parent instanceof Localization || $parent instanceof LocalizedTerm)
+        $site = $parent && $parent instanceof Localization
             ? $parent->locale()
             : Site::current()->handle(); // Use the "current" site so this will get localized appropriately on the front-end.
 

diff --git a/src/Taxonomies/LocalizedTerm.php b/src/Taxonomies/LocalizedTerm.php
@@ -9,6 +9,7 @@
 use Statamic\Contracts\Auth\Protect\Protectable;
 use Statamic\Contracts\Data\Augmentable;
 use Statamic\Contracts\Data\Augmented;
+use Statamic\Contracts\Data\Localization;
 use Statamic\Contracts\GraphQL\ResolvesValues as ResolvesValuesContract;
 use Statamic\Contracts\Query\ContainsQueryableValues;
 use Statamic\Contracts\Search\Searchable as SearchableContract;
@@ -33,7 +34,7 @@
 use Statamic\Statamic;
 use Statamic\Support\Str;
 
-class LocalizedTerm implements Arrayable, ArrayAccess, Augmentable, ContainsQueryableValues, Protectable, ResolvesValuesContract, Responsable, SearchableContract, Term
+class LocalizedTerm implements Arrayable, ArrayAccess, Augmentable, ContainsQueryableValues, Localization, Protectable, ResolvesValuesContract, Responsable, SearchableContract, Term
 {
     use ContainsSupplementalData, HasAugmentedInstance, Publishable, ResolvesValues, Revisable, Routable, Searchable, TracksLastModified, TracksQueriedColumns, TracksQueriedRelations;
 
@@ -269,8 +270,12 @@ public function isRoot()
         return $this->isDefaultLocale();
     }
 
-    public function locale()
+    public function locale($locale = null)
     {
+        if (func_num_args() === 1) {
+            throw new \Exception('The locale cannot be set on a LocalizedTerm.');
+        }
+
         return $this->locale;
     }