Merge ~bryce/britney:php-hints-2 into ~ubuntu-release/britney/+git/hints-ubuntu:devel

[Bryce Harrington]

https://autopkgtest.ubuntu.com/results/autopkgtest-impish/impish/s390x/s/symfony/20210616_201009_035e3@/log.gz

On s390x some of the tests involving reading/writing international resource files are failing, (presumably due to architectural differences for char data types?)

Symfony is not widely used in general, and probably has no users on s390x.

[Utkarsh Gupta (utkarsh)]

OK, I think versioned hints are good! However, we're at -1ubuntu6 but -1ubuntu4 was as problematic, too.

[Brian Murray (brian-murray)]

Instead of continuously hinting symfony why don't we integrate the patch in the following debian bug?

https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=908377

Given that we already have a debdiff for the package there isn't any cost to adding another patch.

diff --git a/ubuntu-release b/ubuntu-release
index 5473d28..ac94010 100644
--- a/ubuntu-release
+++ b/ubuntu-release
@@ -494,6 +494,7 @@ force-reset-test stunnel4/3:5.56-1
 force-reset-test svgpp/1.2.3+dfsg1-6/s390x
 ## LP: #1931893
 force-reset-test symfony/5.2.6+dfsg-1ubuntu4/armhf
+force-reset-test symfony/5.2.6+dfsg-1ubuntu4/s390x
 ## LP: #1922938
 force-reset-test syncthing/1.12.1~ds1-2/amd64
 ## LP: #1920825