Fixed accessing to a non-existing key

Author: franmomu

CHANGELOG.md

@@ -42,6 +42,8 @@ a release.
 - Wrong PHPDoc type declarations.
 - Avoid calling deprecated `AbstractClassMetadataFactory::getCacheDriver()` method.
 - Avoid deprecations using `doctrine/mongodb-odm` >= 2.2
+- Translatable: `Gedmo\Translatable\Document\Repository\TranslationRepository::findObjectByTranslatedField()`
+  method accessing a non-existing key.
 
 ### Deprecated
 - Tree: When using Closure tree strategy, it is deprecated not defining the mapping associations of the closure entity.

src/Translatable/Document/Repository/TranslationRepository.php

@@ -167,27 +167,32 @@ public function findTranslations($document)
      */
     public function findObjectByTranslatedField($field, $value, $class)
     {
-        $document = null;
         $meta = $this->dm->getClassMetadata($class);
-        if ($meta->hasField($field)) {
-            $qb = $this->createQueryBuilder();
-            $q = $qb->field('field')->equals($field)
-                ->field('objectClass')->equals($meta->rootDocumentName)
-                ->field('content')->equals($value)
-                ->getQuery();
 
-            $q->setHydrate(false);
-            $result = $q->execute();
-            if ($result instanceof Iterator) {
-                $result = $result->toArray();
-            }
-            $id = count($result) ? $result[0]['foreignKey'] : null;
-            if ($id) {
-                $document = $this->dm->find($class, $id);
-            }
+        if (!$meta->hasField($field)) {
+            return null;
+        }
+
+        $qb = $this->createQueryBuilder();
+        $q = $qb->field('field')->equals($field)
+            ->field('objectClass')->equals($meta->rootDocumentName)
+            ->field('content')->equals($value)
+            ->getQuery();
+
+        $q->setHydrate(false);
+        $result = $q->execute();
+
+        if ($result instanceof Iterator) {
+            $result = $result->toArray();
+        }
+
+        $id = $result[0]['foreign_key'] ?? null;
+
+        if (null === $id) {
+            return null;
         }
 
-        return $document;
+        return $this->dm->find($class, $id);
     }
 
     /**

tests/Gedmo/Translatable/TranslatableDocumentTest.php

@@ -113,6 +113,33 @@ public function testTranslation(): void
         static::assertCount(0, $translations);
     }
 
+    public function testFindObjectByTranslatedField(): void
+    {
+        $repo = $this->dm->getRepository(self::ARTICLE);
+        $article = $repo->findOneBy(['title' => 'Title EN']);
+        static::assertInstanceOf(self::ARTICLE, $article);
+
+        $this->translatableListener->setTranslatableLocale('de_de');
+        $article->setTitle('Title DE');
+        $article->setCode('Code DE');
+
+        $this->dm->persist($article);
+        $this->dm->flush();
+        $this->dm->clear();
+
+        $transRepo = $this->dm->getRepository(self::TRANSLATION);
+        static::assertInstanceOf(TranslationRepository::class, $transRepo);
+
+        $articleFound = $transRepo->findObjectByTranslatedField(
+            'title',
+            'Title DE',
+            self::ARTICLE
+        );
+        static::assertInstanceOf(self::ARTICLE, $articleFound);
+
+        static::assertSame($article->getId(), $articleFound->getId());
+    }
+
     private function populate(): void
     {
         $art0 = new Article();