From e93260ee62c47fd0b813fbe82fc334099cfc221f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 25 Oct 2022 05:06:36 +0000 Subject: [PATCH 1/2] Bump punic/punic from 3.7.0 to 3.8.0 Bumps [punic/punic](https://github.com/punic/punic) from 3.7.0 to 3.8.0. - [Release notes](https://github.com/punic/punic/releases) - [Changelog](https://github.com/punic/punic/blob/main/CHANGELOG.md) - [Commits](https://github.com/punic/punic/compare/3.7.0...3.8.0) --- updated-dependencies: - dependency-name: punic/punic dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- composer.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/composer.lock b/composer.lock index c7afbae3a537..15870d0c1972 100644 --- a/composer.lock +++ b/composer.lock @@ -2734,16 +2734,16 @@ }, { "name": "punic/punic", - "version": "3.7.0", + "version": "3.8.0", "source": { "type": "git", "url": "https://github.com/punic/punic.git", - "reference": "6e14078c3848030a69401125b2665f8bc84ba386" + "reference": "f24eb487f05fafe3ab1cbe33f75a589d50a1677f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/punic/punic/zipball/6e14078c3848030a69401125b2665f8bc84ba386", - "reference": "6e14078c3848030a69401125b2665f8bc84ba386", + "url": "https://api.github.com/repos/punic/punic/zipball/f24eb487f05fafe3ab1cbe33f75a589d50a1677f", + "reference": "f24eb487f05fafe3ab1cbe33f75a589d50a1677f", "shasum": "" }, "require": { @@ -2805,7 +2805,7 @@ ], "support": { "issues": "https://github.com/punic/punic/issues", - "source": "https://github.com/punic/punic/tree/3.7.0" + "source": "https://github.com/punic/punic/tree/3.8.0" }, "funding": [ { @@ -2817,7 +2817,7 @@ "type": "github" } ], - "time": "2021-11-16T11:09:43+00:00" + "time": "2022-10-19T09:00:13+00:00" }, { "name": "ralouphie/getallheaders", From 6542cf4df273ae6ea612dbca34d1d4529c8a0b2e Mon Sep 17 00:00:00 2001 From: Phil Davis Date: Tue, 25 Oct 2022 16:44:25 +0545 Subject: [PATCH 2/2] Adjust expected format of date-time strings in test results --- tests/lib/DateTimeFormatterTest.php | 4 ++-- tests/lib/L10N/L10nTest.php | 16 ++++++++-------- tests/lib/UtilTest.php | 16 ++++++++-------- 3 files changed, 18 insertions(+), 18 deletions(-) diff --git a/tests/lib/DateTimeFormatterTest.php b/tests/lib/DateTimeFormatterTest.php index b2421252e47e..0f8b01ac3ee9 100644 --- a/tests/lib/DateTimeFormatterTest.php +++ b/tests/lib/DateTimeFormatterTest.php @@ -154,8 +154,8 @@ public function testFormatDate($timestamp, $expected) { public function formatDateTimeData() { return [ - [1350129205, null, 'October 13, 2012 at 11:53:25 AM UTC'], - [1350129205, new \DateTimeZone('Europe/Berlin'), 'October 13, 2012 at 1:53:25 PM GMT+2'], + [1350129205, null, 'October 13, 2012, 11:53:25 AM UTC'], + [1350129205, new \DateTimeZone('Europe/Berlin'), 'October 13, 2012, 1:53:25 PM GMT+2'], ]; } diff --git a/tests/lib/L10N/L10nTest.php b/tests/lib/L10N/L10nTest.php index c293e79219a1..c104f292601a 100644 --- a/tests/lib/L10N/L10nTest.php +++ b/tests/lib/L10N/L10nTest.php @@ -90,34 +90,34 @@ public function testCzechPluralTranslations() { public function localizationData() { return [ // timestamp as string - ['February 13, 2009 at 11:31:30 PM UTC', 'en', 'datetime', '1234567890'], - ['13. Februar 2009 um 23:31:30 UTC', 'de', 'datetime', '1234567890'], + ['February 13, 2009, 11:31:30 PM UTC', 'en', 'datetime', '1234567890'], + ['13. Februar 2009, 23:31:30 UTC', 'de', 'datetime', '1234567890'], ['February 13, 2009', 'en', 'date', '1234567890'], ['13. Februar 2009', 'de', 'date', '1234567890'], ['11:31:30 PM UTC', 'en', 'time', '1234567890'], ['23:31:30 UTC', 'de', 'time', '1234567890'], // timestamp as int - ['February 13, 2009 at 11:31:30 PM UTC', 'en', 'datetime', 1234567890], - ['13. Februar 2009 um 23:31:30 UTC', 'de', 'datetime', 1234567890], + ['February 13, 2009, 11:31:30 PM UTC', 'en', 'datetime', 1234567890], + ['13. Februar 2009, 23:31:30 UTC', 'de', 'datetime', 1234567890], ['February 13, 2009', 'en', 'date', 1234567890], ['13. Februar 2009', 'de', 'date', 1234567890], ['11:31:30 PM UTC', 'en', 'time', 1234567890], ['23:31:30 UTC', 'de', 'time', 1234567890], // DateTime object - ['February 13, 2009 at 11:31:30 PM GMT+0', 'en', 'datetime', new DateTime('@1234567890')], - ['13. Februar 2009 um 23:31:30 GMT+0', 'de', 'datetime', new DateTime('@1234567890')], + ['February 13, 2009, 11:31:30 PM GMT+0', 'en', 'datetime', new DateTime('@1234567890')], + ['13. Februar 2009, 23:31:30 GMT+0', 'de', 'datetime', new DateTime('@1234567890')], ['February 13, 2009', 'en', 'date', new DateTime('@1234567890')], ['13. Februar 2009', 'de', 'date', new DateTime('@1234567890')], ['11:31:30 PM GMT+0', 'en', 'time', new DateTime('@1234567890')], ['23:31:30 GMT+0', 'de', 'time', new DateTime('@1234567890')], // en_GB - ['13 February 2009 at 23:31:30 GMT+0', 'en_GB', 'datetime', new DateTime('@1234567890')], + ['13 February 2009, 23:31:30 GMT+0', 'en_GB', 'datetime', new DateTime('@1234567890')], ['13 February 2009', 'en_GB', 'date', new DateTime('@1234567890')], ['23:31:30 GMT+0', 'en_GB', 'time', new DateTime('@1234567890')], - ['13 February 2009 at 23:31:30 GMT+0', 'en-GB', 'datetime', new DateTime('@1234567890')], + ['13 February 2009, 23:31:30 GMT+0', 'en-GB', 'datetime', new DateTime('@1234567890')], ['13 February 2009', 'en-GB', 'date', new DateTime('@1234567890')], ['23:31:30 GMT+0', 'en-GB', 'time', new DateTime('@1234567890')], ]; diff --git a/tests/lib/UtilTest.php b/tests/lib/UtilTest.php index 277b6985f4c4..e4d3fb2b6795 100644 --- a/tests/lib/UtilTest.php +++ b/tests/lib/UtilTest.php @@ -74,7 +74,7 @@ public function testFormatDate() { \date_default_timezone_set("UTC"); $result = OC_Util::formatDate(1350129205); - $expected = 'October 13, 2012 at 11:53:25 AM UTC'; + $expected = 'October 13, 2012, 11:53:25 AM UTC'; $this->assertEquals($expected, $result); $result = OC_Util::formatDate(1102831200, true); @@ -86,7 +86,7 @@ public function testFormatDateWithTZ() { \date_default_timezone_set("UTC"); $result = OC_Util::formatDate(1350129205, false, 'Europe/Berlin'); - $expected = 'October 13, 2012 at 1:53:25 PM GMT+2'; + $expected = 'October 13, 2012, 1:53:25 PM GMT+2'; $this->assertEquals($expected, $result); } @@ -100,12 +100,12 @@ public function testFormatDateWithInvalidTZ() { public function formatDateWithTZFromSessionData() { return [ - [3, 'October 13, 2012 at 2:53:25 PM GMT+3', 'Etc/GMT-3'], - [15, 'October 13, 2012 at 11:53:25 AM UTC', 'UTC'], - [-13, 'October 13, 2012 at 11:53:25 AM UTC', 'UTC'], - [9.5, 'October 13, 2012 at 9:23:25 PM GMT+9:30', 'Australia/Darwin'], - [-4.5, 'October 13, 2012 at 7:23:25 AM GMT-4:30', 'America/Caracas'], - [15.5, 'October 13, 2012 at 11:53:25 AM UTC', 'UTC'], + [3, 'October 13, 2012, 2:53:25 PM GMT+3', 'Etc/GMT-3'], + [15, 'October 13, 2012, 11:53:25 AM UTC', 'UTC'], + [-13, 'October 13, 2012, 11:53:25 AM UTC', 'UTC'], + [9.5, 'October 13, 2012, 9:23:25 PM GMT+9:30', 'Australia/Darwin'], + [-4.5, 'October 13, 2012, 7:23:25 AM GMT-4:30', 'America/Caracas'], + [15.5, 'October 13, 2012, 11:53:25 AM UTC', 'UTC'], ]; }