Merge pull request #33462 from owncloud/stable10-bump-punic-3.1.0-3.2.0

[stable10] Bump punic 3.1.0 => 3.2.0
owncloud · Nov 9, 2018 · e095e75 · e095e75
2 parents f9620bc + 7343d93
commit e095e75
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 20 deletions.
diff --git a/composer.lock b/composer.lock
diff --git a/tests/lib/DateTimeFormatterTest.php b/tests/lib/DateTimeFormatterTest.php
@@ -154,7 +154,7 @@ public function testFormatDate($timestamp, $expected) {
 
 	public function formatDateTimeData() {
 		return [
-			[1350129205, null, 'October 13, 2012 at 11:53:25 AM GMT+0'],
+			[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'],
 		];
 	}

diff --git a/tests/lib/L10N/L10nTest.php b/tests/lib/L10N/L10nTest.php
@@ -82,20 +82,20 @@ public function testCzechPluralTranslations() {
 	public function localizationData() {
 		return [
 			// timestamp as string
-			['February 13, 2009 at 11:31:30 PM GMT+0', 'en', 'datetime', '1234567890'],
-			['13. Februar 2009 um 23:31:30 GMT+0', 'de', 'datetime', '1234567890'],
+			['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', 'en', 'date', '1234567890'],
 			['13. Februar 2009', 'de', 'date', '1234567890'],
-			['11:31:30 PM GMT+0', 'en', 'time', '1234567890'],
-			['23:31:30 GMT+0', 'de', 'time', '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 GMT+0', 'en', 'datetime', 1234567890],
-			['13. Februar 2009 um 23:31:30 GMT+0', 'de', 'datetime', 1234567890],
+			['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', 'en', 'date', 1234567890],
 			['13. Februar 2009', 'de', 'date', 1234567890],
-			['11:31:30 PM GMT+0', 'en', 'time', 1234567890],
-			['23:31:30 GMT+0', 'de', 'time', 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')],

diff --git a/tests/lib/UtilTest.php b/tests/lib/UtilTest.php
@@ -39,7 +39,7 @@ public function testFormatDate() {
 		\date_default_timezone_set("UTC");
 
 		$result = OC_Util::formatDate(1350129205);
-		$expected = 'October 13, 2012 at 11:53:25 AM GMT+0';
+		$expected = 'October 13, 2012 at 11:53:25 AM UTC';
 		$this->assertEquals($expected, $result);
 
 		$result = OC_Util::formatDate(1102831200, true);
@@ -65,11 +65,11 @@ 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 GMT+0', 'UTC'],
-			[-13, 'October 13, 2012 at 11:53:25 AM GMT+0', 'UTC'],
+			[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 GMT+0', 'UTC'],
+			[15.5, 'October 13, 2012 at 11:53:25 AM UTC', 'UTC'],
 		];
 	}