Merge pull request #57 from Runroom/hotfix/doctrine

Avoid using Join::WITH
Runroom · Nov 24, 2023 · 5530fcf · 5530fcf
2 parents 75aae87 + 9f22364
commit 5530fcf
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 11 deletions.
diff --git a/src/BasicEntities/Entity/BookTranslation.php b/src/BasicEntities/Entity/BookTranslation.php
@@ -27,14 +27,6 @@ class BookTranslation implements TranslationInterface
 {
     use TranslationTrait;
 
-    /**
-     * @var string|null
-     *
-     * This property is needed to do the Join::WITH on the BookRepository
-     */
-    #[ORM\Column(type: Types::STRING, length: 5)]
-    protected $locale;
-
     #[ORM\Id]
     #[ORM\GeneratedValue]
     #[ORM\Column(type: Types::INTEGER)]

diff --git a/src/BasicEntities/Repository/BookRepository.php b/src/BasicEntities/Repository/BookRepository.php
@@ -14,7 +14,6 @@
 namespace Runroom\SamplesBundle\BasicEntities\Repository;
 
 use Doctrine\Bundle\DoctrineBundle\Repository\ServiceEntityRepository;
-use Doctrine\ORM\Query\Expr\Join;
 use Doctrine\Persistence\ManagerRegistry;
 use Runroom\SamplesBundle\BasicEntities\Entity\Book;
 use Symfony\Component\HttpFoundation\Request;
@@ -41,8 +40,9 @@ public function findBySlug(string $slug): Book
         $request = $this->requestStack->getCurrentRequest() ?? new Request();
 
         $query = $this->createQueryBuilder('book')
-            ->leftJoin('book.translations', 'translations', Join::WITH, 'translations.locale = :locale')
-            ->where('translations.slug = :slug')
+            ->leftJoin('book.translations', 'translations')
+            ->where('translations.locale = :locale')
+            ->andWhere('translations.slug = :slug')
             ->andWhere('book.publish = true')
             ->setParameter('slug', $slug)
             ->setParameter('locale', $request->getLocale())