diff options
| -rw-r--r-- | tests/lib/DateTimeFormatterTest.php | 6 | ||||
| -rw-r--r-- | tests/lib/L10N/L10nTest.php | 22 |
2 files changed, 14 insertions, 14 deletions
diff --git a/tests/lib/DateTimeFormatterTest.php b/tests/lib/DateTimeFormatterTest.php index 2ca880ec132..71d98ba7581 100644 --- a/tests/lib/DateTimeFormatterTest.php +++ b/tests/lib/DateTimeFormatterTest.php @@ -163,8 +163,8 @@ class DateTimeFormatterTest extends TestCase { public function formatDateTimeData() { return [ - [1350129205, null, 'October 13, 2012 at 11:53:25 AM GMT+0'], - [1350129205, new \DateTimeZone('Europe/Berlin'), 'October 13, 2012 at 1:53:25 PM GMT+2'], + [1350129205, null, "October 13, 2012, 11:53:25\xE2\x80\xAFAM UTC"], + [1350129205, new \DateTimeZone('Europe/Berlin'), "October 13, 2012, 1:53:25\xE2\x80\xAFPM GMT+2"], ]; } @@ -175,7 +175,7 @@ class DateTimeFormatterTest extends TestCase { $this->assertEquals($expected, (string) $this->formatter->formatDateTime($timestamp, 'long', 'long', $timeZone)); } - + public function testFormatDateWithInvalidTZ() { $this->expectException(\Exception::class); diff --git a/tests/lib/L10N/L10nTest.php b/tests/lib/L10N/L10nTest.php index 79f85e892c7..bd1fce29547 100644 --- a/tests/lib/L10N/L10nTest.php +++ b/tests/lib/L10N/L10nTest.php @@ -118,34 +118,34 @@ class L10nTest extends TestCase { public function localizationData() { return [ // timestamp as string - ['February 13, 2009 at 11:31:30 PM UTC', 'en', 'en_US', 'datetime', '1234567890'], - ['13. Februar 2009 um 23:31:30 UTC', 'de', 'de_DE', 'datetime', '1234567890'], + ["February 13, 2009, 11:31:30\xE2\x80\xAFPM UTC", 'en', 'en_US', 'datetime', '1234567890'], + ['13. Februar 2009, 23:31:30 UTC', 'de', 'de_DE', 'datetime', '1234567890'], ['February 13, 2009', 'en', 'en_US', 'date', '1234567890'], ['13. Februar 2009', 'de', 'de_DE', 'date', '1234567890'], - ['11:31:30 PM UTC', 'en', 'en_US', 'time', '1234567890'], + ["11:31:30\xE2\x80\xAFPM UTC", 'en', 'en_US', 'time', '1234567890'], ['23:31:30 UTC', 'de', 'de_DE', 'time', '1234567890'], // timestamp as int - ['February 13, 2009 at 11:31:30 PM UTC', 'en', 'en_US', 'datetime', 1234567890], - ['13. Februar 2009 um 23:31:30 UTC', 'de', 'de_DE', 'datetime', 1234567890], + ["February 13, 2009, 11:31:30\xE2\x80\xAFPM UTC", 'en', 'en_US', 'datetime', 1234567890], + ['13. Februar 2009, 23:31:30 UTC', 'de', 'de_DE', 'datetime', 1234567890], ['February 13, 2009', 'en', 'en_US', 'date', 1234567890], ['13. Februar 2009', 'de', 'de_DE', 'date', 1234567890], - ['11:31:30 PM UTC', 'en', 'en_US', 'time', 1234567890], + ["11:31:30\xE2\x80\xAFPM UTC", 'en', 'en_US', 'time', 1234567890], ['23:31:30 UTC', 'de', 'de_DE', 'time', 1234567890], // DateTime object - ['February 13, 2009 at 11:31:30 PM GMT+0', 'en', 'en_US', 'datetime', new DateTime('@1234567890')], - ['13. Februar 2009 um 23:31:30 GMT+0', 'de', 'de_DE', 'datetime', new DateTime('@1234567890')], + ["February 13, 2009, 11:31:30\xE2\x80\xAFPM GMT+0", 'en', 'en_US', 'datetime', new DateTime('@1234567890')], + ['13. Februar 2009, 23:31:30 GMT+0', 'de', 'de_DE', 'datetime', new DateTime('@1234567890')], ['February 13, 2009', 'en', 'en_US', 'date', new DateTime('@1234567890')], ['13. Februar 2009', 'de', 'de_DE', 'date', new DateTime('@1234567890')], - ['11:31:30 PM GMT+0', 'en', 'en_US', 'time', new DateTime('@1234567890')], + ["11:31:30\xE2\x80\xAFPM GMT+0", 'en', 'en_US', 'time', new DateTime('@1234567890')], ['23:31:30 GMT+0', 'de', 'de_DE', 'time', new DateTime('@1234567890')], // en_GB - ['13 February 2009 at 23:31:30 GMT+0', 'en_GB', 'en_GB', 'datetime', new DateTime('@1234567890')], + ['13 February 2009, 23:31:30 GMT+0', 'en_GB', 'en_GB', 'datetime', new DateTime('@1234567890')], ['13 February 2009', 'en_GB', 'en_GB', 'date', new DateTime('@1234567890')], ['23:31:30 GMT+0', 'en_GB', 'en_GB', 'time', new DateTime('@1234567890')], - ['13 February 2009 at 23:31:30 GMT+0', 'en-GB', 'en_GB', 'datetime', new DateTime('@1234567890')], + ['13 February 2009, 23:31:30 GMT+0', 'en-GB', 'en_GB', 'datetime', new DateTime('@1234567890')], ['13 February 2009', 'en-GB', 'en_GB', 'date', new DateTime('@1234567890')], ['23:31:30 GMT+0', 'en-GB', 'en_GB', 'time', new DateTime('@1234567890')], ]; |