Merge branch feature/orm-2.17 into develop

roadiz · Dec 2, 2023 · 3e3f51b · 3e3f51b
1 parent 5ea985c
commit 3e3f51b
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 21 deletions.
diff --git a/composer.json b/composer.json
@@ -28,7 +28,7 @@
         "doctrine/annotations": "^1.0",
         "doctrine/doctrine-bundle": "^2.8.1",
         "doctrine/doctrine-migrations-bundle": "^3.1",
-        "doctrine/orm": "^2.14.1 < 2.17",
+        "doctrine/orm": "~2.17.0",
         "gedmo/doctrine-extensions": "^3.10.0",
         "inlinestyle/inlinestyle": "~1.2.7",
         "james-heinrich/getid3": "^1.9",

diff --git a/src/Entity/Document.php b/src/Entity/Document.php
@@ -209,7 +209,6 @@ class Document extends AbstractDateTimed implements AdvancedDocumentInterface, H
     #[ORM\OneToMany(
         mappedBy: 'document',
         targetEntity: DocumentTranslation::class,
-        fetch: 'EAGER',
         orphanRemoval: true
     )]
     #[SymfonySerializer\Ignore]

diff --git a/src/Entity/Setting.php b/src/Entity/Setting.php
@@ -93,7 +93,6 @@ class Setting extends AbstractEntity
     #[ORM\ManyToOne(
         targetEntity: SettingGroup::class,
         cascade: ['persist', 'merge'],
-        fetch: 'EAGER',
         inversedBy: 'settings'
     )]
     #[ORM\JoinColumn(name: 'setting_group_id', referencedColumnName: 'id', onDelete: 'SET NULL')]

diff --git a/src/Entity/Tag.php b/src/Entity/Tag.php
@@ -103,7 +103,6 @@ class Tag extends AbstractDateTimedPositioned implements LeafInterface
         mappedBy: 'tag',
         targetEntity: TagTranslation::class,
         cascade: ['all'],
-        fetch: 'EAGER',
         orphanRemoval: true
     )]
     #[SymfonySerializer\Groups(['translated_tag'])]

diff --git a/src/Repository/NodesSourcesRepository.php b/src/Repository/NodesSourcesRepository.php
@@ -217,29 +217,17 @@ public function alterQueryBuilderWithAuthorizationChecker(
              * Forbid deleted node for backend user when authorizationChecker not null.
              */
             if (!$this->hasJoinedNode($qb, $prefix)) {
-                $qb->innerJoin(
-                    $prefix . '.node',
-                    static::NODE_ALIAS,
-                    'WITH',
-                    $qb->expr()->lte(static::NODE_ALIAS . '.status', Node::PUBLISHED)
-                );
-            } else {
-                $qb->andWhere($qb->expr()->lte(static::NODE_ALIAS . '.status', Node::PUBLISHED));
+                $qb->innerJoin($prefix . '.node', static::NODE_ALIAS);
             }
+            $qb->andWhere($qb->expr()->lte(static::NODE_ALIAS . '.status', Node::PUBLISHED));
         } else {
             /*
              * Forbid unpublished node for anonymous and not backend users.
              */
             if (!$this->hasJoinedNode($qb, $prefix)) {
-                $qb->innerJoin(
-                    $prefix . '.node',
-                    static::NODE_ALIAS,
-                    'WITH',
-                    $qb->expr()->eq(static::NODE_ALIAS . '.status', Node::PUBLISHED)
-                );
-            } else {
-                $qb->andWhere($qb->expr()->eq(static::NODE_ALIAS . '.status', Node::PUBLISHED));
+                $qb->innerJoin($prefix . '.node', static::NODE_ALIAS);
             }
+            $qb->andWhere($qb->expr()->eq(static::NODE_ALIAS . '.status', Node::PUBLISHED));
         }
         return $qb;
     }

diff --git a/src/Repository/TagRepository.php b/src/Repository/TagRepository.php
@@ -141,7 +141,7 @@ protected function filterByTranslation(
                 $qb->leftJoin('tg.translatedTags', 'tt');
                 $qb->leftJoin(
                     'tt.translation',
-                    static::TRANSLATION_ALIAS,
+                    self::TRANSLATION_ALIAS,
                     'WITH',
                     't.defaultTranslation = true'
                 );