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

[Athos Ribeiro]

PPA: https://launchpad.net/~athos-ribeiro/+archive/ubuntu/lp1973123-symfony-merge-kinetic/+packages

Bileto: https://bileto.ubuntu.com/#/ticket/4861

The latest Symfony version dropped php-symfony-polyfill from build deps. On top of that, dh_phpcomposer added overrides for polyfill, resulting in the package being removed from the autoload injections.

However, since Symfony contains circular dependencies, we will need a 2-step build to get rid of those autoload injections for our symfony packages.

The first proposed upload, will build successfully but will fail to migrate, since the reverse dependency tests will require polyfill, which should be no longer in the synfony stack dependencies.

Then, the second upload will get rid of those autoload calls to polyfill and the reverse dependency tests should be able to proceed.

Hence, this MP is proposing an upload for this merge, and a second no change rebuild upload.

[Athos Ribeiro (athos-ribeiro)]

This is ready for review. As seen in Bileto, doctrine will also need a rebuild to get things set after polyfill being dropped.

[Bryce Harrington (bryce)]

Looks good, +1.

I have PTSD looking at the Ubuntu delta here ;-)
Maybe some day we can drop it, but for now it all still looks applicable.
In theory this would be worth forwarding to Debian, however until they move to the same PSR version its not going to be pertinent for them. However, there might be some utility in filing one bug report and/or branch with them containing the patches on top of their package.

The approach of double uploading to clear the build first, then the migration, is the typical pattern for symfony, so +1 on that. I don't think there's an easier solution than that.

If the circular dependencies get confusing, don't be shy about grabbing me, even just for having a 2nd pair of eyes.

review: Approve

[Athos Ribeiro (athos-ribeiro)]

Thanks Bryce!

Uploaded and performed a no change rebuild after the first one was complete.

diff --git a/debian/changelog b/debian/changelog
index fa7943f..706cf8d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,30 @@
+symfony (5.4.9+dfsg-1ubuntu1) kinetic; urgency=medium
+
+  * Merge with Debian unstable (LP: #1973123). Remaining changes:
+    - d/rules: Disable running phpunit testsuite during build.
+    - d/p/implement-psr-log-3.patch: Implement psr/log 3
+    - Drop d/p/Adapt-conflict-to-Debian-expectations.patch:
+      Unnecessary and causes conflict for php-email-validator
+    - d/p/implement-psr-link-2.patch: Implement psr/link2 for php8.1
+    - d/p/drop-conflict-email-validator.patch: Drop conflicts for
+      php-email-validator to allow version 3.1.2-1.
+    - d/p/implement-psr-container-2.patch: Allow php-psr-container 2.0.2
+    - d/p/implement-psr-cache-3.patch: Allow php-psr-cache 3.0 for php8.1
+    - d/t/control: Mark tests flaky for now due to remaining php8.1
+      inadequacies.
+      + Many more routines require return types specified in order for tests
+        to pass successfully with psr/container 3.  The upstream patches for
+        this are large and not available until symfony 6.0.0.
+    - d/p/add-return-types.patch: Add return types required for
+      psr components, to resolve autopkgtest failures.
+  * New changes:
+    - d/t/control: require php-cache-tag-interop for cache integration
+      tests autoloader. This was once provided by
+      php-cache-integration-tests, but has been dropped there to allow
+      migration to new PSR stack.
+
+ -- Athos Ribeiro <[e-mail]>  Thu, 02 Jun 2022 18:29:45 -0300
+
 symfony (5.4.9+dfsg-1) unstable; urgency=medium
 
   [ Fabien Potencier ]
@@ -25,6 +52,74 @@ symfony (5.4.6+dfsg-1) unstable; urgency=medium
 
  -- David Prévot <[e-mail]>  Sun, 06 Mar 2022 22:17:14 +0100
 
+symfony (5.4.4+dfsg-1ubuntu8) jammy; urgency=medium
+
+  * d/p/add-return-types.patch: Expand patch to include a bunch of
+    additional param and return types for routines, as required for
+    autopkgtests for php-twig, doctrine-related components, and
+    phpmyadmin.  This should bring most things up to conformance with
+    the PSR components shipped in Ubuntu 22.04, yet may differ slightly
+    from what is shipping upstream.
+
+ -- Bryce Harrington <[e-mail]>  Sat, 12 Mar 2022 03:18:25 +0000
+
+symfony (5.4.4+dfsg-1ubuntu7) jammy; urgency=medium
+
+  * d/p/add-return-types.patch: Modify patch to add another necessary
+    get() return type.
+
+ -- Bryce Harrington <[e-mail]>  Sun, 06 Mar 2022 01:48:46 +0000
+
+symfony (5.4.4+dfsg-1ubuntu6) jammy; urgency=medium
+
+  * d/p/add-return-types.patch: Add return types required for
+    psr/container 3, to resolve autopkgtest failures.
+  * d/t/control: Mark tests flaky for now due to remaining php8.1
+    inadequacies.
+    - Many more routines require return types specified in order for tests
+      to pass successfully with psr/container 3.  The upstream patches for
+      this are large and not available until symfony 6.0.0.
+
+ -- Bryce Harrington <[e-mail]>  Sat, 05 Mar 2022 12:19:15 +0000
+
+symfony (5.4.4+dfsg-1ubuntu5) jammy; urgency=medium
+
+  * d/p/implement-psr-link-2.patch: Implement psr/link2 for php8.1
+  * d/p/implement-psr-container-2.patch: Allow php-psr-container 2.0.2
+  * d/p/implement-psr-cache-3.patch: Allow php-psr-cache 3.0 for php8.1
+  * Drop d/p/Adapt-conflict-to-Debian-expectations.patch:     -
+    Unnecessary and causes conflict for php-email-validator 3.1.2
+    now available in Jammy
+  * d/p/drop-conflict-email-validator.patch: Drop conflicts for
+    php-email-validator to allow version 3.1.2-1.
+
+ -- Bryce Harrington <[e-mail]>  Wed, 02 Mar 2022 22:06:38 +0000
+
+symfony (5.4.4+dfsg-1ubuntu4) jammy; urgency=medium
+
+  * d/p/implement-psr-log-3.patch: Implement psr/log 3
+
+ -- Bryce Harrington <[e-mail]>  Mon, 28 Feb 2022 17:59:44 +0000
+
+symfony (5.4.4+dfsg-1ubuntu3) jammy; urgency=medium
+
+  * No change rebuild against newer doctrine
+
+ -- Bryce Harrington <[e-mail]>  Thu, 24 Feb 2022 11:05:07 -0800
+
+symfony (5.4.4+dfsg-1ubuntu2) jammy; urgency=medium
+
+  * No change rebuild (hopefully against newer php-psr-log)
+
+ -- Bryce Harrington <[e-mail]>  Tue, 15 Feb 2022 22:55:37 +0000
+
+symfony (5.4.4+dfsg-1ubuntu1) jammy; urgency=medium
+
+  * Merge from Debian.  Remaining changes:
+    - d/rules: Disable running phpunit testsuite during build.
+
+ -- Bryce Harrington <[e-mail]>  Fri, 11 Feb 2022 19:42:35 +0000
+
 symfony (5.4.4+dfsg-1) unstable; urgency=medium
 
   [ Fabien Potencier ]
diff --git a/debian/control b/debian/control
index e6f03b9..faf7a8f 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/add-return-types.patch b/debian/patches/add-return-types.patch
new file mode 100644
index 0000000..53ec18a
--- /dev/null
+++ b/debian/patches/add-return-types.patch
@@ -0,0 +1,1918 @@
+Origin: https://github.com/symfony/symfony/commit/44b1a7a57eec2a80f94950a7b1a4271f09d94ee9
+
+
+--- a/src/Symfony/Bundle/FrameworkBundle/CacheWarmer/TranslationsCacheWarmer.php
++++ b/src/Symfony/Bundle/FrameworkBundle/CacheWarmer/TranslationsCacheWarmer.php
+@@ -62,7 +62,7 @@
+     /**
+      * {@inheritdoc}
+      */
+-    public static function getSubscribedServices()
++    public static function getSubscribedServices(): array
+     {
+         return [
+             'translator' => TranslatorInterface::class,
+--- a/src/Symfony/Bundle/FrameworkBundle/Controller/AbstractController.php
++++ b/src/Symfony/Bundle/FrameworkBundle/Controller/AbstractController.php
+@@ -86,7 +86,7 @@
+         return $this->container->get('parameter_bag')->get($name);
+     }
+ 
+-    public static function getSubscribedServices()
++    public static function getSubscribedServices(): array
+     {
+         return [
+             'router' => '?'.RouterInterface::class,
+--- a/src/Symfony/Bundle/FrameworkBundle/Routing/Router.php
++++ b/src/Symfony/Bundle/FrameworkBundle/Routing/Router.php
+@@ -201,7 +201,7 @@
+     /**
+      * {@inheritdoc}
+      */
+-    public static function getSubscribedServices()
++    public static function getSubscribedServices(): array
+     {
+         return [
+             'routing.loader' => LoaderInterface::class,
+--- a/src/Symfony/Bundle/FrameworkBundle/Tests/Translation/TranslatorTest.php
++++ b/src/Symfony/Bundle/FrameworkBundle/Tests/Translation/TranslatorTest.php
+@@ -22,6 +22,7 @@
+ use Symfony\Component\Translation\Loader\LoaderInterface;
+ use Symfony\Component\Translation\Loader\YamlFileLoader;
+ use Symfony\Component\Translation\MessageCatalogue;
++use Symfony\Contracts\Translation\TranslatorInterface;
+ 
+ class TranslatorTest extends TestCase
+ {
+@@ -310,7 +311,7 @@
+         return $container;
+     }
+ 
+-    public function getTranslator($loader, $options = [], $loaderFomat = 'loader', $translatorClass = Translator::class, $defaultLocale = 'en', array $enabledLocales = [])
++    public function getTranslator($loader, $options = [], $loaderFomat = 'loader', $translatorClass = Translator::class, $defaultLocale = 'en', array $enabledLocales = []): TranslatorInterface
+     {
+         $translator = $this->createTranslator($loader, $options, $translatorClass, $loaderFomat, $defaultLocale, $enabledLocales);
+ 
+--- a/src/Symfony/Bundle/TwigBundle/CacheWarmer/TemplateCacheWarmer.php
++++ b/src/Symfony/Bundle/TwigBundle/CacheWarmer/TemplateCacheWarmer.php
+@@ -81,7 +81,7 @@
+     /**
+      * {@inheritdoc}
+      */
+-    public static function getSubscribedServices()
++    public static function getSubscribedServices(): array
+     {
+         return [
+             'twig' => Environment::class,
+--- a/src/Symfony/Component/Cache/Adapter/AbstractTagAwareAdapter.php
++++ b/src/Symfony/Component/Cache/Adapter/AbstractTagAwareAdapter.php
+@@ -285,7 +285,7 @@
+     /**
+      * {@inheritdoc}
+      */
+-    public function invalidateTags(array $tags)
++    public function invalidateTags(array $tags): bool
+     {
+         if (empty($tags)) {
+             return false;
+--- a/src/Symfony/Component/Cache/Adapter/ArrayAdapter.php
++++ b/src/Symfony/Component/Cache/Adapter/ArrayAdapter.php
+@@ -73,7 +73,7 @@
+     /**
+      * {@inheritdoc}
+      */
+-    public function get(string $key, callable $callback, float $beta = null, array &$metadata = null)
++    public function get(string $key, callable $callback, float $beta = null, array &$metadata = null): mixed
+     {
+         $item = $this->getItem($key);
+         $metadata = $item->getMetadata();
+@@ -97,10 +97,8 @@
+ 
+     /**
+      * {@inheritdoc}
+-     *
+-     * @return bool
+      */
+-    public function hasItem($key)
++    public function hasItem(mixed $key): bool
+     {
+         if (\is_string($key) && isset($this->expiries[$key]) && $this->expiries[$key] > microtime(true)) {
+             if ($this->maxItems) {
+@@ -120,7 +118,7 @@
+     /**
+      * {@inheritdoc}
+      */
+-    public function getItem($key)
++    public function getItem(mixed $key): CacheItem
+     {
+         if (!$isHit = $this->hasItem($key)) {
+             $value = null;
+@@ -139,7 +137,7 @@
+     /**
+      * {@inheritdoc}
+      */
+-    public function getItems(array $keys = [])
++    public function getItems(array $keys = []): iterable
+     {
+         \assert(self::validateKeys($keys));
+ 
+@@ -148,10 +146,8 @@
+ 
+     /**
+      * {@inheritdoc}
+-     *
+-     * @return bool
+      */
+-    public function deleteItem($key)
++    public function deleteItem(mixed $key): bool
+     {
+         \assert('' !== CacheItem::validateKey($key));
+         unset($this->values[$key], $this->expiries[$key]);
+@@ -161,10 +157,8 @@
+ 
+     /**
+      * {@inheritdoc}
+-     *
+-     * @return bool
+      */
+-    public function deleteItems(array $keys)
++    public function deleteItems(array $keys): bool
+     {
+         foreach ($keys as $key) {
+             $this->deleteItem($key);
+@@ -175,10 +169,8 @@
+ 
+     /**
+      * {@inheritdoc}
+-     *
+-     * @return bool
+      */
+-    public function save(CacheItemInterface $item)
++    public function save(CacheItemInterface $item): bool
+     {
+         if (!$item instanceof CacheItem) {
+             return false;
+@@ -230,30 +222,24 @@
+ 
+     /**
+      * {@inheritdoc}
+-     *
+-     * @return bool
+      */
+-    public function saveDeferred(CacheItemInterface $item)
++    public function saveDeferred(CacheItemInterface $item): bool
+     {
+         return $this->save($item);
+     }
+ 
+     /**
+      * {@inheritdoc}
+-     *
+-     * @return bool
+      */
+-    public function commit()
++    public function commit(): bool
+     {
+         return true;
+     }
+ 
+     /**
+      * {@inheritdoc}
+-     *
+-     * @return bool
+      */
+-    public function clear(string $prefix = '')
++    public function clear(string $prefix = ''): bool
+     {
+         if ('' !== $prefix) {
+             $now = microtime(true);
+@@ -276,10 +262,8 @@
+ 
+     /**
+      * Returns all cached values, with cache miss as null.
+-     *
+-     * @return array
+      */
+-    public function getValues()
++    public function getValues(): array
+     {
+         if (!$this->storeSerialized) {
+             return $this->values;
+--- a/src/Symfony/Component/Cache/Adapter/ChainAdapter.php
++++ b/src/Symfony/Component/Cache/Adapter/ChainAdapter.php
+@@ -92,7 +92,7 @@
+     /**
+      * {@inheritdoc}
+      */
+-    public function get(string $key, callable $callback, float $beta = null, array &$metadata = null)
++    public function get(string $key, callable $callback, float $beta = null, array &$metadata = null): mixed
+     {
+         $lastItem = null;
+         $i = 0;
+@@ -120,7 +120,7 @@
+     /**
+      * {@inheritdoc}
+      */
+-    public function getItem($key)
++    public function getItem(mixed $key): CacheItem
+     {
+         $syncItem = self::$syncItem;
+         $misses = [];
+@@ -145,7 +145,7 @@
+     /**
+      * {@inheritdoc}
+      */
+-    public function getItems(array $keys = [])
++    public function getItems(array $keys = []): iterable
+     {
+         return $this->generateItems($this->adapters[0]->getItems($keys), 0);
+     }
+@@ -183,10 +183,8 @@
+ 
+     /**
+      * {@inheritdoc}
+-     *
+-     * @return bool
+      */
+-    public function hasItem($key)
++    public function hasItem(mixed $key): bool
+     {
+         foreach ($this->adapters as $adapter) {
+             if ($adapter->hasItem($key)) {
+@@ -199,10 +197,8 @@
+ 
+     /**
+      * {@inheritdoc}
+-     *
+-     * @return bool
+      */
+-    public function clear(string $prefix = '')
++    public function clear(string $prefix = ''): bool
+     {
+         $cleared = true;
+         $i = $this->adapterCount;
+@@ -220,10 +216,8 @@
+ 
+     /**
+      * {@inheritdoc}
+-     *
+-     * @return bool
+      */
+-    public function deleteItem($key)
++    public function deleteItem(mixed $key): bool
+     {
+         $deleted = true;
+         $i = $this->adapterCount;
+@@ -237,10 +231,8 @@
+ 
+     /**
+      * {@inheritdoc}
+-     *
+-     * @return bool
+      */
+-    public function deleteItems(array $keys)
++    public function deleteItems(array $keys): bool
+     {
+         $deleted = true;
+         $i = $this->adapterCount;
+@@ -254,10 +246,8 @@
+ 
+     /**
+      * {@inheritdoc}
+-     *
+-     * @return bool
+      */
+-    public function save(CacheItemInterface $item)
++    public function save(CacheItemInterface $item): bool
+     {
+         $saved = true;
+         $i = $this->adapterCount;
+@@ -271,10 +261,8 @@
+ 
+     /**
+      * {@inheritdoc}
+-     *
+-     * @return bool
+      */
+-    public function saveDeferred(CacheItemInterface $item)
++    public function saveDeferred(CacheItemInterface $item): bool
+     {
+         $saved = true;
+         $i = $this->adapterCount;
+@@ -288,10 +276,8 @@
+ 
+     /**
+      * {@inheritdoc}
+-     *
+-     * @return bool
+      */
+-    public function commit()
++    public function commit(): bool
+     {
+         $committed = true;
+         $i = $this->adapterCount;
+@@ -306,7 +292,7 @@
+     /**
+      * {@inheritdoc}
+      */
+-    public function prune()
++    public function prune(): bool
+     {
+         $pruned = true;
+ 
+--- a/src/Symfony/Component/Cache/Adapter/NullAdapter.php
++++ b/src/Symfony/Component/Cache/Adapter/NullAdapter.php
+@@ -40,7 +40,7 @@
+     /**
+      * {@inheritdoc}
+      */
+-    public function get(string $key, callable $callback, float $beta = null, array &$metadata = null)
++    public function get(string $key, callable $callback, float $beta = null, array &$metadata = null): mixed
+     {
+         $save = true;
+ 
+@@ -50,7 +50,7 @@
+     /**
+      * {@inheritdoc}
+      */
+-    public function getItem($key)
++    public function getItem(mixed $key): CacheItem
+     {
+         return (self::$createCacheItem)($key);
+     }
+@@ -58,77 +58,63 @@
+     /**
+      * {@inheritdoc}
+      */
+-    public function getItems(array $keys = [])
++    public function getItems(array $keys = []): iterable
+     {
+         return $this->generateItems($keys);
+     }
+ 
+     /**
+      * {@inheritdoc}
+-     *
+-     * @return bool
+      */
+-    public function hasItem($key)
++    public function hasItem($key): bool
+     {
+         return false;
+     }
+ 
+     /**
+      * {@inheritdoc}
+-     *
+-     * @return bool
+      */
+-    public function clear(string $prefix = '')
++    public function clear(string $prefix = ''): bool
+     {
+         return true;
+     }
+ 
+     /**
+      * {@inheritdoc}
+-     *
+-     * @return bool
+      */
+-    public function deleteItem($key)
++    public function deleteItem($key): bool
+     {
+         return true;
+     }
+ 
+     /**
+      * {@inheritdoc}
+-     *
+-     * @return bool
+      */
+-    public function deleteItems(array $keys)
++    public function deleteItems(array $keys): bool
+     {
+         return true;
+     }
+ 
+     /**
+      * {@inheritdoc}
+-     *
+-     * @return bool
+      */
+-    public function save(CacheItemInterface $item)
++    public function save(CacheItemInterface $item): bool
+     {
+         return true;
+     }
+ 
+     /**
+      * {@inheritdoc}
+-     *
+-     * @return bool
+      */
+-    public function saveDeferred(CacheItemInterface $item)
++    public function saveDeferred(CacheItemInterface $item): bool
+     {
+         return true;
+     }
+ 
+     /**
+      * {@inheritdoc}
+-     *
+-     * @return bool
+      */
+-    public function commit()
++    public function commit(): bool
+     {
+         return true;
+     }
+--- a/src/Symfony/Component/Cache/Adapter/PhpArrayAdapter.php
++++ b/src/Symfony/Component/Cache/Adapter/PhpArrayAdapter.php
+@@ -71,7 +71,7 @@
+      *
+      * @return CacheItemPoolInterface
+      */
+-    public static function create(string $file, CacheItemPoolInterface $fallbackPool)
++    public static function create(string $file, CacheItemPoolInterface $fallbackPool): CacheItemPoolInterface
+     {
+         if (!$fallbackPool instanceof AdapterInterface) {
+             $fallbackPool = new ProxyAdapter($fallbackPool);
+@@ -83,7 +83,7 @@
+     /**
+      * {@inheritdoc}
+      */
+-    public function get(string $key, callable $callback, float $beta = null, array &$metadata = null)
++    public function get(string $key, callable $callback, float $beta = null, array &$metadata = null): mixed
+     {
+         if (null === $this->values) {
+             $this->initialize();
+@@ -116,7 +116,7 @@
+     /**
+      * {@inheritdoc}
+      */
+-    public function getItem($key)
++    public function getItem(mixed $key): CacheItem
+     {
+         if (!\is_string($key)) {
+             throw new InvalidArgumentException(sprintf('Cache key must be string, "%s" given.', get_debug_type($key)));
+@@ -148,7 +148,7 @@
+     /**
+      * {@inheritdoc}
+      */
+-    public function getItems(array $keys = [])
++    public function getItems(array $keys = []): iterable
+     {
+         foreach ($keys as $key) {
+             if (!\is_string($key)) {
+@@ -164,10 +164,8 @@
+ 
+     /**
+      * {@inheritdoc}
+-     *
+-     * @return bool
+      */
+-    public function hasItem($key)
++    public function hasItem(mixed $key): bool
+     {
+         if (!\is_string($key)) {
+             throw new InvalidArgumentException(sprintf('Cache key must be string, "%s" given.', get_debug_type($key)));
+@@ -181,10 +179,8 @@
+ 
+     /**
+      * {@inheritdoc}
+-     *
+-     * @return bool
+      */
+-    public function deleteItem($key)
++    public function deleteItem(mixed $key): bool
+     {
+         if (!\is_string($key)) {
+             throw new InvalidArgumentException(sprintf('Cache key must be string, "%s" given.', get_debug_type($key)));
+@@ -198,10 +194,8 @@
+ 
+     /**
+      * {@inheritdoc}
+-     *
+-     * @return bool
+      */
+-    public function deleteItems(array $keys)
++    public function deleteItems(array $keys): bool
+     {
+         $deleted = true;
+         $fallbackKeys = [];
+@@ -230,10 +224,8 @@
+ 
+     /**
+      * {@inheritdoc}
+-     *
+-     * @return bool
+      */
+-    public function save(CacheItemInterface $item)
++    public function save(CacheItemInterface $item): bool
+     {
+         if (null === $this->values) {
+             $this->initialize();
+@@ -244,10 +236,8 @@
+ 
+     /**
+      * {@inheritdoc}
+-     *
+-     * @return bool
+      */
+-    public function saveDeferred(CacheItemInterface $item)
++    public function saveDeferred(CacheItemInterface $item): bool
+     {
+         if (null === $this->values) {
+             $this->initialize();
+@@ -258,20 +248,16 @@
+ 
+     /**
+      * {@inheritdoc}
+-     *
+-     * @return bool
+      */
+-    public function commit()
++    public function commit(): bool
+     {
+         return $this->pool->commit();
+     }
+ 
+     /**
+      * {@inheritdoc}
+-     *
+-     * @return bool
+      */
+-    public function clear(string $prefix = '')
++    public function clear(string $prefix = ''): bool
+     {
+         $this->keys = $this->values = [];
+ 
+@@ -292,7 +278,7 @@
+      *
+      * @return string[] A list of classes to preload on PHP 7.4+
+      */
+-    public function warmUp(array $values)
++    public function warmUp(array $values): array
+     {
+         if (file_exists($this->file)) {
+             if (!is_file($this->file)) {
+--- a/src/Symfony/Component/Cache/Adapter/ProxyAdapter.php
++++ b/src/Symfony/Component/Cache/Adapter/ProxyAdapter.php
+@@ -102,7 +102,7 @@
+     /**
+      * {@inheritdoc}
+      */
+-    public function get(string $key, callable $callback, float $beta = null, array &$metadata = null)
++    public function get(string $key, callable $callback, float $beta = null, array &$metadata = null): mixed
+     {
+         if (!$this->pool instanceof CacheInterface) {
+             return $this->doGet($this, $key, $callback, $beta, $metadata);
+--- a/src/Symfony/Component/Cache/Adapter/TagAwareAdapterInterface.php
++++ b/src/Symfony/Component/Cache/Adapter/TagAwareAdapterInterface.php
+@@ -29,5 +29,5 @@
+      *
+      * @throws InvalidArgumentException When $tags is not valid
+      */
+-    public function invalidateTags(array $tags);
++    public function invalidateTags(array $tags): bool;
+ }
+--- a/src/Symfony/Component/Cache/Adapter/TagAwareAdapter.php
++++ b/src/Symfony/Component/Cache/Adapter/TagAwareAdapter.php
+@@ -114,7 +114,7 @@
+     /**
+      * {@inheritdoc}
+      */
+-    public function invalidateTags(array $tags)
++    public function invalidateTags(array $tags): bool
+     {
+         $ids = [];
+         foreach ($tags as $tag) {
+@@ -128,10 +128,8 @@
+ 
+     /**
+      * {@inheritdoc}
+-     *
+-     * @return bool
+      */
+-    public function hasItem($key)
++    public function hasItem(mixed $key): bool
+     {
+         if (\is_string($key) && isset($this->deferred[$key])) {
+             $this->commit();
+@@ -163,7 +161,7 @@
+     /**
+      * {@inheritdoc}
+      */
+-    public function getItem($key)
++    public function getItem(mixed $key): CacheItem
+     {
+         foreach ($this->getItems([$key]) as $item) {
+             return $item;
+@@ -175,7 +173,7 @@
+     /**
+      * {@inheritdoc}
+      */
+-    public function getItems(array $keys = [])
++    public function getItems(array $keys = []): iterable
+     {
+         $tagKeys = [];
+         $commit = false;
+@@ -205,10 +203,8 @@
+ 
+     /**
+      * {@inheritdoc}
+-     *
+-     * @return bool
+      */
+-    public function clear(string $prefix = '')
++    public function clear(string $prefix = ''): bool
+     {
+         if ('' !== $prefix) {
+             foreach ($this->deferred as $key => $item) {
+@@ -229,20 +225,16 @@
+ 
+     /**
+      * {@inheritdoc}
+-     *
+-     * @return bool
+      */
+-    public function deleteItem($key)
++    public function deleteItem(mixed $key): bool
+     {
+         return $this->deleteItems([$key]);
+     }
+ 
+     /**
+      * {@inheritdoc}
+-     *
+-     * @return bool
+      */
+-    public function deleteItems(array $keys)
++    public function deleteItems(array $keys): bool
+     {
+         foreach ($keys as $key) {
+             if ('' !== $key && \is_string($key)) {
+@@ -255,10 +247,8 @@
+ 
+     /**
+      * {@inheritdoc}
+-     *
+-     * @return bool
+      */
+-    public function save(CacheItemInterface $item)
++    public function save(CacheItemInterface $item): bool
+     {
+         if (!$item instanceof CacheItem) {
+             return false;
+@@ -270,10 +260,8 @@
+ 
+     /**
+      * {@inheritdoc}
+-     *
+-     * @return bool
+      */
+-    public function saveDeferred(CacheItemInterface $item)
++    public function saveDeferred(CacheItemInterface $item): bool
+     {
+         if (!$item instanceof CacheItem) {
+             return false;
+@@ -285,10 +273,8 @@
+ 
+     /**
+      * {@inheritdoc}
+-     *
+-     * @return bool
+      */
+-    public function commit()
++    public function commit(): bool
+     {
+         if (!$this->deferred) {
+             return true;
+@@ -376,7 +362,7 @@
+         }
+     }
+ 
+-    private function getTagVersions(array $tagsByKey)
++    private function getTagVersions(array $tagsByKey): array
+     {
+         $tagVersions = [];
+         $fetchTagVersions = false;
+--- a/src/Symfony/Component/Cache/Adapter/TraceableAdapter.php
++++ b/src/Symfony/Component/Cache/Adapter/TraceableAdapter.php
+@@ -38,7 +38,7 @@
+     /**
+      * {@inheritdoc}
+      */
+-    public function get(string $key, callable $callback, float $beta = null, array &$metadata = null)
++    public function get(string $key, callable $callback, float $beta = null, array &$metadata = null): get
+     {
+         if (!$this->pool instanceof CacheInterface) {
+             throw new \BadMethodCallException(sprintf('Cannot call "%s::get()": this class doesn\'t implement "%s".', get_debug_type($this->pool), CacheInterface::class));
+--- a/src/Symfony/Component/Cache/Adapter/TraceableTagAwareAdapter.php
++++ b/src/Symfony/Component/Cache/Adapter/TraceableTagAwareAdapter.php
+@@ -26,7 +26,7 @@
+     /**
+      * {@inheritdoc}
+      */
+-    public function invalidateTags(array $tags)
++    public function invalidateTags(array $tags): bool
+     {
+         $event = $this->start(__FUNCTION__);
+         try {
+--- a/src/Symfony/Component/Cache/CacheItem.php
++++ b/src/Symfony/Component/Cache/CacheItem.php
+@@ -43,10 +43,8 @@
+ 
+     /**
+      * {@inheritdoc}
+-     *
+-     * @return mixed
+      */
+-    public function get()
++    public function get(): mixed
+     {
+         return $this->value;
+     }
+@@ -64,7 +62,7 @@
+      *
+      * @return $this
+      */
+-    public function set($value): self
++    public function set(mixed $value): static
+     {
+         $this->value = $value;
+ 
+@@ -76,7 +74,7 @@
+      *
+      * @return $this
+      */
+-    public function expiresAt($expiration): self
++    public function expiresAt(?\DateTimeInterface $expiration): static
+     {
+         if (null === $expiration) {
+             $this->expiry = null;
+@@ -94,7 +92,7 @@
+      *
+      * @return $this
+      */
+-    public function expiresAfter($time): self
++    public function expiresAfter(mixed $time): static
+     {
+         if (null === $time) {
+             $this->expiry = null;
+@@ -112,7 +110,7 @@
+     /**
+      * {@inheritdoc}
+      */
+-    public function tag($tags): ItemInterface
++    public function tag(mixed $tags): static
+     {
+         if (!$this->isTaggable) {
+             throw new LogicException(sprintf('Cache item "%s" comes from a non tag-aware pool: you cannot tag it.', $this->key));
+--- a/src/Symfony/Component/Cache/Tests/Adapter/AdapterTestCase.php
++++ b/src/Symfony/Component/Cache/Tests/Adapter/AdapterTestCase.php
+@@ -79,7 +79,7 @@
+                 $this->value = $value;
+             }
+ 
+-            public function __invoke(CacheItemInterface $item, bool &$save)
++            public function __invoke(CacheItemInterface $item, bool &$save): mixed
+             {
+                 Assert::assertSame('bar', $item->getKey());
+ 
+--- a/src/Symfony/Component/DependencyInjection/ContainerBuilder.php
++++ b/src/Symfony/Component/DependencyInjection/ContainerBuilder.php
+@@ -194,7 +194,7 @@
+      *
+      * @return bool
+      */
+-    public function isTrackingResources()
++    public function isTrackingResources(): bool
+     {
+         return $this->trackResources;
+     }
+@@ -223,7 +223,7 @@
+      *
+      * @throws LogicException if the extension is not registered
+      */
+-    public function getExtension(string $name)
++    public function getExtension(string $name): ExtensionInterface
+     {
+         if (isset($this->extensions[$name])) {
+             return $this->extensions[$name];
+@@ -241,7 +241,7 @@
+      *
+      * @return array<string, ExtensionInterface>
+      */
+-    public function getExtensions()
++    public function getExtensions(): array
+     {
+         return $this->extensions;
+     }
+@@ -251,7 +251,7 @@
+      *
+      * @return bool
+      */
+-    public function hasExtension(string $name)
++    public function hasExtension(string $name): bool
+     {
+         return isset($this->extensions[$name]) || isset($this->extensionsByNs[$name]);
+     }
+@@ -261,7 +261,7 @@
+      *
+      * @return ResourceInterface[]
+      */
+-    public function getResources()
++    public function getResources(): array
+     {
+         return array_values($this->resources);
+     }
+@@ -269,7 +269,7 @@
+     /**
+      * @return $this
+      */
+-    public function addResource(ResourceInterface $resource)
++    public function addResource(ResourceInterface $resource): static
+     {
+         if (!$this->trackResources) {
+             return $this;
+@@ -291,7 +291,7 @@
+      *
+      * @return $this
+      */
+-    public function setResources(array $resources)
++    public function setResources(array $resources): static
+     {
+         if (!$this->trackResources) {
+             return $this;
+@@ -309,7 +309,7 @@
+      *
+      * @return $this
+      */
+-    public function addObjectResource($object)
++    public function addObjectResource(object|string $object): static
+     {
+         if ($this->trackResources) {
+             if (\is_object($object)) {
+@@ -402,7 +402,7 @@
+      *
+      * @final
+      */
+-    public function fileExists(string $path, $trackContents = true): bool
++    public function fileExists(string $path, bool|string $trackContents = true): bool
+     {
+         $exists = file_exists($path);
+ 
+@@ -440,7 +440,7 @@
+      * @throws BadMethodCallException When this ContainerBuilder is compiled
+      * @throws \LogicException        if the extension is not registered
+      */
+-    public function loadFromExtension(string $extension, array $values = null)
++    public function loadFromExtension(string $extension, array $values = null): static
+     {
+         if ($this->isCompiled()) {
+             throw new BadMethodCallException('Cannot load from an extension on a compiled container.');
+@@ -461,7 +461,7 @@
+      *
+      * @return $this
+      */
+-    public function addCompilerPass(CompilerPassInterface $pass, string $type = PassConfig::TYPE_BEFORE_OPTIMIZATION, int $priority = 0)
++    public function addCompilerPass(CompilerPassInterface $pass, string $type = PassConfig::TYPE_BEFORE_OPTIMIZATION, int $priority = 0): static
+     {
+         $this->getCompiler()->addPass($pass, $type, $priority);
+ 
+@@ -475,7 +475,7 @@
+      *
+      * @return PassConfig
+      */
+-    public function getCompilerPassConfig()
++    public function getCompilerPassConfig(): PassConfig
+     {
+         return $this->getCompiler()->getPassConfig();
+     }
+@@ -485,7 +485,7 @@
+      *
+      * @return Compiler
+      */
+-    public function getCompiler()
++    public function getCompiler(): Compiler
+     {
+         if (null === $this->compiler) {
+             $this->compiler = new Compiler();
+@@ -522,14 +522,7 @@
+         }
+     }
+ 
+-    /**
+-     * Returns true if the given service is defined.
+-     *
+-     * @param string $id The service identifier
+-     *
+-     * @return bool
+-     */
+-    public function has(string $id)
++    public function has(string $id): bool
+     {
+         return isset($this->definitions[$id]) || isset($this->aliasDefinitions[$id]) || parent::has($id);
+     }
+@@ -544,7 +537,7 @@
+      *
+      * @see Reference
+      */
+-    public function get(string $id, int $invalidBehavior = ContainerInterface::EXCEPTION_ON_INVALID_REFERENCE)
++    public function get(string $id, int $invalidBehavior = ContainerInterface::EXCEPTION_ON_INVALID_REFERENCE): ?object
+     {
+         if ($this->isCompiled() && isset($this->removedIds[$id]) && ContainerInterface::EXCEPTION_ON_INVALID_REFERENCE >= $invalidBehavior) {
+             return parent::get($id);
+@@ -553,7 +546,7 @@
+         return $this->doGet($id, $invalidBehavior);
+     }
+ 
+-    private function doGet(string $id, int $invalidBehavior = ContainerInterface::EXCEPTION_ON_INVALID_REFERENCE, array &$inlineServices = null, bool $isConstructorArgument = false)
++    private function doGet(string $id, int $invalidBehavior = ContainerInterface::EXCEPTION_ON_INVALID_REFERENCE, array &$inlineServices = null, bool $isConstructorArgument = false): mixed
+     {
+         if (isset($inlineServices[$id])) {
+             return $inlineServices[$id];
+@@ -697,7 +690,7 @@
+      *
+      * @return array<array<string, mixed>>
+      */
+-    public function getExtensionConfig(string $name)
++    public function getExtensionConfig(string $name): array
+     {
+         if (!isset($this->extensionConfigs[$name])) {
+             $this->extensionConfigs[$name] = [];
+@@ -784,7 +777,7 @@
+     /**
+      * {@inheritdoc}
+      */
+-    public function getServiceIds()
++    public function getServiceIds(): array
+     {
+         return array_map('strval', array_unique(array_merge(array_keys($this->getDefinitions()), array_keys($this->aliasDefinitions), parent::getServiceIds())));
+     }
+@@ -794,7 +787,7 @@
+      *
+      * @return array<string, bool>
+      */
+-    public function getRemovedIds()
++    public function getRemovedIds(): array
+     {
+         return $this->removedIds;
+     }
+@@ -833,7 +826,7 @@
+      * @throws InvalidArgumentException if the id is not a string or an Alias
+      * @throws InvalidArgumentException if the alias is for itself
+      */
+-    public function setAlias(string $alias, $id)
++    public function setAlias(string $alias, string|Alias $id): Alias
+     {
+         if ('' === $alias || '\\' === $alias[-1] || \strlen($alias) !== strcspn($alias, "\0\r\n'")) {
+             throw new InvalidArgumentException(sprintf('Invalid alias id: "%s".', $alias));
+@@ -865,7 +858,7 @@
+     /**
+      * @return bool
+      */
+-    public function hasAlias(string $id)
++    public function hasAlias(string $id): bool
+     {
+         return isset($this->aliasDefinitions[$id]);
+     }
+@@ -873,7 +866,7 @@
+     /**
+      * @return array<string, Alias>
+      */
+-    public function getAliases()
++    public function getAliases(): array
+     {
+         return $this->aliasDefinitions;
+     }
+@@ -883,7 +876,7 @@
+      *
+      * @throws InvalidArgumentException if the alias does not exist
+      */
+-    public function getAlias(string $id)
++    public function getAlias(string $id): Alias
+     {
+         if (!isset($this->aliasDefinitions[$id])) {
+             throw new InvalidArgumentException(sprintf('The service alias "%s" does not exist.', $id));
+@@ -900,7 +893,7 @@
+      *
+      * @return Definition
+      */
+-    public function register(string $id, string $class = null)
++    public function register(string $id, string $class = null): Definition
+     {
+         return $this->setDefinition($id, new Definition($class));
+     }
+@@ -913,7 +906,7 @@
+      *
+      * @return Definition
+      */
+-    public function autowire(string $id, string $class = null)
++    public function autowire(string $id, string $class = null): Definition
+     {
+         return $this->setDefinition($id, (new Definition($class))->setAutowired(true));
+     }
+@@ -946,7 +939,7 @@
+      *
+      * @return array<string, Definition>
+      */
+-    public function getDefinitions()
++    public function getDefinitions(): array
+     {
+         return $this->definitions;
+     }
+@@ -958,7 +951,7 @@
+      *
+      * @throws BadMethodCallException When this ContainerBuilder is compiled
+      */
+-    public function setDefinition(string $id, Definition $definition)
++    public function setDefinition(string $id, Definition $definition): Definition
+     {
+         if ($this->isCompiled()) {
+             throw new BadMethodCallException('Adding definition to a compiled container is not allowed.');
+@@ -978,7 +971,7 @@
+      *
+      * @return bool
+      */
+-    public function hasDefinition(string $id)
++    public function hasDefinition(string $id): bool
+     {
+         return isset($this->definitions[$id]);
+     }
+@@ -990,7 +983,7 @@
+      *
+      * @throws ServiceNotFoundException if the service definition does not exist
+      */
+-    public function getDefinition(string $id)
++    public function getDefinition(string $id): Definition
+     {
+         if (!isset($this->definitions[$id])) {
+             throw new ServiceNotFoundException($id);
+@@ -1008,7 +1001,7 @@
+      *
+      * @throws ServiceNotFoundException if the service definition does not exist
+      */
+-    public function findDefinition(string $id)
++    public function findDefinition(string $id): Definition
+     {
+         $seen = [];
+         while (isset($this->aliasDefinitions[$id])) {
+@@ -1037,7 +1030,7 @@
+      * @throws RuntimeException         When the service is a synthetic service
+      * @throws InvalidArgumentException When configure callable is not callable
+      */
+-    private function createService(Definition $definition, array &$inlineServices, bool $isConstructorArgument = false, string $id = null, bool $tryProxy = true)
++    private function createService(Definition $definition, array &$inlineServices, bool $isConstructorArgument = false, string $id = null, bool $tryProxy = true): mixed
+     {
+         if (null === $id && isset($inlineServices[$h = spl_object_hash($definition)])) {
+             return $inlineServices[$h];
+@@ -1164,12 +1157,12 @@
+      * @return mixed The same value with all service references replaced by
+      *               the real service instances and all expressions evaluated
+      */
+-    public function resolveServices($value)
++    public function resolveServices(mixed $value): mixed
+     {
+         return $this->doResolveServices($value);
+     }
+ 
+-    private function doResolveServices($value, array &$inlineServices = [], bool $isConstructorArgument = false)
++    private function doResolveServices(mixed $value, array &$inlineServices = [], bool $isConstructorArgument = false): mixed
+     {
+         if (\is_array($value)) {
+             foreach ($value as $k => $v) {
+@@ -1255,7 +1248,7 @@
+      *
+      * @return array<string, array> An array of tags with the tagged service as key, holding a list of attribute arrays
+      */
+-    public function findTaggedServiceIds(string $name, bool $throwOnAbstract = false)
++    public function findTaggedServiceIds(string $name, bool $throwOnAbstract = false): array
+     {
+         $this->usedTags[] = $name;
+         $tags = [];
+@@ -1276,7 +1269,7 @@
+      *
+      * @return string[]
+      */
+-    public function findTags()
++    public function findTags(): array
+     {
+         $tags = [];
+         foreach ($this->getDefinitions() as $id => $definition) {
+@@ -1291,7 +1284,7 @@
+      *
+      * @return string[]
+      */
+-    public function findUnusedTags()
++    public function findUnusedTags(): array
+     {
+         return array_values(array_diff($this->findTags(), $this->usedTags));
+     }
+@@ -1304,7 +1297,7 @@
+     /**
+      * @return ExpressionFunctionProviderInterface[]
+      */
+-    public function getExpressionLanguageProviders()
++    public function getExpressionLanguageProviders(): array
+     {
+         return $this->expressionLanguageProviders;
+     }
+@@ -1314,7 +1307,7 @@
+      *
+      * @return ChildDefinition
+      */
+-    public function registerForAutoconfiguration(string $interface)
++    public function registerForAutoconfiguration(string $interface): ChildDefinition
+     {
+         if (!isset($this->autoconfiguredInstanceof[$interface])) {
+             $this->autoconfiguredInstanceof[$interface] = new ChildDefinition('');
+@@ -1365,7 +1358,7 @@
+      *
+      * @return array<string, ChildDefinition>
+      */
+-    public function getAutoconfiguredInstanceof()
++    public function getAutoconfiguredInstanceof(): array
+     {
+         return $this->autoconfiguredInstanceof;
+     }
+@@ -1389,7 +1382,7 @@
+      *
+      * @return mixed The value with env parameters resolved if a string or an array is passed
+      */
+-    public function resolveEnvPlaceholders($value, $format = null, array &$usedEnvs = null)
++    public function resolveEnvPlaceholders($value, $format = null, array &$usedEnvs = null): mixed
+     {
+         if (null === $format) {
+             $format = '%%env(%s)%%';
+@@ -1454,7 +1447,7 @@
+      *
+      * @return int[] The number of time each env vars has been resolved
+      */
+-    public function getEnvCounters()
++    public function getEnvCounters(): array
+     {
+         $bag = $this->getParameterBag();
+         $envPlaceholders = $bag instanceof EnvPlaceholderParameterBag ? $bag->getEnvPlaceholders() : $this->envPlaceholders;
+@@ -1598,7 +1591,7 @@
+      *
+      * @return string
+      */
+-    public static function hash($value)
++    public static function hash(mixed $value): string
+     {
+         $hash = substr(base64_encode(hash('sha256', serialize($value), true)), 0, 7);
+ 
+@@ -1608,7 +1601,7 @@
+     /**
+      * {@inheritdoc}
+      */
+-    protected function getEnv(string $name)
++    protected function getEnv(string $name): mixed
+     {
+         $value = parent::getEnv($name);
+         $bag = $this->getParameterBag();
+@@ -1637,7 +1630,7 @@
+         }
+     }
+ 
+-    private function callMethod(object $service, array $call, array &$inlineServices)
++    private function callMethod(object $service, array $call, array &$inlineServices): mixed
+     {
+         foreach (self::getServiceConditionals($call[1]) as $s) {
+             if (!$this->has($s)) {
+@@ -1660,7 +1653,7 @@
+      *
+      * @param mixed $service
+      */
+-    private function shareService(Definition $definition, $service, ?string $id, array &$inlineServices)
++    private function shareService(Definition $definition, mixed $service, ?string $id, array &$inlineServices)
+     {
+         $inlineServices[$id ?? spl_object_hash($definition)] = $service;
+ 
+--- a/src/Symfony/Component/DependencyInjection/ContainerInterface.php
++++ b/src/Symfony/Component/DependencyInjection/ContainerInterface.php
+@@ -48,12 +48,12 @@
+      *
+      * @see Reference
+      */
+-    public function get(string $id, int $invalidBehavior = self::EXCEPTION_ON_INVALID_REFERENCE);
++    public function get(string $id, int $invalidBehavior = self::EXCEPTION_ON_INVALID_REFERENCE): ?object;
+ 
+     /**
+      * @return bool
+      */
+-    public function has(string $id);
++    public function has(string $id): bool;
+ 
+     /**
+      * Check for whether or not a service has been initialized.
+--- a/src/Symfony/Component/DependencyInjection/Container.php
++++ b/src/Symfony/Component/DependencyInjection/Container.php
+@@ -89,7 +89,7 @@
+      *
+      * @return bool
+      */
+-    public function isCompiled()
++    public function isCompiled(): bool
+     {
+         return $this->compiled;
+     }
+@@ -99,7 +99,7 @@
+      *
+      * @return ParameterBagInterface
+      */
+-    public function getParameterBag()
++    public function getParameterBag(): ParameterBagInterface
+     {
+         return $this->parameterBag;
+     }
+@@ -119,7 +119,7 @@
+     /**
+      * @return bool
+      */
+-    public function hasParameter(string $name)
++    public function hasParameter(string $name): bool
+     {
+         return $this->parameterBag->has($name);
+     }
+@@ -179,14 +179,7 @@
+         $this->services[$id] = $service;
+     }
+ 
+-    /**
+-     * Returns true if the given service is defined.
+-     *
+-     * @param string $id The service identifier
+-     *
+-     * @return bool
+-     */
+-    public function has(string $id)
++    public function has(string $id): bool
+     {
+         if (isset($this->aliases[$id])) {
+             $id = $this->aliases[$id];
+@@ -212,7 +205,7 @@
+      *
+      * @see Reference
+      */
+-    public function get(string $id, int $invalidBehavior = /* self::EXCEPTION_ON_INVALID_REFERENCE */ 1)
++    public function get(string $id, int $invalidBehavior = /* self::EXCEPTION_ON_INVALID_REFERENCE */ 1): ?object
+     {
+         return $this->services[$id]
+             ?? $this->services[$id = $this->aliases[$id] ?? $id]
+@@ -279,7 +272,7 @@
+      *
+      * @return bool
+      */
+-    public function initialized(string $id)
++    public function initialized(string $id): bool
+     {
+         if (isset($this->aliases[$id])) {
+             $id = $this->aliases[$id];
+@@ -316,7 +309,7 @@
+      *
+      * @return string[]
+      */
+-    public function getServiceIds()
++    public function getServiceIds(): array
+     {
+         return array_map('strval', array_unique(array_merge(['service_container'], array_keys($this->fileMap), array_keys($this->methodMap), array_keys($this->aliases), array_keys($this->services))));
+     }
+@@ -326,7 +319,7 @@
+      *
+      * @return array
+      */
+-    public function getRemovedIds()
++    public function getRemovedIds(): array
+     {
+         return [];
+     }
+@@ -336,7 +329,7 @@
+      *
+      * @return string
+      */
+-    public static function camelize(string $id)
++    public static function camelize(string $id): string
+     {
+         return strtr(ucwords(strtr($id, ['_' => ' ', '.' => '_ ', '\\' => '_ '])), [' ' => '']);
+     }
+@@ -346,7 +339,7 @@
+      *
+      * @return string
+      */
+-    public static function underscore(string $id)
++    public static function underscore(string $id): string
+     {
+         return strtolower(preg_replace(['/([A-Z]+)([A-Z][a-z])/', '/([a-z\d])([A-Z])/'], ['\\1_\\2', '\\1_\\2'], str_replace('_', '.', $id)));
+     }
+@@ -366,7 +359,7 @@
+      *
+      * @throws EnvNotFoundException When the environment variable is not found and has no default value
+      */
+-    protected function getEnv(string $name)
++    protected function getEnv(string $name): mixed
+     {
+         if (isset($this->resolving[$envName = "env($name)"])) {
+             throw new ParameterCircularReferenceException(array_keys($this->resolving));
+--- a/src/Symfony/Component/DependencyInjection/ParameterBag/ContainerBag.php
++++ b/src/Symfony/Component/DependencyInjection/ParameterBag/ContainerBag.php
+@@ -48,7 +48,7 @@
+      *
+      * @return bool
+      */
+-    public function has(string $name)
++    public function has(string $name): bool
+     {
+         return $this->container->hasParameter($name);
+     }
+--- a/src/Symfony/Component/DependencyInjection/Tests/ServiceLocatorTest.php
++++ b/src/Symfony/Component/DependencyInjection/Tests/ServiceLocatorTest.php
+@@ -22,7 +22,7 @@
+ 
+ class ServiceLocatorTest extends BaseServiceLocatorTest
+ {
+-    public function getServiceLocator(array $factories): ContainerInterface
++    public function getServiceLocator(array $factories): ServiceLocator
+     {
+         return new ServiceLocator($factories);
+     }
+--- a/src/Symfony/Component/HttpClient/Response/AsyncContext.php
++++ b/src/Symfony/Component/HttpClient/Response/AsyncContext.php
+@@ -111,7 +111,7 @@
+     /**
+      * Returns the current info of the response.
+      */
+-    public function getInfo(string $type = null)
++    public function getInfo(string $type = null): mixed
+     {
+         if (null !== $type) {
+             return $this->info[$type] ?? $this->response->getInfo($type);
+--- a/src/Symfony/Component/HttpClient/Response/MockResponse.php
++++ b/src/Symfony/Component/HttpClient/Response/MockResponse.php
+@@ -93,7 +93,7 @@
+     /**
+      * {@inheritdoc}
+      */
+-    public function getInfo(string $type = null)
++    public function getInfo(string $type = null): mixed
+     {
+         return null !== $type ? $this->info[$type] ?? null : $this->info;
+     }
+--- a/src/Symfony/Component/String/Slugger/AsciiSlugger.php
++++ b/src/Symfony/Component/String/Slugger/AsciiSlugger.php
+@@ -90,7 +90,7 @@
+     /**
+      * {@inheritdoc}
+      */
+-    public function getLocale()
++    public function getLocale(): string
+     {
+         return $this->defaultLocale;
+     }
+--- a/src/Symfony/Component/Translation/DataCollectorTranslator.php
++++ b/src/Symfony/Component/Translation/DataCollectorTranslator.php
+@@ -43,7 +43,7 @@
+     /**
+      * {@inheritdoc}
+      */
+-    public function trans(?string $id, array $parameters = [], string $domain = null, string $locale = null)
++    public function trans(?string $id, array $parameters = [], string $domain = null, string $locale = null): string
+     {
+         $trans = $this->translator->trans($id = (string) $id, $parameters, $domain, $locale);
+         $this->collectMessage($locale, $domain, $id, $trans, $parameters);
+@@ -62,7 +62,7 @@
+     /**
+      * {@inheritdoc}
+      */
+-    public function getLocale()
++    public function getLocale(): string
+     {
+         return $this->translator->getLocale();
+     }
+--- a/src/Symfony/Component/Translation/LoggingTranslator.php
++++ b/src/Symfony/Component/Translation/LoggingTranslator.php
+@@ -40,7 +40,7 @@
+     /**
+      * {@inheritdoc}
+      */
+-    public function trans(?string $id, array $parameters = [], string $domain = null, string $locale = null)
++    public function trans(?string $id, array $parameters = [], string $domain = null, string $locale = null): string
+     {
+         $trans = $this->translator->trans($id = (string) $id, $parameters, $domain, $locale);
+         $this->log($id, $domain, $locale);
+@@ -65,7 +65,7 @@
+     /**
+      * {@inheritdoc}
+      */
+-    public function getLocale()
++    public function getLocale(): string
+     {
+         return $this->translator->getLocale();
+     }
+--- a/src/Symfony/Component/Translation/MessageCatalogue.php
++++ b/src/Symfony/Component/Translation/MessageCatalogue.php
+@@ -38,7 +38,7 @@
+     /**
+      * {@inheritdoc}
+      */
+-    public function getLocale()
++    public function getLocale(): string
+     {
+         return $this->locale;
+     }
+--- a/src/Symfony/Component/Translation/Tests/IdentityTranslatorTest.php
++++ b/src/Symfony/Component/Translation/Tests/IdentityTranslatorTest.php
+@@ -34,7 +34,7 @@
+         \Locale::setDefault($this->defaultLocale);
+     }
+ 
+-    public function getTranslator(): TranslatorInterface
++    public function getTranslator(): IdentityTranslator
+     {
+         return new IdentityTranslator();
+     }
+--- a/src/Symfony/Component/Translation/Translator.php
++++ b/src/Symfony/Component/Translation/Translator.php
+@@ -157,7 +157,7 @@
+     /**
+      * {@inheritdoc}
+      */
+-    public function getLocale()
++    public function getLocale(): string
+     {
+         return $this->locale ?: (class_exists(\Locale::class) ? \Locale::getDefault() : 'en');
+     }
+@@ -194,7 +194,7 @@
+     /**
+      * {@inheritdoc}
+      */
+-    public function trans(?string $id, array $parameters = [], string $domain = null, string $locale = null)
++    public function trans(?string $id, array $parameters = [], string $domain = null, string $locale = null): string
+     {
+         if (null === $id || '' === $id) {
+             return '';
+--- a/src/Symfony/Contracts/Cache/CacheInterface.php
++++ b/src/Symfony/Contracts/Cache/CacheInterface.php
+@@ -42,7 +42,7 @@
+      *
+      * @throws InvalidArgumentException When $key is not valid or when $beta is negative
+      */
+-    public function get(string $key, callable $callback, float $beta = null, array &$metadata = null);
++    public function get(string $key, callable $callback, float $beta = null, array &$metadata = null): mixed;
+ 
+     /**
+      * Removes an item from the pool.
+--- a/src/Symfony/Contracts/Cache/CacheTrait.php
++++ b/src/Symfony/Contracts/Cache/CacheTrait.php
+@@ -27,10 +27,8 @@
+ {
+     /**
+      * {@inheritdoc}
+-     *
+-     * @return mixed
+      */
+-    public function get(string $key, callable $callback, float $beta = null, array &$metadata = null)
++    public function get(string $key, callable $callback, float $beta = null, array &$metadata = null): mixed
+     {
+         return $this->doGet($this, $key, $callback, $beta, $metadata);
+     }
+@@ -43,7 +41,7 @@
+         return $this->deleteItem($key);
+     }
+ 
+-    private function doGet(CacheItemPoolInterface $pool, string $key, callable $callback, ?float $beta, array &$metadata = null, LoggerInterface $logger = null)
++    private function doGet(CacheItemPoolInterface $pool, string $key, callable $callback, ?float $beta, array &$metadata = null, LoggerInterface $logger = null): mixed
+     {
+         if (0 > $beta = $beta ?? 1.0) {
+             throw new class(sprintf('Argument "$beta" provided to "%s::get()" must be a positive number, %f given.', static::class, $beta)) extends \InvalidArgumentException implements InvalidArgumentException { };
+--- a/src/Symfony/Contracts/Cache/CallbackInterface.php
++++ b/src/Symfony/Contracts/Cache/CallbackInterface.php
+@@ -26,5 +26,5 @@
+      *
+      * @return mixed The computed value for the passed item
+      */
+-    public function __invoke(CacheItemInterface $item, bool &$save);
++    public function __invoke(CacheItemInterface $item, bool &$save): mixed;
+ }
+--- a/src/Symfony/Contracts/Cache/ItemInterface.php
++++ b/src/Symfony/Contracts/Cache/ItemInterface.php
+@@ -54,7 +54,7 @@
+      * @throws InvalidArgumentException When $tag is not valid
+      * @throws CacheException           When the item comes from a pool that is not tag-aware
+      */
+-    public function tag($tags): self;
++    public function tag($tags): static;
+ 
+     /**
+      * Returns a list of metadata info that were saved alongside with the cached value.
+--- a/src/Symfony/Contracts/Cache/TagAwareCacheInterface.php
++++ b/src/Symfony/Contracts/Cache/TagAwareCacheInterface.php
+@@ -34,5 +34,5 @@
+      *
+      * @throws InvalidArgumentException When $tags is not valid
+      */
+-    public function invalidateTags(array $tags);
++    public function invalidateTags(array $tags): bool;
+ }
+--- a/src/Symfony/Contracts/HttpClient/ResponseInterface.php
++++ b/src/Symfony/Contracts/HttpClient/ResponseInterface.php
+@@ -105,5 +105,5 @@
+      * @return mixed An array of all available info, or one of them when $type is
+      *               provided, or null when an unsupported type is requested
+      */
+-    public function getInfo(string $type = null);
++    public function getInfo(string $type = null): mixed;
+ }
+--- a/src/Symfony/Contracts/HttpClient/Test/TestHttpServer.php
++++ b/src/Symfony/Contracts/HttpClient/Test/TestHttpServer.php
+@@ -18,10 +18,7 @@
+ {
+     private static $process = [];
+ 
+-    /**
+-     * @return Process
+-     */
+-    public static function start(int $port = 8057)
++    public static function start(int $port = 8057): Process
+     {
+         if (isset(self::$process[$port])) {
+             self::$process[$port]->stop();
+--- a/src/Symfony/Contracts/Service/ServiceLocatorTrait.php
++++ b/src/Symfony/Contracts/Service/ServiceLocatorTrait.php
+@@ -40,10 +40,8 @@
+ 
+     /**
+      * {@inheritdoc}
+-     *
+-     * @return bool
+      */
+-    public function has(string $id)
++    public function has(string $id): bool
+     {
+         return isset($this->factories[$id]);
+     }
+--- a/src/Symfony/Contracts/Service/ServiceSubscriberInterface.php
++++ b/src/Symfony/Contracts/Service/ServiceSubscriberInterface.php
+@@ -49,5 +49,5 @@
+      *
+      * @return string[] The required service types, optionally keyed by service names
+      */
+-    public static function getSubscribedServices();
++    public static function getSubscribedServices(): array;
+ }
+--- a/src/Symfony/Contracts/Service/ServiceSubscriberTrait.php
++++ b/src/Symfony/Contracts/Service/ServiceSubscriberTrait.php
+@@ -99,10 +99,8 @@
+ 
+     /**
+      * @required
+-     *
+-     * @return ContainerInterface|null
+      */
+-    public function setContainer(ContainerInterface $container)
++    public function setContainer(ContainerInterface $container): ?ContainerInterface
+     {
+         $this->container = $container;
+ 
+--- a/src/Symfony/Contracts/Service/Test/ServiceLocatorTest.php
++++ b/src/Symfony/Contracts/Service/Test/ServiceLocatorTest.php
+@@ -17,10 +17,7 @@
+ 
+ abstract class ServiceLocatorTest extends TestCase
+ {
+-    /**
+-     * @return ContainerInterface
+-     */
+-    protected function getServiceLocator(array $factories)
++    protected function getServiceLocator(array $factories): ContainerInterface
+     {
+         return new class($factories) implements ContainerInterface {
+             use ServiceLocatorTrait;
+--- a/src/Symfony/Contracts/Tests/Service/ServiceSubscriberTraitTest.php
++++ b/src/Symfony/Contracts/Tests/Service/ServiceSubscriberTraitTest.php
+@@ -99,7 +99,7 @@
+     {
+     }
+ 
+-    public function setContainer(ContainerInterface $container)
++    public function setContainer(ContainerInterface $container): ?ContainerInterface
+     {
+         return $container;
+     }
+--- a/src/Symfony/Contracts/Translation/LocaleAwareInterface.php
++++ b/src/Symfony/Contracts/Translation/LocaleAwareInterface.php
+@@ -16,16 +16,12 @@
+     /**
+      * Sets the current locale.
+      *
+-     * @param string $locale The locale
+-     *
+      * @throws \InvalidArgumentException If the locale contains invalid characters
+      */
+     public function setLocale(string $locale);
+ 
+     /**
+      * Returns the current locale.
+-     *
+-     * @return string
+      */
+-    public function getLocale();
++    public function getLocale(): string;
+ }
+--- a/src/Symfony/Contracts/Translation/Test/TranslatorTest.php
++++ b/src/Symfony/Contracts/Translation/Test/TranslatorTest.php
+@@ -43,10 +43,7 @@
+         \Locale::setDefault($this->defaultLocale);
+     }
+ 
+-    /**
+-     * @return TranslatorInterface
+-     */
+-    public function getTranslator()
++    public function getTranslator(): TranslatorInterface
+     {
+         return new class() implements TranslatorInterface {
+             use TranslatorTrait;
+@@ -317,10 +314,8 @@
+      * This array should contain all currently known langcodes.
+      *
+      * As it is impossible to have this ever complete we should try as hard as possible to have it almost complete.
+-     *
+-     * @return array
+      */
+-    public function successLangcodes()
++    public function successLangcodes(): array
+     {
+         return [
+             ['1', ['ay', 'bo', 'cgg', 'dz', 'id', 'ja', 'jbo', 'ka', 'kk', 'km', 'ko', 'ky']],
+@@ -339,7 +334,7 @@
+      *
+      * @return array with nplural together with langcodes
+      */
+-    public function failingLangcodes()
++    public function failingLangcodes(): array
+     {
+         return [
+             ['1', ['fa']],
+@@ -353,11 +348,10 @@
+     /**
+      * We validate only on the plural coverage. Thus the real rules is not tested.
+      *
+-     * @param string $nplural       Plural expected
+-     * @param array  $matrix        Containing langcodes and their plural index values
+-     * @param bool   $expectSuccess
++     * @param string $nplural Plural expected
++     * @param array  $matrix  Containing langcodes and their plural index values
+      */
+-    protected function validateMatrix($nplural, $matrix, $expectSuccess = true)
++    protected function validateMatrix(string $nplural, array $matrix, bool $expectSuccess = true)
+     {
+         foreach ($matrix as $langCode => $data) {
+             $indexes = array_flip($data);
+--- a/src/Symfony/Contracts/Translation/TranslatorInterface.php
++++ b/src/Symfony/Contracts/Translation/TranslatorInterface.php
+@@ -63,5 +63,5 @@
+      *
+      * @throws \InvalidArgumentException If the locale contains invalid characters
+      */
+-    public function trans(string $id, array $parameters = [], string $domain = null, string $locale = null);
++    public function trans(string $id, array $parameters = [], string $domain = null, string $locale = null): string;
+ }
+--- a/src/Symfony/Contracts/Translation/TranslatorTrait.php
++++ b/src/Symfony/Contracts/Translation/TranslatorTrait.php
+@@ -32,10 +32,8 @@
+ 
+     /**
+      * {@inheritdoc}
+-     *
+-     * @return string
+      */
+-    public function getLocale()
++    public function getLocale(): string
+     {
+         return $this->locale ?: (class_exists(\Locale::class) ? \Locale::getDefault() : 'en');
+     }
+--- a/src/Symfony/Component/Cache/Adapter/AdapterInterface.php
++++ b/src/Symfony/Component/Cache/Adapter/AdapterInterface.php
+@@ -26,22 +26,18 @@
+ {
+     /**
+      * {@inheritdoc}
+-     *
+-     * @return CacheItem
+      */
+-    public function getItem($key);
++    public function getItem(mixed $key): CacheItem;
+ 
+     /**
+      * {@inheritdoc}
+      *
+-     * @return \Traversable<string, CacheItem>
++     * @return iterable<string, CacheItem>
+      */
+-    public function getItems(array $keys = []);
++    public function getItems(array $keys = []): iterable;
+ 
+     /**
+      * {@inheritdoc}
+-     *
+-     * @return bool
+      */
+-    public function clear(string $prefix = '');
++    public function clear(string $prefix = ''): bool;
+ }
+--- a/src/Symfony/Component/DependencyInjection/Compiler/MergeExtensionConfigurationPass.php
++++ b/src/Symfony/Component/DependencyInjection/Compiler/MergeExtensionConfigurationPass.php
+@@ -163,7 +163,7 @@
+     /**
+      * {@inheritdoc}
+      */
+-    public function addCompilerPass(CompilerPassInterface $pass, string $type = PassConfig::TYPE_BEFORE_OPTIMIZATION, int $priority = 0): self
++    public function addCompilerPass(CompilerPassInterface $pass, string $type = PassConfig::TYPE_BEFORE_OPTIMIZATION, int $priority = 0): static
+     {
+         throw new LogicException(sprintf('You cannot add compiler pass "%s" from extension "%s". Compiler passes must be registered before the container is compiled.', get_debug_type($pass), $this->extensionClass));
+     }
+@@ -187,7 +187,7 @@
+     /**
+      * {@inheritdoc}
+      */
+-    public function resolveEnvPlaceholders($value, $format = null, array &$usedEnvs = null)
++    public function resolveEnvPlaceholders($value, $format = null, array &$usedEnvs = null): mixed
+     {
+         if (true !== $format || !\is_string($value)) {
+             return parent::resolveEnvPlaceholders($value, $format, $usedEnvs);
+--- a/src/Symfony/Component/Cache/Traits/AbstractAdapterTrait.php
++++ b/src/Symfony/Component/Cache/Traits/AbstractAdapterTrait.php
+@@ -95,10 +95,8 @@
+ 
+     /**
+      * {@inheritdoc}
+-     *
+-     * @return bool
+      */
+-    public function hasItem($key)
++    public function hasItem($key): bool
+     {
+         $id = $this->getId($key);
+ 
+@@ -117,10 +115,8 @@
+ 
+     /**
+      * {@inheritdoc}
+-     *
+-     * @return bool
+      */
+-    public function clear(string $prefix = '')
++    public function clear(string $prefix = ''): bool
+     {
+         $this->deferred = [];
+         if ($cleared = $this->versioningIsEnabled) {
+@@ -158,20 +154,16 @@
+ 
+     /**
+      * {@inheritdoc}
+-     *
+-     * @return bool
+      */
+-    public function deleteItem($key)
++    public function deleteItem($key): bool
+     {
+         return $this->deleteItems([$key]);
+     }
+ 
+     /**
+      * {@inheritdoc}
+-     *
+-     * @return bool
+      */
+-    public function deleteItems(array $keys)
++    public function deleteItems(array $keys): bool
+     {
+         $ids = [];
+ 
+@@ -209,7 +201,7 @@
+     /**
+      * {@inheritdoc}
+      */
+-    public function getItem($key)
++    public function getItem(mixed $key): CacheItem
+     {
+         $id = $this->getId($key);
+ 
+@@ -236,7 +228,7 @@
+     /**
+      * {@inheritdoc}
+      */
+-    public function getItems(array $keys = [])
++    public function getItems(array $keys = []): iterable
+     {
+         $ids = [];
+         $commit = false;
+@@ -263,10 +255,8 @@
+ 
+     /**
+      * {@inheritdoc}
+-     *
+-     * @return bool
+      */
+-    public function save(CacheItemInterface $item)
++    public function save(CacheItemInterface $item): bool
+     {
+         if (!$item instanceof CacheItem) {
+             return false;
+@@ -278,10 +268,8 @@
+ 
+     /**
+      * {@inheritdoc}
+-     *
+-     * @return bool
+      */
+-    public function saveDeferred(CacheItemInterface $item)
++    public function saveDeferred(CacheItemInterface $item): bool
+     {
+         if (!$item instanceof CacheItem) {
+             return false;
+@@ -298,10 +286,8 @@
+      * but old keys may need garbage collection and extra round-trips to the back-end are required.
+      *
+      * Calling this method also clears the memoized namespace version and thus forces a resynchonization of it.
+-     *
+-     * @return bool the previous state of versioning
+      */
+-    public function enableVersioning(bool $enable = true)
++    public function enableVersioning(bool $enable = true): bool
+     {
+         $wasEnabled = $this->versioningIsEnabled;
+         $this->versioningIsEnabled = $enable;
+--- a/src/Symfony/Component/Cache/Adapter/AbstractAdapter.php
++++ b/src/Symfony/Component/Cache/Adapter/AbstractAdapter.php
+@@ -101,7 +101,7 @@
+      *
+      * @return AdapterInterface
+      */
+-    public static function createSystemCache(string $namespace, int $defaultLifetime, string $version, string $directory, LoggerInterface $logger = null)
++    public static function createSystemCache(string $namespace, int $defaultLifetime, string $version, string $directory, LoggerInterface $logger = null): AdapterInterface
+     {
+         $opcache = new PhpFilesAdapter($namespace, $defaultLifetime, $directory, true);
+         if (null !== $logger) {
+@@ -145,10 +145,8 @@
+ 
+     /**
+      * {@inheritdoc}
+-     *
+-     * @return bool
+      */
+-    public function commit()
++    public function commit(): bool
+     {
+         $ok = true;
+         $byLifetime = (self::$mergeByLifetime)($this->deferred, $this->namespace, $expiredIds, \Closure::fromCallable([$this, 'getId']), $this->defaultLifetime);
+--- a/src/Symfony/Component/Cache/Adapter/Psr16Adapter.php
++++ b/src/Symfony/Component/Cache/Adapter/Psr16Adapter.php
+@@ -43,7 +43,7 @@
+     /**
+      * {@inheritdoc}
+      */
+-    protected function doFetch(array $ids)
++    protected function doFetch(array $ids): iterable
+     {
+         foreach ($this->pool->getMultiple($ids, $this->miss) as $key => $value) {
+             if ($this->miss !== $value) {
+@@ -55,7 +55,7 @@
+     /**
+      * {@inheritdoc}
+      */
+-    protected function doHave(string $id)
++    protected function doHave(string $id): bool
+     {
+         return $this->pool->has($id);
+     }
+@@ -63,7 +63,7 @@
+     /**
+      * {@inheritdoc}
+      */
+-    protected function doClear(string $namespace)
++    protected function doClear(string $namespace): bool
+     {
+         return $this->pool->clear();
+     }
+@@ -71,7 +71,7 @@
+     /**
+      * {@inheritdoc}
+      */
+-    protected function doDelete(array $ids)
++    protected function doDelete(array $ids): bool
+     {
+         return $this->pool->deleteMultiple($ids);
+     }
+@@ -79,7 +79,7 @@
+     /**
+      * {@inheritdoc}
+      */
+-    protected function doSave(array $values, int $lifetime)
++    protected function doSave(array $values, int $lifetime): array|bool
+     {
+         return $this->pool->setMultiple($values, 0 === $lifetime ? null : $lifetime);
+     }
diff --git a/debian/patches/Adapt-conflict-to-Debian-expectations.patch b/debian/patches/drop-conflict-email-validator.patch
similarity index 66%
rename from debian/patches/Adapt-conflict-to-Debian-expectations.patch
rename to debian/patches/drop-conflict-email-validator.patch
index e176cb6..097a40d 100644
--- a/debian/patches/Adapt-conflict-to-Debian-expectations.patch
+++ b/debian/patches/drop-conflict-email-validator.patch
@@ -1,35 +1,20 @@
-From: =?utf-8?q?David_Pr=C3=A9vot?= <[e-mail]>
-Date: Thu, 8 Apr 2021 16:55:56 -0400
-Subject: Adapt conflict to Debian expectations
-
----
- composer.json                            | 2 +-
- src/Symfony/Component/Mime/composer.json | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/composer.json b/composer.json
-index 8ba28df..7460467 100644
 --- a/composer.json
 +++ b/composer.json
-@@ -155,7 +155,7 @@
+@@ -155,7 +155,6 @@
          "async-aws/core": "<1.5",
          "doctrine/annotations": "<1.13.1",
          "doctrine/dbal": "<2.13.1",
 -        "egulias/email-validator": "~3.0.0",
-+        "egulias/email-validator": ">3",
          "masterminds/html5": "<2.6",
          "phpdocumentor/reflection-docblock": "<3.2.2",
          "phpdocumentor/type-resolver": "<1.4.0",
-diff --git a/src/Symfony/Component/Mime/composer.json b/src/Symfony/Component/Mime/composer.json
-index cd04969..049cba6 100644
 --- a/src/Symfony/Component/Mime/composer.json
 +++ b/src/Symfony/Component/Mime/composer.json
-@@ -31,7 +31,7 @@
+@@ -31,7 +31,6 @@
          "symfony/serializer": "^5.2|^6.0"
      },
      "conflict": {
 -        "egulias/email-validator": "~3.0.0",
-+        "egulias/email-validator": ">3",
          "phpdocumentor/reflection-docblock": "<3.2.2",
          "phpdocumentor/type-resolver": "<1.4.0",
          "symfony/mailer": "<4.4"
diff --git a/debian/patches/implement-psr-cache-3.patch b/debian/patches/implement-psr-cache-3.patch
new file mode 100644
index 0000000..c11453f
--- /dev/null
+++ b/debian/patches/implement-psr-cache-3.patch
@@ -0,0 +1,31 @@
+--- a/composer.json
++++ b/composer.json
+@@ -18,7 +18,7 @@
+     "provide": {
+         "php-http/async-client-implementation": "*",
+         "php-http/client-implementation": "*",
+-        "psr/cache-implementation": "1.0|2.0",
++        "psr/cache-implementation": "1.0|2.0|3.0",
+         "psr/container-implementation": "1.0|2.0",
+         "psr/event-dispatcher-implementation": "1.0",
+         "psr/http-client-implementation": "1.0",
+@@ -38,7 +38,7 @@
+         "doctrine/event-manager": "~1.0",
+         "doctrine/persistence": "^2|^3",
+         "twig/twig": "^2.13|^3.0.4",
+-        "psr/cache": "^1.0|^2.0",
++        "psr/cache": "^1.0|^2.0|^3.0",
+         "psr/container": "^1.1.1|^2.0",
+         "psr/event-dispatcher": "^1.0",
+         "psr/link": "^1.0|^2.0",
+--- a/src/Symfony/Component/Cache/composer.json
++++ b/src/Symfony/Component/Cache/composer.json
+@@ -18,7 +18,7 @@
+     "provide": {
+         "psr/cache-implementation": "1.0|2.0",
+         "psr/simple-cache-implementation": "1.0|2.0",
+-        "symfony/cache-implementation": "1.0|2.0"
++        "symfony/cache-implementation": "1.0|2.0|3.0"
+     },
+     "require": {
+         "php": ">=7.2.5",
diff --git a/debian/patches/implement-psr-container-2.patch b/debian/patches/implement-psr-container-2.patch
new file mode 100644
index 0000000..0cddde2
--- /dev/null
+++ b/debian/patches/implement-psr-container-2.patch
@@ -0,0 +1,62 @@
+--- a/composer.json
++++ b/composer.json
+@@ -19,7 +19,7 @@
+         "php-http/async-client-implementation": "*",
+         "php-http/client-implementation": "*",
+         "psr/cache-implementation": "1.0|2.0",
+-        "psr/container-implementation": "1.0",
++        "psr/container-implementation": "1.0|2.0",
+         "psr/event-dispatcher-implementation": "1.0",
+         "psr/http-client-implementation": "1.0",
+         "psr/link-implementation": "1.0|2.0",
+@@ -39,7 +39,7 @@
+         "doctrine/persistence": "^2|^3",
+         "twig/twig": "^2.13|^3.0.4",
+         "psr/cache": "^1.0|^2.0",
+-        "psr/container": "^1.1.1",
++        "psr/container": "^1.1.1|^2.0",
+         "psr/event-dispatcher": "^1.0",
+         "psr/link": "^1.0|^2.0",
+         "psr/log": "^1|^2|^3",
+--- a/src/Symfony/Component/DependencyInjection/composer.json
++++ b/src/Symfony/Component/DependencyInjection/composer.json
+@@ -17,7 +17,7 @@
+     ],
+     "require": {
+         "php": ">=7.2.5",
+-        "psr/container": "^1.1.1",
++        "psr/container": "^1.1.1|^2.0",
+         "symfony/deprecation-contracts": "^2.1|^3",
+         "symfony/polyfill-php80": "^1.16",
+         "symfony/polyfill-php81": "^1.22",
+@@ -43,7 +43,7 @@
+         "symfony/yaml": "<4.4.26"
+     },
+     "provide": {
+-        "psr/container-implementation": "1.0",
++        "psr/container-implementation": "1.0|2.0",
+         "symfony/service-implementation": "1.0|2.0"
+     },
+     "autoload": {
+--- a/src/Symfony/Contracts/Service/composer.json
++++ b/src/Symfony/Contracts/Service/composer.json
+@@ -17,7 +17,7 @@
+     ],
+     "require": {
+         "php": ">=7.2.5",
+-        "psr/container": "^1.1",
++        "psr/container": "^1.1|^2.0",
+         "symfony/deprecation-contracts": "^2.1|^3"
+     },
+     "conflict": {
+--- a/src/Symfony/Contracts/composer.json
++++ b/src/Symfony/Contracts/composer.json
+@@ -18,7 +18,7 @@
+     "require": {
+         "php": ">=7.2.5",
+         "psr/cache": "^1.0|^2.0|^3.0",
+-        "psr/container": "^1.1",
++        "psr/container": "^1.1|^2.0",
+         "psr/event-dispatcher": "^1.0"
+     },
+     "require-dev": {
diff --git a/debian/patches/implement-psr-link-2.patch b/debian/patches/implement-psr-link-2.patch
new file mode 100644
index 0000000..0839235
--- /dev/null
+++ b/debian/patches/implement-psr-link-2.patch
@@ -0,0 +1,51 @@
+From 7fa11cf974c7f006bfdb43d55605cd75c6b4ff38 Mon Sep 17 00:00:00 2001
+From: Nicolas Grekas <[e-mail]>
+Date: Fri, 24 Sep 2021 16:10:07 +0200
+Subject: [PATCH] [WebLink] allow psr/link v2
+
+---
+ composer.json                               | 4 ++--
+ src/Symfony/Component/WebLink/composer.json | 4 ++--
+ 2 files changed, 4 insertions(+), 4 deletions(-)
+
+Origin: backport, https://github.com/symfony/symfony/commit/7fa11cf974c7f006bfdb43d55605cd75c6b4ff38.patch
+Applied-Upstream: 6.0.0, 7fa11cf974c7f006bfdb43d55605cd75c6b4ff38
+Reviewed-By: Bryce Harrington <[e-mail]>
+Last-Update: 2022-02-28
+
+--- a/composer.json
++++ b/composer.json
+@@ -22,7 +22,7 @@
+         "psr/container-implementation": "1.0",
+         "psr/event-dispatcher-implementation": "1.0",
+         "psr/http-client-implementation": "1.0",
+-        "psr/link-implementation": "1.0",
++        "psr/link-implementation": "1.0|2.0",
+         "psr/log-implementation": "1.0|2.0|3.0",
+         "psr/simple-cache-implementation": "1.0|2.0",
+         "symfony/cache-implementation": "1.0|2.0",
+@@ -41,7 +41,7 @@
+         "psr/cache": "^1.0|^2.0",
+         "psr/container": "^1.1.1",
+         "psr/event-dispatcher": "^1.0",
+-        "psr/link": "^1.0",
++        "psr/link": "^1.0|^2.0",
+         "psr/log": "^1|^2|^3",
+         "symfony/contracts": "^2.1",
+         "symfony/polyfill-ctype": "~1.8",
+--- a/src/Symfony/Component/WebLink/composer.json
++++ b/src/Symfony/Component/WebLink/composer.json
+@@ -16,11 +16,11 @@
+         }
+     ],
+     "provide": {
+-        "psr/link-implementation": "1.0"
++        "psr/link-implementation": "1.0|2.0"
+     },
+     "require": {
+         "php": ">=7.2.5",
+-        "psr/link": "^1.0",
++        "psr/link": "^1.0|^2.0",
+         "symfony/polyfill-php80": "^1.16"
+     },
+     "suggest": {
diff --git a/debian/patches/implement-psr-log-3.patch b/debian/patches/implement-psr-log-3.patch
new file mode 100644
index 0000000..5b5b964
--- /dev/null
+++ b/debian/patches/implement-psr-log-3.patch
@@ -0,0 +1,110 @@
+From 95029e560d8805efaac9399496028c2ccdac6c24 Mon Sep 17 00:00:00 2001
+From: "Alexander M. Turek" <[e-mail]>
+Date: Sun, 18 Jul 2021 18:39:07 +0200
+Subject: [PATCH] Implement psr/log 3
+
+Signed-off-by: Alexander M. Turek <[e-mail]>
+---
+ composer.json                                          | 4 ++--
+ src/Symfony/Component/Console/Logger/ConsoleLogger.php | 4 +---
+ src/Symfony/Component/Console/composer.json            | 5 ++---
+ src/Symfony/Component/HttpKernel/Log/Logger.php        | 4 +---
+ src/Symfony/Component/HttpKernel/composer.json         | 4 ++--
+ 5 files changed, 8 insertions(+), 13 deletions(-)
+
+Origin: backport, https://github.com/symfony/symfony/commit/95029e560d8805efaac9399496028c2ccdac6c24
+Applied-Upstream: 6.0.0, 95029e560d8805efaac9399496028c2ccdac6c24
+Reviewed-By: Bryce Harrington <[e-mail]>
+Last-Update: 2022-02-28
+
+--- a/composer.json
++++ b/composer.json
+@@ -23,7 +23,7 @@
+         "psr/event-dispatcher-implementation": "1.0",
+         "psr/http-client-implementation": "1.0",
+         "psr/link-implementation": "1.0",
+-        "psr/log-implementation": "1.0|2.0",
++        "psr/log-implementation": "1.0|2.0|3.0",
+         "psr/simple-cache-implementation": "1.0|2.0",
+         "symfony/cache-implementation": "1.0|2.0",
+         "symfony/event-dispatcher-implementation": "2.0",
+@@ -42,7 +42,7 @@
+         "psr/container": "^1.1.1",
+         "psr/event-dispatcher": "^1.0",
+         "psr/link": "^1.0",
+-        "psr/log": "^1|^2",
++        "psr/log": "^1|^2|^3",
+         "symfony/contracts": "^2.1",
+         "symfony/polyfill-ctype": "~1.8",
+         "symfony/polyfill-intl-grapheme": "~1.0",
+--- a/src/Symfony/Component/Console/composer.json
++++ b/src/Symfony/Component/Console/composer.json
+@@ -31,10 +31,10 @@
+         "symfony/lock": "^4.4|^5.0|^6.0",
+         "symfony/process": "^4.4|^5.0|^6.0",
+         "symfony/var-dumper": "^4.4|^5.0|^6.0",
+-        "psr/log": "^1|^2"
++        "psr/log": "^1|^2|^3"
+     },
+     "provide": {
+-        "psr/log-implementation": "1.0|2.0"
++        "psr/log-implementation": "1.0|2.0|3.0"
+     },
+     "suggest": {
+         "symfony/event-dispatcher": "",
+@@ -43,7 +43,6 @@
+         "psr/log": "For using the console logger"
+     },
+     "conflict": {
+-        "psr/log": ">=3",
+         "symfony/dependency-injection": "<4.4",
+         "symfony/dotenv": "<5.1",
+         "symfony/event-dispatcher": "<4.4",
+--- a/src/Symfony/Component/Console/Logger/ConsoleLogger.php
++++ b/src/Symfony/Component/Console/Logger/ConsoleLogger.php
+@@ -61,10 +61,8 @@
+ 
+     /**
+      * {@inheritdoc}
+-     *
+-     * @return void
+      */
+-    public function log($level, $message, array $context = [])
++    public function log($level, $message, array $context = []): void
+     {
+         if (!isset($this->verbosityLevelMap[$level])) {
+             throw new InvalidArgumentException(sprintf('The log level "%s" does not exist.', $level));
+--- a/src/Symfony/Component/HttpKernel/composer.json
++++ b/src/Symfony/Component/HttpKernel/composer.json
+@@ -24,7 +24,7 @@
+         "symfony/polyfill-ctype": "^1.8",
+         "symfony/polyfill-php73": "^1.9",
+         "symfony/polyfill-php80": "^1.16",
+-        "psr/log": "^1|^2"
++        "psr/log": "^1|^2|^3"
+     },
+     "require-dev": {
+         "symfony/browser-kit": "^5.4|^6.0",
+@@ -45,7 +45,7 @@
+         "twig/twig": "^2.13|^3.0.4"
+     },
+     "provide": {
+-        "psr/log-implementation": "1.0|2.0"
++        "psr/log-implementation": "1.0|2.0|3.0"
+     },
+     "conflict": {
+         "symfony/browser-kit": "<5.4",
+--- a/src/Symfony/Component/HttpKernel/Log/Logger.php
++++ b/src/Symfony/Component/HttpKernel/Log/Logger.php
+@@ -70,10 +70,8 @@
+ 
+     /**
+      * {@inheritdoc}
+-     *
+-     * @return void
+      */
+-    public function log($level, $message, array $context = [])
++    public function log($level, $message, array $context = []): void
+     {
+         if (!isset(self::LEVELS[$level])) {
+             throw new InvalidArgumentException(sprintf('The log level "%s" does not exist.', $level));
diff --git a/debian/patches/series b/debian/patches/series
index 523c753..39129e3 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -20,7 +20,6 @@ Workaround-failing-tests-with-php7.4.patch
 String-Drop-data-causing-tests-to-fail.patch
 HttpClient-Skip-tests-relying-on-amphp-http-client.patch
 PhpUnit-Skip-test-currently-failing.patch
-Adapt-conflict-to-Debian-expectations.patch
 Drop-composer-plugin-api-that-confuses-pkg-php-tools.patch
 Revert-ErrorHandler-Skip-same-vendor-method-deprecations-.patch
 Config-Partially-revert-4c2c5c9ba76ba8db9e88748ae519605c0.patch
@@ -29,3 +28,9 @@ Console-Skip-test-failing-on-CI.patch
 Lock-Drop-test-currently-failing-on-buildd.patch
 Intl-Fix-QQQQQ-date-format.patch
 Form-Drop-tests-currently-failing.patch
+implement-psr-log-3.patch
+implement-psr-link-2.patch
+drop-conflict-email-validator.patch
+implement-psr-container-2.patch
+implement-psr-cache-3.patch
+add-return-types.patch
diff --git a/debian/rules b/debian/rules
index 2ae0dc1..92e2ac9 100755
--- a/debian/rules
+++ b/debian/rules
@@ -110,20 +110,20 @@ endif
 	 done
 
 override_dh_auto_test:
-	ln -s ./src/Symfony ./Symfony
-	mkdir --parents vendor
-	cp debian/autoload_runtime.php vendor
-	phpab	--output vendor/autoload.php \
-		--whitelist '*\\tests\\*' \
-		--tolerant \
-		--template debian/autoload.php.tests.tpl \
-		--blacklist 'symfony\\component\\dependencyinjection\\tests\\fixtures\\container\\projectservicecontainer' \
-		--exclude 'Symfony/Bridge/ProxyManager/Tests/LazyProxy/PhpDumper/Fixtures/proxy-implem.php' \
-		--exclude 'Symfony/Component/Routing/Tests/Fixtures/AttributesFixtures/*' \
-		Symfony
+	#ln -s ./src/Symfony ./Symfony
+	#mkdir --parents vendor
+	#cp debian/autoload_runtime.php vendor
+	#phpab	--output vendor/autoload.php \
+	#	--whitelist '*\\tests\\*' \
+	#	--tolerant \
+	#	--template debian/autoload.php.tests.tpl \
+	#	--blacklist 'symfony\\component\\dependencyinjection\\tests\\fixtures\\container\\projectservicecontainer' \
+	#	--exclude 'Symfony/Bridge/ProxyManager/Tests/LazyProxy/PhpDumper/Fixtures/proxy-implem.php' \
+	#	--exclude 'Symfony/Component/Routing/Tests/Fixtures/AttributesFixtures/*' \
+	#	Symfony
 	# Actual tests suite
-	components=$$(find src/Symfony -mindepth 3 -maxdepth 4 -type f -name phpunit.xml.dist -printf '%h\n') && \
-	 echo "$$components" | parallel --gnu --keep-order '/bin/echo -e "\\nRunning {} tests"; SYMFONY_DEPRECATIONS_HELPER=weak phpunit -v --colors=always --exclude-group network,tty,benchmark,intl-data,functional,composer {} || (/bin/echo -e "\\e[41mKO\\e[0m {}" && $$(exit 1));';
+	#components=$$(find src/Symfony -mindepth 3 -maxdepth 4 -type f -name phpunit.xml.dist -printf '%h\n') && \
+	# echo "$$components" | parallel --gnu --keep-order '/bin/echo -e "\\nRunning {} tests"; SYMFONY_DEPRECATIONS_HELPER=weak phpunit -v --colors=always --exclude-group network,tty,benchmark,intl-data,functional,composer {} || (/bin/echo -e "\\e[41mKO\\e[0m {}" && $$(exit 1));';
 
 override_dh_phpcomposer:
 	dh_phpcomposer --package=php-symfony --sourcedirectory=./
diff --git a/debian/tests/control b/debian/tests/control
index f3f596b..e0222e8 100644
--- a/debian/tests/control
+++ b/debian/tests/control
@@ -1,5 +1,5 @@
 Tests: phpunit
-Restrictions: rw-build-tree, allow-stderr
+Restrictions: rw-build-tree, allow-stderr, flaky
 Depends: composer,
          locales-all,
          parallel,
@@ -7,6 +7,7 @@ Depends: composer,
          php-amqp,
          php-async-aws-sqs,
          php-cache-integration-tests,
+         php-cache-tag-interop,
          php-curl,
          php-doctrine-annotations,
          php-doctrine-data-fixtures,