FX consider null values as missing translation while keeping falsy translations as valid

Contains reproduce for #2152 and keeps #1709 use case intract

Author: Oleksandr Vasylenko

lib/Gedmo/Translatable/TranslatableListener.php

@@ -470,17 +470,15 @@ public function postLoad(EventArgs $args)
             );
             // translate object's translatable properties
             foreach ($config['fields'] as $field) {
-                $translated = '';
-                $is_translated = false;
+                $translated = null;
                 foreach ((array) $result as $entry) {
                     if ($entry['field'] == $field) {
                         $translated = isset($entry['content']) ? $entry['content'] : null;
-                        $is_translated = true;
                         break;
                     }
                 }
                 // update translation
-                if ($is_translated
+                if ($translated !== null
                     || (!$this->translationFallback && (!isset($config['fallback'][$field]) || !$config['fallback'][$field]))
                     || ($this->translationFallback && isset($config['fallback'][$field]) && !$config['fallback'][$field])
                 ) {
@@ -518,7 +516,7 @@ protected function validateLocale($locale)
             throw new \Gedmo\Exception\InvalidArgumentException('Locale or language cannot be empty and must be set through Listener or Entity');
         }
     }
-    
+
     /**
      * Check if the given locale is valid
      *

tests/Gedmo/Translatable/Fixture/Issue2152/EntityWithTranslatableBoolean.php

@@ -0,0 +1,79 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Translatable\Fixture\Issue2152;
+
+use Doctrine\ORM\Mapping as ORM;
+use Gedmo\Mapping\Annotation as Gedmo;
+
+/**
+ * @ORM\Entity
+ * @ORM\Table("entity")
+ */
+class EntityWithTranslatableBoolean
+{
+    /**
+     * @ORM\Id
+     * @ORM\GeneratedValue
+     * @ORM\Column(type="integer")
+     *
+     * @var int
+     */
+    private $id;
+
+    /**
+     * @Gedmo\Translatable
+     * @ORM\Column(type="string", nullable=true)
+     *
+     * @var string|null
+     */
+    private $title;
+
+    /**
+     * @Gedmo\Translatable
+     * @ORM\Column(type="string", nullable=true)
+     *
+     * @var string|null
+     */
+    private $isOperating;
+
+    /**
+     * @var string
+     *
+     * @Gedmo\Locale()
+     */
+    private $locale;
+
+    public function __construct(string $title, string $isOperating = '0')
+    {
+        $this->translateInLocale('en', $title, $isOperating);
+    }
+
+    public function translateInLocale(string $locale, ?string $title, ?string $isOperating): void
+    {
+        $this->title = $title;
+        $this->isOperating = $isOperating;
+        $this->locale = $locale;
+    }
+
+    public function getId(): ?int
+    {
+        return $this->id;
+    }
+
+    public function getTitle(): ?string
+    {
+        return $this->title;
+    }
+
+    public function isOperating(): ?string
+    {
+        return $this->isOperating;
+    }
+
+    public function getLocale(): string
+    {
+        return $this->locale;
+    }
+}

tests/Gedmo/Translatable/Issue/Issue2152Test.php

@@ -0,0 +1,100 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Gedmo\Translatable\Issue;
+
+use Doctrine\Common\EventManager;
+use Gedmo\Translatable\TranslatableListener;
+use Tool\BaseTestCaseORM;
+use Gedmo\Translatable\Entity\Translation;
+use Translatable\Fixture\Issue2152\EntityWithTranslatableBoolean;
+
+class Issue2152Test extends BaseTestCaseORM
+{
+    private const TRANSLATION = Translation::class;
+    private const ENTITY = EntityWithTranslatableBoolean::class;
+
+    /**
+     * @var TranslatableListener
+     */
+    private $translatableListener;
+
+    protected function setUp(): void
+    {
+        parent::setUp();
+
+        $evm = new EventManager();
+
+        $this->translatableListener = new TranslatableListener();
+        $this->translatableListener->setTranslatableLocale('en');
+        $this->translatableListener->setDefaultLocale('en');
+        $this->translatableListener->setTranslationFallback(true);
+        $evm->addEventSubscriber($this->translatableListener);
+
+        $this->getMockSqliteEntityManager($evm);
+    }
+
+    /**
+     * @test
+     */
+    public function shouldFindInheritedClassTranslations(): void
+    {
+        //Arrange
+        //by default we have English
+        $title = 'Hello World';
+        $isOperating = '1';
+
+        //operating in germany
+        $deTitle = 'Hallo Welt';
+        $isOperatingInGermany = '0';
+
+        //but in Ukraine not operating, should fallback to default one
+        $uaTitle = null;
+        $isOperatingInUkraine = null;
+
+        $entity = new EntityWithTranslatableBoolean($title, $isOperating);
+        $this->em->persist($entity);
+        $this->em->flush();
+
+        $entity->translateInLocale('de', $deTitle, $isOperatingInGermany);
+
+        $this->em->persist($entity);
+        $this->em->flush();
+
+        $entity->translateInLocale('ua', $uaTitle, $isOperatingInUkraine);
+
+        $this->em->persist($entity);
+        $this->em->flush();
+
+        //Act
+        $entityInDe = $this->findUsingQueryBuilder('de');
+        $entityInUa = $this->findUsingQueryBuilder('ua');
+
+        //Assert
+
+        $this->assertSame($deTitle, $entityInDe->getTitle());
+        $this->assertEquals($isOperatingInGermany, $entityInDe->isOperating());
+
+        $this->assertSame($title, $entityInUa->getTitle(), 'should fallback to default title if null');
+        $this->assertEquals($isOperating, $entityInUa->isOperating(), ' should fallback to default operating if null');
+    }
+
+    protected function getUsedEntityFixtures()
+    {
+        return [
+            self::TRANSLATION,
+            self::ENTITY,
+        ];
+    }
+
+    private function findUsingQueryBuilder(string $locale): ?EntityWithTranslatableBoolean
+    {
+        $this->em->clear();
+        $this->translatableListener->setTranslatableLocale($locale);
+
+        $qb = $this->em->createQueryBuilder()->select('e')->from(self::ENTITY, 'e');
+
+        return $qb->getQuery()->getSingleResult();
+    }
+}

tests/Gedmo/Translatable/TranslatableWithEmbeddedTest.php

@@ -109,16 +109,6 @@ public function testQueryWalker()
         $this->assertSame('facebook-de', $result[0]['link.facebook']);
     }
 
-    public function testTranslationOfNullValuesFallbacksToDefault(): void
-    {
-        $this->markTestIncomplete('TODO');
-    }
-
-    public function testTranslationOfFalseValuesDoesNotFallback(): void
-    {
-        $this->markTestIncomplete('TODO');
-    }
-
     protected function getUsedEntityFixtures()
     {
         return array(