diff options
| -rw-r--r-- | it.class | 2 | ||||
| -rwxr-xr-x | tests/it.t | 15 |
2 files changed, 14 insertions, 3 deletions
@@ -901,7 +901,7 @@ static function gets() */ static function time() { - return ($t = EDC('time')) ? strtotime(rtrim(it::replace(array('(\d\d\d\d)-(\d\d)-(\d\d)-(\d\d)-(\d\d)(-(\d\d))?' => '$1-$2-$3 $4:$5:$7', '^(\d\d)-(\d\d)(-(\d\d))?' => 'today $1:$2:$4'), $t), ":")) : time(); + return ($t = EDC('time')) ? strtotime(rtrim(it::replace(array('(\d\d\d\d)-(\d\d)-(\d\d)-(\d\d)-(\d\d)(-(\d\d))?' => '$1-$2-$3 $4:$5:$7', '^(\d\d)-?(\d\d)(-?(\d\d))?$' => 'today $1:$2:$4'), $t), ":")) : time(); } /** @@ -344,8 +344,19 @@ is( # it::date tests -$GLOBALS['debug_time'] = "2014-01-01"; -is(it::date(), "2014-01-01 00:00:00"); +function _time($debug_time, $expected) +{ + $GLOBALS['debug_time'] = $debug_time; + is(it::date(), $expected, ".time-$debug_time"); + $GLOBALS['debug_time'] = ''; +} +_time("2014-01-01", "2014-01-01 00:00:00"); +_time("2014-01-01-15-27-15", "2014-01-01 15:27:15"); +_time("15-27", it::date('', '15:27')); +_time("1527", it::date('', '15:27')); +_time("15-27-15", it::date('', '15:27:15')); +_time("152715", it::date('', '15:27:15')); +_time("yesterday", it::date('', 'yesterday')); is(it::date('date', '2011-10-25'), '25.10.2011', 'parse date string with strtotime'); is(it::date('date', '2011-10-25 + 3 days'), '28.10.2011', 'some date arithmetic'); |