Skip to content

[6.x] Fix TypeError when elevated_session_duration is a string #14771

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

Merged
jasonvarga merged 6 commits into from
Jun 3, 2026
+21 −1
Merged

[6.x] Fix TypeError when elevated_session_duration is a string #14771

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
4b39d6d
Add failing test for string elevated_session_duration config
duncanmcclean Jun 3, 2026
a3d81f9
Fix TypeError when elevated_session_duration is a string
duncanmcclean Jun 3, 2026
32adc84
wip
duncanmcclean Jun 3, 2026
e9eca31
make it a float
duncanmcclean Jun 3, 2026
e2fa752
use a float in the test too
duncanmcclean Jun 3, 2026
08cc60d
this needs to change too
duncanmcclean Jun 3, 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
2 changes: 1 addition & 1 deletion src/Providers/AppServiceProvider.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -357,7 +357,7 @@ private function registerElevatedSessionMacros()
}

return Carbon::createFromTimestamp($lastElevated)
->addMinutes(config('statamic.users.elevated_session_duration', 15))
->addMinutes((float) config('statamic.users.elevated_session_duration', 15))
->timestamp;
});

Expand Down
20 changes: 20 additions & 0 deletions tests/Auth/ElevatedSessionTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,26 @@ public function it_can_get_status_of_elevated_session()
]);
}

/**
* @see https://github.com/statamic/cms/pull/14771
**/
#[Test]
public function it_handles_string_config_value_for_elevated_session_duration()
{
config(['statamic.users.elevated_session_duration' => '15.5']);

$this
->withElevatedSession(now()->subMinutes(5))
->actingAs($this->user)
->get('/cp/elevated-session')
->assertOk()
->assertJson([
'elevated' => true,
'expiry' => now()->addMinutes(10.5)->timestamp,
'method' => 'password_confirmation',
]);
}

#[Test]
public function it_can_get_status_of_elevated_session_when_session_key_does_not_exist()
{
Expand Down
Loading