Skip to content

Fix notice "Object of class DateTimeImmutable could not be converted to int" in CookieCollection::has #20530

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
merged 3 commits into from
Sep 16, 2025
Merged

Fix notice "Object of class DateTimeImmutable could not be converted to int" in CookieCollection::has #20530

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
cbb02cf
Fix notice "Object of class DateTimeImmutable could not be converted …
mspirkov Sep 16, 2025
3156b31
changelog
mspirkov Sep 16, 2025
d10cecf
fix codestyle
mspirkov Sep 16, 2025
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
1 change: 1 addition & 0 deletions framework/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ Yii Framework 2 Change Log
- Bug #19506: Fix `@property` annotations in `yii\console\widgets\Table`, `yii\di\Container` and `yii\web\Session` (max-s-lab)
- Enh #20525: Add `@template` annotations for all actions (max-s-lab)
- Bug #20524: Fix PHPStan/Psalm annotations in `Yii::createObject` (max-s-lab)
- Bug #20530: Fix notice "Object of class DateTimeImmutable could not be converted to int" in `CookieCollection::has` (max-s-lab)


2.0.53 June 27, 2025
Expand Down
34 changes: 21 additions & 13 deletions framework/web/CookieCollection.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,19 +116,27 @@ public function getValue($name, $defaultValue = null)
*/
public function has($name)
{
return isset($this->_cookies[$name]) && $this->_cookies[$name]->value !== ''
&& ($this->_cookies[$name]->expire === null
|| $this->_cookies[$name]->expire === 0
|| (
(is_string($this->_cookies[$name]->expire) && strtotime($this->_cookies[$name]->expire) >= time())
|| (
interface_exists('\\DateTimeInterface')
&& $this->_cookies[$name]->expire instanceof \DateTimeInterface
&& $this->_cookies[$name]->expire->getTimestamp() >= time()
)
|| $this->_cookies[$name]->expire >= time()
)
);
if (!isset($this->_cookies[$name]) || $this->_cookies[$name]->value === '') {
return false;
}

$expire = $this->_cookies[$name]->expire;

if ($expire === null || $expire === 0) {
return true;
}

$currentTime = time();

if (is_numeric($expire)) {
return (int) $expire >= $currentTime;
}

if (is_string($expire)) {
return strtotime($expire) >= $currentTime;
}

return $expire->getTimestamp() >= $currentTime;
}

/**
Expand Down
189 changes: 189 additions & 0 deletions tests/framework/web/CookieCollectionTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,189 @@
<?php
/**
* @link https://www.yiiframework.com/
* @copyright Copyright (c) 2008 Yii Software LLC
* @license https://www.yiiframework.com/license/
*/

namespace yiiunit\framework\web;

use DateTime;
use DateTimeImmutable;
use yii\web\Cookie;
use yii\web\CookieCollection;
use yiiunit\TestCase;

/**
* @group web
*/
class CookieCollectionTest extends TestCase
{
/**
* @dataProvider provideHasData
*/
public function testHas(string $name, array $cookies, bool $expectedResult): void
{
$cookieCollection = new CookieCollection($cookies);
$result = $cookieCollection->has($name);

$this->assertEquals($expectedResult, $result);
}

public static function provideHasData(): array
{
$pastTime = time() - 100;
$futureTime = time() + 100;

return [
[
'test',
[],
false,
],
[
'test',
[
'abc' => new Cookie([
'value' => 'abc',
]),
],
false,
],
[
'test',
[
'test' => new Cookie(),
],
false,
],
[
'test',
[
'test' => new Cookie([
'value' => 'test',
'expire' => null,
]),
],
true,
],
[
'test',
[
'test' => new Cookie([
'value' => 'test',
]),
],
true,
],
[
'test',
[
'test' => new Cookie([
'value' => 'test',
]),
],
true,
],
[
'test',
[
'test' => new Cookie([
'value' => 'test',
'expire' => (string) $futureTime,
]),
],
true,
],
[
'test',
[
'test' => new Cookie([
'value' => 'test',
'expire' => (string) $pastTime,
]),
],
false,
],
[
'test',
[
'test' => new Cookie([
'value' => 'test',
'expire' => $futureTime,
]),
],
true,
],
[
'test',
[
'test' => new Cookie([
'value' => 'test',
'expire' => $pastTime,
]),
],
false,
],
[
'test',
[
'test' => new Cookie([
'value' => 'test',
'expire' => date('Y-m-d H:i:s', $futureTime),
]),
],
true,
],
[
'test',
[
'test' => new Cookie([
'value' => 'test',
'expire' => date('Y-m-d', $pastTime),
]),
],
false,
],
[
'test',
[
'test' => new Cookie([
'value' => 'test',
'expire' => (new DateTimeImmutable())->setTimestamp($futureTime),
]),
],
true,
],
[
'test',
[
'test' => new Cookie([
'value' => 'test',
'expire' => (new DateTimeImmutable())->setTimestamp($pastTime),
]),
],
false,
],
[
'test',
[
'test' => new Cookie([
'value' => 'test',
'expire' => (new DateTime())->setTimestamp($futureTime),
]),
],
true,
],
[
'test',
[
'test' => new Cookie([
'value' => 'test',
'expire' => (new DateTime())->setTimestamp($pastTime),
]),
],
false,
],
];
}
}
Loading