Remove TranslatableInterface::getLocale

sonata-project · Nov 2, 2021 · de5ec62 · de5ec62
1 parent ae4b7f1
commit de5ec62
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 10 deletions.
diff --git a/src/Admin/Extension/Gedmo/TranslatableAdminExtension.php b/src/Admin/Extension/Gedmo/TranslatableAdminExtension.php
@@ -56,9 +56,11 @@ public function __construct(
 
     public function alterNewInstance(AdminInterface $admin, object $object): void
     {
-        if (null === $object->getLocale()) {
-            $object->setLocale($this->getTranslatableLocale());
+        if (!$this->getTranslatableChecker()->isTranslatable($object)) {
+            return;
         }
+
+        $object->setLocale($this->getTranslatableLocale());
     }
 
     public function alterObject(AdminInterface $admin, object $object): void

diff --git a/src/Model/TranslatableInterface.php b/src/Model/TranslatableInterface.php
@@ -19,6 +19,4 @@
 interface TranslatableInterface
 {
     public function setLocale(string $locale): void;
-
-    public function getLocale(): ?string;
 }
diff --git a/tests/App/Entity/GedmoCategory.php b/tests/App/Entity/GedmoCategory.php
@@ -42,7 +42,7 @@ class GedmoCategory implements TranslatableInterface
      *
      * @var string|null
      */
-    private $locale;
+    private $locale = null;
 
     public function __construct(string $id = '', string $name = '')
     {
@@ -75,10 +75,7 @@ public function setName(string $name): void
         $this->name = $name;
     }
 
-    /**
-     * @param string $locale
-     */
-    public function setLocale($locale): void
+    public function setLocale(string $locale): void
     {
         $this->locale = $locale;
     }

diff --git a/tests/Fixtures/Model/ModelTranslatable.php b/tests/Fixtures/Model/ModelTranslatable.php
@@ -23,7 +23,7 @@ class ModelTranslatable implements TranslatableInterface
      *
      * @var string|null
      */
-    private $locale;
+    private $locale = null;
 
     public function setLocale(string $locale): void
     {