Merge ~sergiodj/ubuntu/+source/symfony:fix-ftbfs into ubuntu/+source/symfony:ubuntu/devel

[Sergio Durigan Junior]

This fixes an FTBFS and autopkgtest failure that is happening with symfony.

There's a description of the problem in this bug: https://bugs.launchpad.net/ubuntu/+source/symfony/+bug/1893128

In a nutshell, this MP proposes that we drop a patch that was added because one of the tests was failing with an unknown reason. The new php7.4 package that Bryce uploaded contains several fixes that touch array manipulation, which is exactly what was failing before. In other words, I propose that we drop a workaround that was made to make the tests pass, and bring the package closer to what it should be :-).

There's a PPA with the proposed package here:

https://launchpad.net/~sergiodj/+archive/ubuntu/symfony-bug

The package now builds fine, and the autopkgtest also passes:

autopkgtest [16:16:14]: @@@@@@@@@@@@@@@@@@@@ summary
phpunit PASS

[Lucas Kanashiro (lucaskanashiro)]

LGTM, +1. It's great that we are fixing an issue dropping a patch :)

Thanks Sergio! Shall I sponsor the upload?

review: Approve

[Sergio Durigan Junior (sergiodj)]

On Wednesday, August 26 2020, Lucas Kanashiro wrote:

> LGTM, +1. It's great that we are fixing an issue dropping a patch :)
>
> Thanks Sergio! Shall I sponsor the upload?

Thanks, Lucas! Yes, please :-).

--
Sergio
GPG key ID: E92F D0B3 6B14 F1F4 D8E0 EB2F 106D A1C8 C3CB BF14

[Lucas Kanashiro (lucaskanashiro)]

Uploaded:

$ git push pkg upload/4.4.11+dfsg-1ubuntu1
Enumerating objects: 20, done.
Counting objects: 100% (20/20), done.
Delta compression using up to 8 threads
Compressing objects: 100% (14/14), done.
Writing objects: 100% (14/14), 1.76 KiB | 601.00 KiB/s, done.
Total 14 (delta 10), reused 0 (delta 0)
To ssh://git.launchpad.net/ubuntu/+source/symfony
 * [new tag] upload/4.4.11+dfsg-1ubuntu1 -> upload/4.4.11+dfsg-1ubuntu1

$ dput ubuntu ../symfony_4.4.11+dfsg-1ubuntu1_source.changes
Checking signature on .changes
gpg: ../symfony_4.4.11+dfsg-1ubuntu1_source.changes: Valid signature from F823A2729883C97C
Checking signature on .dsc
gpg: ../symfony_4.4.11+dfsg-1ubuntu1.dsc: Valid signature from F823A2729883C97C
Uploading to ubuntu (via ftp to upload.ubuntu.com):
  Uploading symfony_4.4.11+dfsg-1ubuntu1.dsc: done.
  Uploading symfony_4.4.11+dfsg-1ubuntu1.debian.tar.xz: done.
  Uploading symfony_4.4.11+dfsg-1ubuntu1_source.changes: done.
Successfully uploaded packages.

diff --git a/debian/changelog b/debian/changelog
index a3e91f2..0d73e79 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+symfony (4.4.11+dfsg-1ubuntu1) groovy; urgency=medium
+
+  * d/p/VarDumper-Update-currently-broken-assertion.patch: Remove
+    patch; not needed anymore because the test now passes correctly
+    with the latest php7.4, which contains several fixes touching
+    array manipulations (LP: #1893128).
+
+ -- Sergio Durigan Junior <[e-mail]>  Wed, 26 Aug 2020 16:21:12 -0400
+
 symfony (4.4.11+dfsg-1) unstable; urgency=medium
 
   [ Fabien Potencier ]
diff --git a/debian/control b/debian/control
index c8ce13a..51889b1 100644
--- a/debian/control
+++ b/debian/control
@@ -1,5 +1,6 @@
 Source: symfony
-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]>
 Section: php
 Priority: optional
diff --git a/debian/patches/VarDumper-Update-currently-broken-assertion.patch b/debian/patches/VarDumper-Update-currently-broken-assertion.patch
deleted file mode 100644
index 1298a46..0000000
--- a/debian/patches/VarDumper-Update-currently-broken-assertion.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From: =?utf-8?q?David_Pr=C3=A9vot?= <[e-mail]>
-Date: Sun, 31 May 2020 14:37:00 -1000
-Subject: [VarDumper] Update currently broken assertion
-
-To be investigated
----
- src/Symfony/Component/VarDumper/Tests/Caster/SplCasterTest.php | 6 ------
- 1 file changed, 6 deletions(-)
-
-diff --git a/src/Symfony/Component/VarDumper/Tests/Caster/SplCasterTest.php b/src/Symfony/Component/VarDumper/Tests/Caster/SplCasterTest.php
-index 24701be..c4bec64 100644
---- a/src/Symfony/Component/VarDumper/Tests/Caster/SplCasterTest.php
-+++ b/src/Symfony/Component/VarDumper/Tests/Caster/SplCasterTest.php
-@@ -172,9 +172,6 @@ EOTXT;
-         $expected = <<<EOTXT
- ArrayObject {
-   +"foo": 234
--  -storage: array:1 [
--    0 => 123
--  ]
-   flag::STD_PROP_LIST: false
-   flag::ARRAY_AS_PROPS: false
-   iteratorClass: "ArrayIterator"
-@@ -193,9 +190,6 @@ EOTXT;
-         $expected = <<<EOTXT
- Symfony\Component\VarDumper\Tests\Caster\MyArrayIterator {
-   -foo: 123
--  -storage: array:1 [
--    0 => 234
--  ]
-   flag::STD_PROP_LIST: false
-   flag::ARRAY_AS_PROPS: false
- }
diff --git a/debian/patches/series b/debian/patches/series
index d2ecb39..ad7a333 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -18,5 +18,4 @@ DependencyInjection-Drop-currently-broken-assertion.patch
 ErrorHandler-Drop-currently-broken-assertions.patch
 Config-Drop-currently-broken-assertions.patch
 Workaround-failing-tests-with-php7.4.patch
-VarDumper-Update-currently-broken-assertion.patch
 HttpClient-group-network-for-test-failing-without-vulcain.patch