Skip to content
This repository has been archived by the owner on Jan 8, 2020. It is now read-only.

Ensure that DateTimeFormatter doesn't format an empty string #4394

Closed
wants to merge 1 commit into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 3 additions & 1 deletion library/Zend/Filter/DateTimeFormatter.php
Expand Up @@ -71,7 +71,9 @@ public function filter($value)
*/ */
protected function normalizeDateTime($value) protected function normalizeDateTime($value)
{ {
if (is_int($value)) { if (empty($value)) {
return $value;
} elseif (is_int($value)) {
$dateTime = new DateTime('@' . $value); $dateTime = new DateTime('@' . $value);
} elseif (!$value instanceof DateTime) { } elseif (!$value instanceof DateTime) {
$dateTime = new DateTime($value); $dateTime = new DateTime($value);
Expand Down
9 changes: 9 additions & 0 deletions tests/ZendTest/Filter/DateTimeFormatterTest.php
Expand Up @@ -33,6 +33,15 @@ public function tearDown()
date_default_timezone_set($this->defaultTimezone); date_default_timezone_set($this->defaultTimezone);
} }


public function testFormatterDoesNotFormatAnEmptyString()
{
date_default_timezone_set('UTC');

$filter = new DateTimeFormatter();
$result = $filter->filter('');
$this->assertEquals('', $result);
}

public function testDateTimeFormatted() public function testDateTimeFormatted()
{ {
date_default_timezone_set('UTC'); date_default_timezone_set('UTC');
Expand Down