Merge ~athos-ribeiro/ubuntu/+source/php-symfony-polyfill:merge-lp1973074-kinetic into ubuntu/+source/php-symfony-polyfill:debian/sid

[Athos Ribeiro]

Merge for php-symfony-polyfill as per LP: #1973074

A PPA with the proposed merge is available at https://launchpad.net/~athos-ribeiro/+archive/ubuntu/lp1973074-merge-php-symfony-polyfill-kinetic/+packages

Local result summary for the autopkgtest suite run:

autopkgtest [11:02:34]: @@@@@@@@@@@@@@@@@@@@ summary
command1 PASS

[Bryce Harrington (bryce)]

LGTM, +1

The tests impacted by libicu changes struck me as a bit fiddly, so not at all surprised it needs more updating.

review: Approve

[Athos Ribeiro (athos-ribeiro)]

Thanks Bryce!

Uploaded

$ dput ubuntu ../php-symfony-polyfill_1.25.0-2ubuntu1_source.changes
D: Setting host argument.
Checking signature on .changes
gpg: ../php-symfony-polyfill_1.25.0-2ubuntu1_source.changes: Valid signature from 033C4CA276024834
Checking signature on .dsc
gpg: ../php-symfony-polyfill_1.25.0-2ubuntu1.dsc: Valid signature from 033C4CA276024834
Package includes an .orig.tar.gz file although the debian revision suggests
that it might not be required. Multiple uploads of the .orig.tar.gz may be
rejected by the upload queue management software.
Uploading to ubuntu (via ftp to upload.ubuntu.com):
  Uploading php-symfony-polyfill_1.25.0-2ubuntu1.dsc: done.
  Uploading php-symfony-polyfill_1.25.0.orig.tar.gz: done.
  Uploading php-symfony-polyfill_1.25.0-2ubuntu1.debian.tar.xz: done.
  Uploading php-symfony-polyfill_1.25.0-2ubuntu1_source.buildinfo: done.
  Uploading php-symfony-polyfill_1.25.0-2ubuntu1_source.changes: done.
Successfully uploaded packages.

diff --git a/debian/changelog b/debian/changelog
index 1f6166c..4f1fc0f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,16 @@
+php-symfony-polyfill (1.25.0-2ubuntu1) kinetic; urgency=medium
+
+  * Merge with Debian unstable (LP: #1973074). Remaining changes:
+    - d/p/0003-Fix-QQQQQ-date-format.patch: add support to libicu70.
+      LP #1964709
+  * Dropped changes:
+    - d/p/revert-update-intl-currencies-data.patch:
+      Add patch to revert upstream's commit for
+      updating intl currencies data.
+      [ Removed due to LP #1964709 ]
+
+ -- Athos Ribeiro <[e-mail]>  Thu, 12 May 2022 10:47:21 -0300
+
 php-symfony-polyfill (1.25.0-2) unstable; urgency=medium
 
   * Team upload.
@@ -15,6 +28,22 @@ php-symfony-polyfill (1.25.0-1) unstable; urgency=medium
 
  -- David Prévot <[e-mail]>  Mon, 07 Mar 2022 00:32:13 +0100
 
+php-symfony-polyfill (1.24.0-1ubuntu2) jammy; urgency=medium
+
+  * d/patches: libicu70 and PHP 8.1 adjustments. (LP: #1964709)
+    - Drop Ubuntu patch to allow PHP 8.1 symfony support.
+    - d/p/0002-Fix-QQQQQ-date-format.patch: add support to libicu70.
+
+ -- Athos Ribeiro <[e-mail]>  Thu, 10 Mar 2022 22:17:19 -0300
+
+php-symfony-polyfill (1.24.0-1ubuntu1) jammy; urgency=medium
+
+  * d/p/revert-update-intl-currencies-data.patch:
+    Add patch to revert upstream's commit for
+    updating intl currencies data.
+
+ -- Utkarsh Gupta <[e-mail]>  Fri, 21 Jan 2022 04:56:16 +0530
+
 php-symfony-polyfill (1.24.0-1) unstable; urgency=medium
 
   [ Nicolas Grekas ]
diff --git a/debian/control b/debian/control
index 207c2f8..b0ad20c 100644
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,8 @@
 Source: php-symfony-polyfill
 Section: php
 Priority: optional
-Maintainer: Debian PHP PEAR Maintainers <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: Debian PHP PEAR Maintainers <[e-mail]>
 Uploaders: Daniel Beyer <[e-mail]>, David Prévot <[e-mail]>
 Build-Depends: debhelper-compat (= 13),
                dh-sequence-phpcomposer,
diff --git a/debian/patches/0003-Fix-QQQQQ-date-format.patch b/debian/patches/0003-Fix-QQQQQ-date-format.patch
new file mode 100644
index 0000000..0f3876a
--- /dev/null
+++ b/debian/patches/0003-Fix-QQQQQ-date-format.patch
@@ -0,0 +1,88 @@
+From ade8d6d02c5ca9860b02fac04918b73117cf4d2e Mon Sep 17 00:00:00 2001
+From: Athos Ribeiro <[e-mail]>
+Date: Sat, 12 Mar 2022 14:48:08 -0300
+Subject: [PATCH] Fix QQQQQ date format
+
+As per [1], the QQQQQ and qqqqq quarter patterns are supposed to convert
+quarter into numbers (1, 2, 3, or 4). Until vertion 70.1, ICU carried a
+bug [2] which would make those patterns to convert into the wrong string,
+mimicking the behavior of the QQQQ pattern. The issue has been fixed
+upstream [3] and released in ICU 70.1.
+
+This patch adjusts the pattern resolution according to the ICU version
+being used by intl.
+
+[1] https://unicode-org.github.io/icu/userguide/format_parse/datetime/#date-field-symbol-table
+[2] https://unicode-org.atlassian.net/browse/ICU-21647
+[3] https://github.com/unicode-org/icu/commit/dcfdaca46c1e3cc08764ad1d85f321ad0c27ae16
+
+Signed-off-by: Athos Ribeiro <[e-mail]>
+
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/php-symfony-polyfill/+bug/1964709
+Forwarded: https://github.com/symfony/polyfill/pull/399
+Last-Update: 2022-03-13
+---
+ src/Intl/Icu/DateFormat/QuarterTransformer.php   | 10 +++++++++-
+ tests/Intl/Icu/AbstractIntlDateFormatterTest.php | 10 ++++++++--
+ 2 files changed, 17 insertions(+), 3 deletions(-)
+
+diff --git a/src/Intl/Icu/DateFormat/QuarterTransformer.php b/src/Intl/Icu/DateFormat/QuarterTransformer.php
+index 4291a72..76d37cf 100644
+--- a/src/Intl/Icu/DateFormat/QuarterTransformer.php
++++ b/src/Intl/Icu/DateFormat/QuarterTransformer.php
+@@ -33,10 +33,18 @@ class QuarterTransformer extends Transformer
+                 return $this->padLeft($quarter, $length);
+             case 3:
+                 return 'Q'.$quarter;
+-            default:
++            case 4:
+                 $map = [1 => '1st quarter', 2 => '2nd quarter', 3 => '3rd quarter', 4 => '4th quarter'];
+ 
+                 return $map[$quarter];
++            default:
++                if (\defined('INTL_ICU_VERSION') && version_compare(\INTL_ICU_VERSION, '70.1', '<')) {
++                    $map = [1 => '1st quarter', 2 => '2nd quarter', 3 => '3rd quarter', 4 => '4th quarter'];
++
++                    return $map[$quarter];
++                } else {
++                    return $quarter;
++                }
+         }
+     }
+ 
+diff --git a/tests/Intl/Icu/AbstractIntlDateFormatterTest.php b/tests/Intl/Icu/AbstractIntlDateFormatterTest.php
+index b23a960..a0a51f8 100644
+--- a/tests/Intl/Icu/AbstractIntlDateFormatterTest.php
++++ b/tests/Intl/Icu/AbstractIntlDateFormatterTest.php
+@@ -81,6 +81,12 @@ abstract class AbstractIntlDateFormatterTest extends TestCase
+         $dateTime = new \DateTime('@0');
+         $dateTimeImmutable = new \DateTimeImmutable('@0');
+ 
++        /* https://unicode-org.atlassian.net/browse/ICU-21647 */
++        $expectedQuarterX5 = '1';
++        if (\defined('INTL_ICU_VERSION') && version_compare(\INTL_ICU_VERSION, '70.1', '<')) {
++            $expectedQuarterX5 = '1st quarter';
++        }
++
+         $formatData = [
+             /* general */
+             ['y-M-d', 0, '1970-1-1'],
+@@ -129,13 +135,13 @@ abstract class AbstractIntlDateFormatterTest extends TestCase
+             ['QQ', 0, '01'],
+             ['QQQ', 0, 'Q1'],
+             ['QQQQ', 0, '1st quarter'],
+-            ['QQQQQ', 0, '1st quarter'],
++            ['QQQQQ', 0, $expectedQuarterX5],
+ 
+             ['q', 0, '1'],
+             ['qq', 0, '01'],
+             ['qqq', 0, 'Q1'],
+             ['qqqq', 0, '1st quarter'],
+-            ['qqqqq', 0, '1st quarter'],
++            ['qqqqq', 0, $expectedQuarterX5],
+ 
+             // 4 months
+             ['Q', 7776000, '2'],
+-- 
+2.34.1
+
diff --git a/debian/patches/series b/debian/patches/series
index 4e623ec..08f2f3d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 0001-Adapt-to-installed-path.patch
 0002-Revert-Indicates-that-polyfills-provides-correspondi.patch
+0003-Fix-QQQQQ-date-format.patch