Singletons return single Content result with {% setcontent %}

src/Controller/TwigAwareController.php

@@ -139,6 +139,7 @@ protected function createPager(Query $query, string $contentType, int $pageSize,
     {
         $params = [
             'status' => '!unknown',
+            'returnmultiple' => true,
         ];
 
         if ($this->request->get('sortBy')) {

src/Storage/ContentQueryParser.php

@@ -12,6 +12,7 @@
 use Bolt\Storage\Directive\OffsetDirective;
 use Bolt\Storage\Directive\OrderDirective;
 use Bolt\Storage\Directive\PrintQueryDirective;
+use Bolt\Storage\Directive\ReturnMultipleDirective;
 use Bolt\Storage\Directive\ReturnSingleDirective;
 use Bolt\Storage\Handler\FirstQueryHandler;
 use Bolt\Storage\Handler\IdentifiedSelectHandler;
@@ -80,6 +81,7 @@ class ContentQueryParser
 
     /** @var Environment */
     private $twig;
+
     /** @var Notifications */
     private $notifications;
 
@@ -119,6 +121,7 @@ protected function setupDefaults(): void
         $this->addDirectiveHandler('page', new OffsetDirective());
         $this->addDirectiveHandler('printquery', new PrintQueryDirective());
         $this->addDirectiveHandler('returnsingle', new ReturnSingleDirective());
+        $this->addDirectiveHandler('returnmultiple', new ReturnMultipleDirective());
     }
 
     /**

src/Storage/Directive/ReturnMultipleDirective.php

@@ -0,0 +1,18 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Bolt\Storage\Directive;
+
+use Bolt\Storage\SelectQuery;
+
+/**
+ *  Directive to specify that an array, rather than a single object should be returned.
+ */
+class ReturnMultipleDirective
+{
+    public function __invoke(SelectQuery $query): void
+    {
+        $query->setSingleFetchMode(false);
+    }
+}

src/Storage/Handler/IdentifiedSelectHandler.php

@@ -21,9 +21,6 @@ public function __invoke(ContentQueryParser $contentQuery)
         } else {
             $contentQuery->setParameter('slug', $contentQuery->getIdentifier());
         }
-        if (count($contentQuery->getContentTypes()) === 1) {
-            $contentQuery->setDirective('returnsingle', true);
-        }
 
         return call_user_func($contentQuery->getHandler('select'), $contentQuery);
     }

src/Storage/Handler/LatestQueryHandler.php

@@ -18,6 +18,10 @@ public function __invoke(ContentQueryParser $contentQuery): Pagerfanta
     {
         $contentQuery->setDirective('order', '-id');
 
+        // If we're using `/latest`, always return a paginator, even for Singletons
+        $contentQuery->setDirective('returnsingle', false);
+        $contentQuery->setDirective('returnmultiple', true);
+
         return $contentQuery->getHandler('select')($contentQuery);
     }
 }

src/Storage/Handler/SelectQueryHandler.php

@@ -27,7 +27,6 @@ public function __invoke(ContentQueryParser $contentQuery)
 
         /** @var SelectQuery $selectQuery */
         $selectQuery = $contentQuery->getService('select');
-        $selectQuery->setSingleFetchMode(false);
 
         $selectQuery->setQueryBuilder($qb);
         $selectQuery->setContentTypeFilter($contentQuery->getContentTypes());
@@ -46,7 +45,7 @@ public function __invoke(ContentQueryParser $contentQuery)
 
         $contentQuery->runDirectives($selectQuery);
 
-        if ($selectQuery->getSingleFetchMode()) {
+        if ($selectQuery->shouldReturnSingle()) {
             return $qb
                 ->setMaxResults(1)
                 ->getQuery()

src/Storage/SelectQuery.php

@@ -5,6 +5,7 @@
 namespace Bolt\Storage;
 
 use Bolt\Configuration\Config;
+use Bolt\Configuration\Content\ContentType;
 use Bolt\Doctrine\JsonHelper;
 use Doctrine\ORM\Query\Expr\Base;
 use Doctrine\ORM\Query\ParameterTypeInferer;
@@ -42,7 +43,7 @@ class SelectQuery implements QueryInterface
     protected $replacements = [];
 
     /** @var bool */
-    protected $singleFetchMode = false;
+    protected $singleFetchMode = null;
 
     /** @var int */
     protected $index = 1;
@@ -113,6 +114,34 @@ public function getContentType(): string
         return $this->contentType;
     }
 
+    public function isSingleton(): bool
+    {
+        /** @var ContentType|null $definition */
+        $definition = $this->config->get('contenttypes/' . $this->contentType);
+
+        // We only allow this, if getSingleFetchMode wasn't explicitly set
+        if ($this->getSingleFetchMode() === false) {
+            return false;
+        }
+
+        return $definition ? $definition->get('singleton') : false;
+    }
+
+    public function shouldReturnSingle(): bool
+    {
+        // We only allow this, if getSingleFetchMode wasn't explicitly set
+        if ($this->getSingleFetchMode() === false) {
+            return false;
+        }
+
+        // If we're in an "IdentifiedSelect", always return a single
+        if (array_key_exists('slug_1', $this->getWhereParameters())) {
+            return true;
+        }
+
+        return $this->getSingleFetchMode() || $this->isSingleton();
+    }
+
     /**
      * Sets the parameters that will filter / alter the query.
      */
@@ -261,7 +290,7 @@ public function setQueryBuilder($qb): void
     /**
      * Returns whether the query is in single fetch mode.
      */
-    public function getSingleFetchMode(): bool
+    public function getSingleFetchMode(): ?bool
     {
         return $this->singleFetchMode;
     }