Skip to content

[6.x] Fix calculation of current state #14080

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
christophstockinger wants to merge 2 commits into
base: 6.x
Choose a base branch
from
+8 −8
Open

[6.x] Fix calculation of current state #14080

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
be27dd4
[6.x] Fix calculation of current state
christophstockinger Feb 25, 2026
da9d2cf
Fixes tests
christophstockinger Feb 25, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/Entries/Entry.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -791,11 +791,11 @@ public function status()
return 'published';
}

if ($collection->futureDateBehavior() === 'private' && $this->date()->isFuture()) {
if (($collection->futureDateBehavior() === 'private' || $collection->futureDateBehavior() === 'unlisted') && $this->date()->isFuture()) {
return 'scheduled';
}

if ($collection->pastDateBehavior() === 'private' && $this->date()->isPast()) {
if (($collection->pastDateBehavior() === 'private' || $collection->pastDateBehavior() === 'unlisted') && $this->date()->isPast()) {
return 'expired';
}

Expand Down
4 changes: 2 additions & 2 deletions src/Stache/Query/QueriesEntryStatus.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ private function addCollectionStatusLogicToQuery($query, $status, $collection):
return;
}

if ($collection->futureDateBehavior() === 'private') {
if ($collection->futureDateBehavior() === 'private' || $collection->futureDateBehavior() === 'unlisted') {
$status === 'scheduled'
? $query->where('date', '>', now())
: $query->where('date', '<', now());
Expand All @@ -55,7 +55,7 @@ private function addCollectionStatusLogicToQuery($query, $status, $collection):
}
}

if ($collection->pastDateBehavior() === 'private') {
if ($collection->pastDateBehavior() === 'private' || $collection->pastDateBehavior() === 'unlisted') {
$status === 'expired'
? $query->where('date', '<', now())
: $query->where('date', '>', now());
Expand Down
8 changes: 4 additions & 4 deletions tests/Tags/Collection/EntriesTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -281,10 +281,10 @@ public function it_filters_by_future_and_past()

// Only future
$this->collection->dated(true)->futureDateBehavior('public')->pastDateBehavior('unlisted')->save();
$this->assertCount(3, $this->getEntries());

$this->assertCount(0, $this->getEntries(['show_future' => false]));
$this->assertCount(3, $this->getEntries(['show_future' => true]));
$this->assertCount(8, $this->getEntries(['show_past' => true]));
$this->assertCount(3, $this->getEntries(['show_past' => true]));
$this->assertCount(3, $this->getEntries(['show_past' => false]));
$this->assertCount(3, $this->getEntries(['show_past' => false, 'show_future' => true]));

Expand All @@ -300,10 +300,10 @@ public function it_filters_by_future_and_past()
$this->collection->dated(true)->futureDateBehavior('unlisted')->pastDateBehavior('public')->save();
$this->assertCount(4, $this->getEntries());
$this->assertCount(4, $this->getEntries(['show_future' => false]));
$this->assertCount(8, $this->getEntries(['show_future' => true]));
$this->assertCount(4, $this->getEntries(['show_future' => true]));
$this->assertCount(4, $this->getEntries(['show_past' => true]));
$this->assertCount(0, $this->getEntries(['show_past' => false]));
$this->assertCount(3, $this->getEntries(['show_past' => false, 'show_future' => true]));
$this->assertCount(0, $this->getEntries(['show_past' => false, 'show_future' => true]));

$this->collection->dated(true)->futureDateBehavior('private')->pastDateBehavior('public')->save();
$this->assertCount(4, $this->getEntries());
Expand Down