Merge ~mkukri/ubuntu/+source/phpmyadmin:merge into ubuntu/+source/phpmyadmin:debian/sid

[Mate Kukri]

Merge with Debian

[William Desportes (williamdes)]

As far as I know normally all patches from symfony are dropped from Ubuntu
Said in an other way: if symfony has no Ubuntu diff, phpMyAdmin should not have any in Ubuntu

review: Disapprove

[Mate Kukri (mkukri)]

> As far as I know normally all patches from symfony are dropped from Ubuntu
> Said in an other way: if symfony has no Ubuntu diff, phpMyAdmin should not
> have any in Ubuntu

Should this be just synced from Debian as is?

[Mate Kukri (mkukri)]

See LP: #2044817

[Mate Kukri (mkukri)]

#ubuntu-devel discussion led to this being uploaded, there is still desire to eventually have this synced.

[Simon Quigley (tsimonq2)]

review: Approve

[Athos Ribeiro (athos-ribeiro)]

Hi William,

I believe we still carry the PSR stack which causes the issues that originally led to this delta being added.

This will only be fixed once the symfony transition is over in debian and gets sync'd back in Ubuntu. Hopefully we will be able to drop this delta for noble though :)

[William Desportes (williamdes)]

Thank you for clearing this up for me, you can go ahead then

review: Approve

diff --git a/debian/changelog b/debian/changelog
index b871191..9f9482d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+phpmyadmin (4:5.2.1+dfsg-2ubuntu1) noble; urgency=medium
+
+  * Merge with Debian unstable. Remaining changes:
+    - Require PHP >= 8.0 (LP #2016016)
+
+ -- Mate Kukri <[e-mail]>  Mon, 27 Nov 2023 15:44:19 +0000
+
 phpmyadmin (4:5.2.1+dfsg-2) unstable; urgency=medium
 
   * Allow symfony 6
@@ -14,6 +21,12 @@ phpmyadmin (4:5.2.1+dfsg-2) unstable; urgency=medium
 
  -- William Desportes <[e-mail]>  Wed, 18 Oct 2023 21:55:32 +0200
 
+phpmyadmin (4:5.2.1+dfsg-1ubuntu1) mantic; urgency=medium
+
+  * Require PHP >= 8.0 (LP: #2016016)
+
+ -- William Desportes <[e-mail]>  Fri, 14 Apr 2023 18:11:15 +0200
+
 phpmyadmin (4:5.2.1+dfsg-1) unstable; urgency=medium
 
   * Add a d/pkg-php-tools-overrides to force the PHP 8.0 polyfill dep
diff --git a/debian/control b/debian/control
index 2c0fedb..3400cf0 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/Require-PHP-8.0.patch b/debian/patches/Require-PHP-8.0.patch
 new file mode 100644
index 0000000..b81b7e3
--- /dev/null
+++ b/debian/patches/Require-PHP-8.0.patch
@@ -0,0 +1,102 @@
+From: William Desportes <[e-mail]>
+Date: Fri, 14 Apr 2023 18:06:39 +0200
+Subject: Require PHP >= 8.0
+
+Due to the delta carried in the Ubuntu PSR stack, phpmyadmin does not run with
+PHP versions < 8. This patch makes it fail gracefully instead of allowing
+phpmyadmin to abruptly crash, allowing us to provide useful error messages so
+users understand what their next steps should be towards getting a functional
+phpmyadmin deployment.
+
+Bug: https://github.com/phpmyadmin/phpmyadmin/issues/17503
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/2016016
+Origin: vendor
+Forwarded: not-needed
+Reviewed-by: Athos Ribeiro <[e-mail]>
+---
+ index.php                | 9 +++++++--
+ js/messages.php          | 9 +++++++--
+ setup/lib/common.inc.php | 9 +++++++--
+ url.php                  | 9 +++++++--
+ 4 files changed, 28 insertions(+), 8 deletions(-)
+
+diff --git a/index.php b/index.php
+index 26fcabf..8831d47 100644
+--- a/index.php
++++ b/index.php
+@@ -11,8 +11,13 @@ if (! defined('ROOT_PATH')) {
+     // phpcs:enable
+ }
+ 
+-if (PHP_VERSION_ID < 70205) {
+-    die('<p>PHP 7.2.5+ is required.</p><p>Currently installed version is: ' . PHP_VERSION . '</p>');
++if (PHP_VERSION_ID < 80000) {
++    die(
++        '<p>PHP 8.0.0+ is required ('
++        . '<a href="https://bugs.launchpad.net/ubuntu/+source/symfony/+bug/1975892">Ubuntu Launchpad bug #1975892</a>'
++        . '&nbsp;and&nbsp;<a href="https://github.com/phpmyadmin/phpmyadmin/issues/17503">phpMyAdmin issue #17503</a>'
++        . ').</p><p>Currently installed version is: ' . PHP_VERSION . '</p>'
++    );
+ }
+ 
+ // phpcs:disable PSR1.Files.SideEffects
+diff --git a/js/messages.php b/js/messages.php
+index 927226b..1e2b249 100644
+--- a/js/messages.php
++++ b/js/messages.php
+@@ -15,8 +15,13 @@ if (! defined('ROOT_PATH')) {
+     // phpcs:enable
+ }
+ 
+-if (PHP_VERSION_ID < 70205) {
+-    die('<p>PHP 7.2.5+ is required.</p><p>Currently installed version is: ' . PHP_VERSION . '</p>');
++if (PHP_VERSION_ID < 80000) {
++    die(
++        '<p>PHP 8.0.0+ is required ('
++        . '<a href="https://bugs.launchpad.net/ubuntu/+source/symfony/+bug/1975892">Ubuntu Launchpad bug #1975892</a>'
++        . '&nbsp;and&nbsp;<a href="https://github.com/phpmyadmin/phpmyadmin/issues/17503">phpMyAdmin issue #17503</a>'
++        . ').</p><p>Currently installed version is: ' . PHP_VERSION . '</p>'
++    );
+ }
+ 
+ // phpcs:disable PSR1.Files.SideEffects
+diff --git a/setup/lib/common.inc.php b/setup/lib/common.inc.php
+index 17adc52..b681566 100644
+--- a/setup/lib/common.inc.php
++++ b/setup/lib/common.inc.php
+@@ -6,8 +6,13 @@ use PhpMyAdmin\Common;
+ use PhpMyAdmin\Config\ConfigFile;
+ use PhpMyAdmin\DatabaseInterface;
+ 
+-if (PHP_VERSION_ID < 70205) {
+-    die('<p>PHP 7.2.5+ is required.</p><p>Currently installed version is: ' . PHP_VERSION . '</p>');
++if (PHP_VERSION_ID < 80000) {
++    die(
++        '<p>PHP 8.0.0+ is required ('
++        . '<a href="https://bugs.launchpad.net/ubuntu/+source/symfony/+bug/1975892">Ubuntu Launchpad bug #1975892</a>'
++        . '&nbsp;and&nbsp;<a href="https://github.com/phpmyadmin/phpmyadmin/issues/17503">phpMyAdmin issue #17503</a>'
++        . ').</p><p>Currently installed version is: ' . PHP_VERSION . '</p>'
++    );
+ }
+ 
+ if (! defined('PHPMYADMIN')) {
+diff --git a/url.php b/url.php
+index 0274481..ebf69df 100644
+--- a/url.php
++++ b/url.php
+@@ -11,8 +11,13 @@ if (! defined('ROOT_PATH')) {
+     // phpcs:enable
+ }
+ 
+-if (PHP_VERSION_ID < 70205) {
+-    die('<p>PHP 7.2.5+ is required.</p><p>Currently installed version is: ' . PHP_VERSION . '</p>');
++if (PHP_VERSION_ID < 80000) {
++    die(
++        '<p>PHP 8.0.0+ is required ('
++        . '<a href="https://bugs.launchpad.net/ubuntu/+source/symfony/+bug/1975892">Ubuntu Launchpad bug #1975892</a>'
++        . '&nbsp;and&nbsp;<a href="https://github.com/phpmyadmin/phpmyadmin/issues/17503">phpMyAdmin issue #17503</a>'
++        . ').</p><p>Currently installed version is: ' . PHP_VERSION . '</p>'
++    );
+ }
+ 
+ // phpcs:disable PSR1.Files.SideEffects
diff --git a/debian/patches/series b/debian/patches/series
index 941b5c1..c152c80 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -17,3 +17,4 @@ Fix-a-case-where-a-fatal-error-message-was-not-displayed.patch
 Fix-sql-parser-tests-for-5.8.patch
 Fixes-for-sql-parser-5.8.patch
 Force-depends-on-sql-parser-5.8.patch
+Require-PHP-8.0.patch