Merge ~utkarsh/ubuntu/+source/phpmyadmin:fix-autopkgtest-on-s390x into ubuntu/+source/phpmyadmin:ubuntu/devel

[Utkarsh Gupta]

Hello,

This MP fixes failures on s390x[1] and thereby would help phpmyadmin to migrate from -proposed[2].

The patch has already been merged upstream[3] and has been sent as a MR to salsa[4] to get uploaded to Debian once the archive opens again after the freeze.

I've tested this and it now builds fine and have also uploaded to the PPA:
https://launchpad.net/~utkarsh/+archive/ubuntu/experimental-dump/

Requesting you to review and sponsor the upload; should you need any other information, please let me know. TIA! \o/

---

[1]: https://autopkgtest.ubuntu.com/packages/p/phpmyadmin/impish/s390x
[2]: https://people.canonical.com/~ubuntu-archive/proposed-migration/update_excuses.html#phpmyadmin
[3]: https://github.com/phpmyadmin/phpmyadmin/pull/16913
[4]: https://salsa.debian.org/phpmyadmin-team/phpmyadmin/-/merge_requests/31

[William Desportes (williamdes)]

LGTM, I approve this change and package change

review: Approve (upstream)

[Lucas Kanashiro (lucaskanashiro)]

Thanks for the MP fixing those issues Utkarsh!

As a side note, I'd enable non-amd64 architectures in your PPA to make sure it builds fine in all of them. Apart from that, LGTM. There is a small typo in the changelog, I added an inline comment for that.

review: Needs Fixing

[Utkarsh Gupta (utkarsh)]

Thanks, Lucas.

All architectures are already enabled. It's arch: all, that's why it didn't build on other architectures.

That said, fixed the typo. Requesting for a re-review, thanks!

[Lucas Kanashiro (lucaskanashiro)]

Thanks. Package uploaded:

$ git push pkg upload/4%5.0.4+dfsg2-2ubuntu1
Enumerating objects: 27, done.
Counting objects: 100% (27/27), done.
Delta compression using up to 32 threads
Compressing objects: 100% (21/21), done.
Writing objects: 100% (21/21), 4.84 KiB | 1.61 MiB/s, done.
Total 21 (delta 14), reused 0 (delta 0)
remote: Checking connectivity: 21, done.
To ssh://git.launchpad.net/ubuntu/+source/phpmyadmin
 * [new tag] upload/4%5.0.4+dfsg2-2ubuntu1 -> upload/4%5.0.4+dfsg2-2ubuntu1
$ dput ubuntu ../phpmyadmin_5.0.4+dfsg2-2ubuntu1_source.changes
Checking signature on .changes
gpg: ../phpmyadmin_5.0.4+dfsg2-2ubuntu1_source.changes: Valid signature from F823A2729883C97C
Checking signature on .dsc
gpg: ../phpmyadmin_5.0.4+dfsg2-2ubuntu1.dsc: Valid signature from F823A2729883C97C
Uploading to ubuntu (via ftp to upload.ubuntu.com):
  Uploading phpmyadmin_5.0.4+dfsg2-2ubuntu1.dsc: done.
  Uploading phpmyadmin_5.0.4+dfsg2-2ubuntu1.debian.tar.xz: done.
  Uploading phpmyadmin_5.0.4+dfsg2-2ubuntu1_source.changes: done.
Successfully uploaded packages.

[Lucas Kanashiro (lucaskanashiro)]

review: Approve

diff --git a/debian/changelog b/debian/changelog
index f738c9f..ec589d7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+phpmyadmin (4:5.0.4+dfsg2-2ubuntu1) impish; urgency=medium
+
+  * d/p/skip-32-bit-incompatible-tests-on-s390x.patch: Add patch
+    to fix autopkgtest on s390x by disabling testImportOsm and
+    testDoImport as these two tests fail on s390x machines, which
+    looks like some 32-bit issues we already have.
+  * d/p/php-8-fixes.patch: Add patch fixes build & tests against
+    PHP 8. This will help unblock the ongoing PHP transition.
+    Thanks, William Desportes, for your help! \o/
+
+ -- Utkarsh Gupta <[e-mail]>  Tue, 25 May 2021 03:03:46 +0530
+
 phpmyadmin (4:5.0.4+dfsg2-2) unstable; urgency=medium
 
   * Add a patch for CVE-2021-21252
diff --git a/debian/control b/debian/control
index d52a15c..d32eb05 100644
--- a/debian/control
+++ b/debian/control
@@ -1,5 +1,6 @@
 Source: phpmyadmin
-Maintainer: phpMyAdmin Packaging Team <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: phpMyAdmin Packaging Team <[e-mail]>
 Uploaders: Felipe Sateler <[e-mail]>,
            Matthias Blümel <[e-mail]>,
            William Desportes <[e-mail]>
diff --git a/debian/patches/php-8-fixes.patch b/debian/patches/php-8-fixes.patch
 new file mode 100644
index 0000000..7761e8a
--- /dev/null
+++ b/debian/patches/php-8-fixes.patch
@@ -0,0 +1,150 @@
+Description: This patch fixes build & tests against PHP 8.
+Author: Utkarsh Gupta <[e-mail]>
+Origin: upstream
+Applied-Upstream: [v5.1.0] cabe45f5a44bec8b91f7cee463db4899555ac771
+                  [v5.1.0] b8e4d932b7bebcd1e4371c608117b1336fff8d99
+                  [v5.1.0] 0e728a67c5fd30fb15085b80e22d2b4fc48dee4a
+                  [v5.1.0] ff52752bc0c457154dfb9cdcb56d77a9a603fb18
+                  [v5.1.0] 00b419afe147624238d44dc5fe62a7cf07b14134
+                  [v5.1.0] bdc8760bc350b8422cf7ac722ccfa5b9ef268ac4
+Forwarded: https://salsa.debian.org/phpmyadmin-team/phpmyadmin/-/issues/49
+Last-Updated: 2021-05-25
+
+--- a/libraries/classes/Plugins/Import/ImportOds.php
++++ b/libraries/classes/Plugins/Import/ImportOds.php
+@@ -131,9 +131,11 @@
+         unset($data);
+ 
+         /**
+-         * Disable loading of external XML entities.
++         * Disable loading of external XML entities for PHP versions below 8.0.
+          */
+-        libxml_disable_entity_loader();
++        if (PHP_VERSION_ID < 80000) {
++            libxml_disable_entity_loader();
++        }
+ 
+         /**
+          * Load the XML string
+--- a/libraries/classes/Plugins/Import/ImportXml.php
++++ b/libraries/classes/Plugins/Import/ImportXml.php
+@@ -88,9 +88,11 @@
+         unset($data);
+ 
+         /**
+-         * Disable loading of external XML entities.
++         * Disable loading of external XML entities for PHP versions below 8.0.
+          */
+-        libxml_disable_entity_loader();
++        if (PHP_VERSION_ID < 80000) {
++            libxml_disable_entity_loader();
++        }
+ 
+         /**
+          * Load the XML string
+--- a/libraries/classes/Setup/ConfigGenerator.php
++++ b/libraries/classes/Setup/ConfigGenerator.php
+@@ -52,7 +52,7 @@
+         $persistKeys = $cf->getPersistKeysMap();
+ 
+         foreach ($conf as $k => $v) {
+-            $k = preg_replace('/[^A-Za-z0-9_]/', '_', $k);
++            $k = preg_replace('/[^A-Za-z0-9_]/', '_', (string) $k);
+             $ret .= self::_getVarExport($k, $v, $crlf);
+             if (isset($persistKeys[$k])) {
+                 unset($persistKeys[$k]);
+@@ -169,7 +169,7 @@
+                 . "*/" . $crlf
+                 . '$i++;' . $crlf;
+             foreach ($server as $k => $v) {
+-                $k = preg_replace('/[^A-Za-z0-9_]/', '_', $k);
++                $k = preg_replace('/[^A-Za-z0-9_]/', '_', (string) $k);
+                 $ret .= "\$cfg['Servers'][\$i]['$k'] = "
+                     . (is_array($v) && self::_isZeroBasedArray($v)
+                         ? self::_exportZeroBasedArray($v, $crlf)
+--- a/test/classes/HeaderTest.php
++++ b/test/classes/HeaderTest.php
+@@ -71,6 +71,7 @@
+      */
+     public function testEnable()
+     {
++        $GLOBALS['server'] = 0;
+         $header = new Header();
+         $this->assertStringContainsString(
+             '<title>phpMyAdmin</title>',
+@@ -85,6 +86,7 @@
+      */
+     public function testSetBodyId()
+     {
++        $GLOBALS['server'] = 0;
+         $header = new Header();
+         $header->setBodyId('PMA_header_id');
+         $this->assertStringContainsString(
+--- a/libraries/classes/Util.php
++++ b/libraries/classes/Util.php
+@@ -1312,6 +1312,10 @@
+             return null;
+         }
+ 
++        if (is_string($value)) {
++            $value = (float) $value;
++        }
++
+         $byteUnits = [
+             /* l10n: shortcuts for Byte */
+             __('B'),
+@@ -1397,6 +1401,10 @@
+             return '0';
+         }
+ 
++        if (is_string($value)) {
++            $value = (float) $value;
++        }
++
+         $originalValue = $value;
+         //number_format is not multibyte safe, str_replace is safe
+         if ($digits_left === 0) {
+--- a/libraries/classes/Controllers/Setup/HomeController.php
++++ b/libraries/classes/Controllers/Setup/HomeController.php
+@@ -32,7 +32,7 @@
+         $pages = $this->getPages();
+ 
+         // Handle done action info
+-        $actionDone = Core::isValid($params['action_done'], 'scalar') ? $params['action_done'] : null;
++        $actionDone = Core::isValid($params['action_done'], 'scalar') ? $params['action_done'] : '';
+         $actionDone = preg_replace('/[^a-z_]/', '', $actionDone);
+ 
+         // message handling
+--- a/libraries/classes/Table.php
++++ b/libraries/classes/Table.php
+@@ -578,7 +578,7 @@
+                             $query .= ' DEFAULT 0';
+                         } elseif ($type == 'BIT') {
+                             $query .= ' DEFAULT b\''
+-                            . preg_replace('/[^01]/', '0', $default_value)
++                            . preg_replace('/[^01]/', '0', (string) $default_value)
+                             . '\'';
+                         } elseif ($type == 'BOOLEAN') {
+                             if (preg_match('/^1|T|TRUE|YES$/i', (string) $default_value)) {
+--- a/libraries/classes/Gis/GisMultiPoint.php
++++ b/libraries/classes/Gis/GisMultiPoint.php
+@@ -215,7 +215,7 @@
+ 
+         $row = '';
+         foreach ($points_arr as $point) {
+-            if ($point[0] != '' && $point[1] != '') {
++            if (((float) $point[0]) !== 0.0 && ((float) $point[1]) !== 0.0) {
+                 $row .= '<circle cx="' . $point[0] . '" cy="'
+                     . $point[1] . '" r="3"';
+                 $point_options['id'] = $label . mt_rand();
+--- a/libraries/classes/Gis/GisPoint.php
++++ b/libraries/classes/Gis/GisPoint.php
+@@ -224,7 +224,7 @@
+         $points_arr = $this->extractPoints($point, $scale_data);
+ 
+         $row = '';
+-        if ($points_arr[0][0] != '' && $points_arr[0][1] != '') {
++        if (((float) $points_arr[0][0]) !== 0.0 && ((float) $points_arr[0][1]) !== 0.0) {
+             $row .= '<circle cx="' . $points_arr[0][0]
+                 . '" cy="' . $points_arr[0][1] . '" r="3"';
+             foreach ($point_options as $option => $val) {
diff --git a/debian/patches/series b/debian/patches/series
index 65ffb18..5b74ba5 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -9,3 +9,5 @@ Fix-test-for-Debian-versions-on-Debian-CI.patch
 Remove-dfsg-zxcvbn-js.patch
 CVE-2021-21252.patch
 Remove-metro-fonts.patch
+skip-32-bit-incompatible-tests-on-s390x.patch
+php-8-fixes.patch
diff --git a/debian/patches/skip-32-bit-incompatible-tests-on-s390x.patch b/debian/patches/skip-32-bit-incompatible-tests-on-s390x.patch
 new file mode 100644
index 0000000..f33995a
--- /dev/null
+++ b/debian/patches/skip-32-bit-incompatible-tests-on-s390x.patch
@@ -0,0 +1,38 @@
+Description: Skip testImportOsm and testDoImport on 32-bit/s390x arch
+Origin: upstream
+Applied-Upstream: https://github.com/phpmyadmin/phpmyadmin/pull/16913
+Forwarded: [Debian] https://salsa.debian.org/phpmyadmin-team/phpmyadmin/-/merge_requests/31
+Last-Updated: 2021-05-25
+
+From c309b96edd98bdce18506b6dfee1f3209bf6748f Mon Sep 17 00:00:00 2001
+From: Utkarsh Gupta <[e-mail]>
+Date: Mon, 24 May 2021 19:38:36 +0530
+Subject: [PATCH] Skip testImportOsm and testDoImport on 32-bit/s390x arch
+
+These two tests fail on s390x machines, looks like some
+32-bit issues we already have. Probably worth skipping
+these on 32-bit/s390x arch.
+
+Signed-off-by: Utkarsh Gupta <[e-mail]>
+---
+ test/classes/Plugins/Import/ImportShpTest.php | 2 ++
+ 1 file changed, 2 insertions(+)
+
+--- a/test/classes/Plugins/Import/ImportShpTest.php
++++ b/test/classes/Plugins/Import/ImportShpTest.php
+@@ -128,6 +128,7 @@
+      * @return void
+      *
+      * @group medium
++     * @group 32bit-incompatible
+      */
+     public function testImportOsm()
+     {
+@@ -164,6 +165,7 @@
+      * @return void
+      *
+      * @group medium
++     * @group 32bit-incompatible
+      */
+     public function testDoImport()
+     {