From b32fab16efb715568f54781bcc9e14e30ce41bff Mon Sep 17 00:00:00 2001 From: Aleksander Machniak Date: Sat, 24 Aug 2013 18:08:54 +0200 Subject: Fix handling of non-default date formats (#1489294) - remove ambiguous m/d/Y format from default config --- tests/Framework/Utils.php | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) (limited to 'tests') diff --git a/tests/Framework/Utils.php b/tests/Framework/Utils.php index abfb7cb65..3f7f48c3a 100644 --- a/tests/Framework/Utils.php +++ b/tests/Framework/Utils.php @@ -271,11 +271,19 @@ class Framework_Utils extends PHPUnit_Framework_TestCase $test = array( '1' => 1, '' => 0, + '2013-04-22' => 1366581600, + '2013/04/22' => 1366581600, + '2013.04.22' => 1366581600, + '22-04-2013' => 1366581600, + '22/04/2013' => 1366581600, + '22.04.2013' => 1366581600, + '22.4.2013' => 1366581600, + '20130422' => 1366581600, ); foreach ($test as $datetime => $ts) { $result = rcube_utils::strtotime($datetime); - $this->assertSame($ts, $result); + $this->assertSame($ts, $result, "Error parsing date: $datetime"); } } -- cgit v1.2.3