Merge pull request #1576 from bolt/fix/reset-setSingleFetchMode

Re-set `setSingleFetchMode` to ensure returning a pager, if needed
bolt · Jun 29, 2020 · b4beeea · b4beeea
2 parents 7446dee + cfa2b18
commit b4beeea
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/src/DataFixtures/ContentFixtures.php b/src/DataFixtures/ContentFixtures.php
@@ -128,7 +128,7 @@ private function loadContent(ObjectManager $manager): void
                 }
 
                 $refKey = sprintf('content_%s_%s', $contentType['slug'], $content->getSlug());
-                $this->addReference($refKey, $content);
+                $this->setReference($refKey, $content);
 
                 $manager->persist($content);
             }

diff --git a/src/Storage/Handler/SelectQueryHandler.php b/src/Storage/Handler/SelectQueryHandler.php
@@ -28,6 +28,10 @@ public function __invoke(ContentQueryParser $contentQuery)
         /** @var SelectQuery $selectQuery */
         $selectQuery = $contentQuery->getService('select');
 
+        // Note: This might seem superfluous, but if we "re-use" $contentQuery,
+        // this needs resetting.
+        $selectQuery->setSingleFetchMode(null);
+
         $selectQuery->setQueryBuilder($qb);
         $selectQuery->setContentTypeFilter($contentQuery->getContentTypes());
         $selectQuery->setParameters($contentQuery->getParameters());

diff --git a/src/Storage/SelectQuery.php b/src/Storage/SelectQuery.php
@@ -298,7 +298,7 @@ public function getSingleFetchMode(): ?bool
     /**
      * Turns single fetch mode on or off.
      */
-    public function setSingleFetchMode(bool $value): void
+    public function setSingleFetchMode(?bool $value): void
     {
         $this->singleFetchMode = $value;
     }