[5.x] Fix querying by status on non-dated collections (#10099)

statamic · May 16, 2024 · 5a6567e · 5a6567e
1 parent d85f4fc
commit 5a6567e
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/src/Stache/Query/QueriesEntryStatus.php b/src/Stache/Query/QueriesEntryStatus.php
@@ -29,10 +29,12 @@ private function addCollectionStatusLogicToQuery($query, $status, $collection):
     {
         $this->addCollectionWhereToStatusQuery($query, $collection->handle());
 
-        if ($collection->futureDateBehavior() === 'public' && $collection->pastDateBehavior() === 'public') {
+        if (! $collection->dated() || ($collection->futureDateBehavior() === 'public' && $collection->pastDateBehavior() === 'public')) {
             if ($status === 'scheduled' || $status === 'expired') {
                 $query->where('date', 'invalid'); // intentionally trigger no results.
             }
+
+            return;
         }
 
         if ($collection->futureDateBehavior() === 'private') {

diff --git a/tests/Data/Entries/EntryQueryBuilderTest.php b/tests/Data/Entries/EntryQueryBuilderTest.php
@@ -830,6 +830,12 @@ public function it_filters_by_status($status, $expected)
         EntryFactory::collection('calendar')->id('calendar-past')->published(true)->date(now()->subDay())->create();
         EntryFactory::collection('calendar')->id('calendar-past-draft')->published(false)->date(now()->subDay())->create();
 
+        // Undated, but with customized date behavior. Nonsensical situation, but it can happen.
+        // See https://github.com/statamic/eloquent-driver/issues/288
+        Collection::make('undated')->dated(false)->futureDateBehavior('private')->pastDateBehavior('private')->save();
+        EntryFactory::collection('undated')->id('undated')->published(true)->create();
+        EntryFactory::collection('undated')->id('undated-draft')->published(false)->create();
+
         $this->assertEquals($expected, Entry::query()->whereStatus($status)->get()->map->id->all());
     }
 
@@ -844,13 +850,15 @@ public static function filterByStatusProvider()
                 'event-past-draft',
                 'calendar-future-draft',
                 'calendar-past-draft',
+                'undated-draft',
             ]],
             'published' => ['published', [
                 'page',
                 'blog-past',
                 'event-future',
                 'calendar-future',
                 'calendar-past',
+                'undated',
             ]],
             'scheduled' => ['scheduled', [
                 'blog-future',