Skip to content

fix(date): accept DateTimeInterface in legacy Horde_Date constructor #17

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
ralflang merged 2 commits into from
Jun 24, 2026
Merged

fix(date): accept DateTimeInterface in legacy Horde_Date constructor #17

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
3ec7036
fix(date): accept DateTimeInterface in legacy Horde_Date constructor
TDannhauer Jun 23, 2026
1800de1
test: More complete assertions2
ralflang Jun 24, 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
26 changes: 16 additions & 10 deletions lib/Horde/Date.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1543,27 +1543,33 @@ protected function _initializeFromArray($date)

protected function _initializeFromObject($date)
{
if ($date instanceof DateTime) {
if ($date instanceof DateTimeInterface) {
$this->_year = (int) $date->format('Y');
$this->_month = (int) $date->format('m');
$this->_mday = (int) $date->format('d');
$this->_hour = (int) $date->format('H');
$this->_min = (int) $date->format('i');
$this->_sec = (int) $date->format('s');
$this->_initializeTimezone($date->getTimezone()->getName());
} else {
$is_horde_date = $date instanceof Horde_Date;

return;
}

if ($date instanceof Horde_Date) {
foreach (['year', 'month', 'mday', 'hour', 'min', 'sec'] as $key) {
if ($is_horde_date || isset($date->$key)) {
$this->{'_' . $key} = (int) $date->$key;
}
$this->{'_' . $key} = (int) $date->$key;
}
if (!$is_horde_date) {
$this->_correct();
} else {
$this->_initializeTimezone($date->timezone);
$this->_initializeTimezone($date->timezone);

return;
}

foreach (['year', 'month', 'mday', 'hour', 'min', 'sec'] as $key) {
if (isset($date->$key)) {
$this->{'_' . $key} = (int) $date->$key;
}
}
$this->_correct();
}

protected function _initializeTimezone($timezone)
Expand Down
31 changes: 30 additions & 1 deletion test/Unnamespaced/DateTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,14 @@
use date_default_timezone_get;
use date_default_timezone_set;
use DateTime;
use DateTimeImmutable;
use DateTimeZone;
use Horde\Date\Format;
use Horde_Date;
use Horde_Date_Span;
use PHPUnit\Framework\TestCase;
use stdClass;
use Horde_Date_Exception;
use Horde\Date\Format;

/**
* @category Horde
Expand Down Expand Up @@ -76,6 +77,34 @@ public function testConstructor()
$date = new Horde_Date($dt);
$this->assertEquals('2011-12-10 03:05:06', (string) $date);

$dti = new DateTimeImmutable('2026-06-23 12:00:00', new DateTimeZone('UTC'));
$date = new Horde_Date($dti);
$this->assertEquals(2026, $date->year);
$this->assertEquals(6, $date->month);
$this->assertEquals(23, $date->mday);
$this->assertEquals(12, $date->hour);
$this->assertEquals(0, $date->min);
$this->assertEquals(0, $date->sec);
$this->assertEquals('UTC', $date->timezone);

/* DateTimeImmutable with a non-UTC timezone must preserve the zone. */
$dti = new DateTimeImmutable('2026-06-23 12:00:00', new DateTimeZone('America/New_York'));
$date = new Horde_Date($dti);
$this->assertEquals('2026-06-23 12:00:00', (string) $date);
$this->assertEquals('America/New_York', $date->timezone);

$parsed = Format::parseDateTime(
'23.06.2026 12:00',
'%d.%m.%Y',
'HH:mm',
'de_DE'
);
$date = new Horde_Date($parsed->toDateTimeImmutable());
$this->assertEquals(2026, $date->year);
$this->assertEquals(6, $date->month);
$this->assertEquals(23, $date->mday);
$this->assertGreaterThan(0, $date->timestamp());

// Test creating Horde_Date from a string that will use DateTime
// internally to parse the date.
$date = new Horde_Date('2014-03-20 5:00PM');
Expand Down
Loading