php/yii2
1
0
Fork 0
mirror of https://github.com/yiisoft/yii2.git synced 2025-11-23 18:18:21 +08:00
Code Issues Packages Projects Releases Wiki Activity

format timestamps with invalid date input

Browse Source 
fixes #4989
This commit is contained in:
Carsten Brandt
2014-09-23 12:13:00 +02:00
parent 18b57af5ac
commit 3b0f561480
2 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
framework/i18n/Formatter.php
View File

@@ -548,13 +548,17 @@ class Formatter extends Component
$value = 0; $value = 0;
} }
try { try {
if (is_numeric($value)) { if (is_numeric($value)) { // process as unix timestamp
// process as unix timestamp
if (($timestamp = DateTime::createFromFormat('U', $value)) === false) { if (($timestamp = DateTime::createFromFormat('U', $value)) === false) {
throw new InvalidParamException("Failed to parse '$value' as a UNIX timestamp."); throw new InvalidParamException("Failed to parse '$value' as a UNIX timestamp.");
} }
return $timestamp; return $timestamp;
} elseif (($timestamp = DateTime::createFromFormat('Y-m-d', $value)) !== false) { // try Y-m-d format
return $timestamp;
} elseif (($timestamp = DateTime::createFromFormat('Y-m-d H:i:s', $value)) !== false) { // try Y-m-d H:i:s format
return $timestamp;
} }
// finally try to create a DateTime object with the value
$timestamp = new DateTime($value); $timestamp = new DateTime($value);
return $timestamp; return $timestamp;
} catch(\Exception $e) { } catch(\Exception $e) {

9
tests/unit/framework/i18n/FormatterTest.php
View File

@@ -454,7 +454,8 @@ class FormatterTest extends TestCase
public function dateInputs() public function dateInputs()
{ {
return [ return [
[false, '2014-13-01', 'yii\base\InvalidParamException'], // ['2015-01-01 00:00:00', '2014-13-01'], // TODO evals to current time on that date
['2015-01-01 00:00:00', '2014-13-01 00:00:00'],
[false, 'asdfg', 'yii\base\InvalidParamException'], [false, 'asdfg', 'yii\base\InvalidParamException'],
// [(string)strtotime('now'), 'now'], // fails randomly // [(string)strtotime('now'), 'now'], // fails randomly
]; ];
@@ -476,9 +477,9 @@ class FormatterTest extends TestCase
if ($expectedException !== null) { if ($expectedException !== null) {
$this->setExpectedException($expectedException); $this->setExpectedException($expectedException);
} }
$this->assertSame($expected, $this->formatter->asDate($value, 'php:U')); $this->assertSame($expected, $this->formatter->asDate($value, 'yyyy-MM-dd HH:mm:ss'));
$this->assertSame($expected, $this->formatter->asTime($value, 'php:U')); $this->assertSame($expected, $this->formatter->asTime($value, 'yyyy-MM-dd HH:mm:ss'));
$this->assertSame($expected, $this->formatter->asDatetime($value, 'php:U')); $this->assertSame($expected, $this->formatter->asDatetime($value, 'yyyy-MM-dd HH:mm:ss'));
} }