[Cache] Fix service declarations in PHP and XML for encrypted secrets

Author: pableu

cache.rst

@@ -755,8 +755,7 @@ And add it to your :doc:`secret store </configuration/secrets>` as
                 https://symfony.com/schema/dic/symfony/symfony-1.0.xsd">
 
             <services>
-                <service id="Symfony\Component\Cache\Marshaller\SodiumMarshaller">
-                    <factory class="Symfony\Component\Cache\Adapter\RedisAdapter" method="createConnection"/>
+                <service id="Symfony\Component\Cache\Marshaller\SodiumMarshaller" decorates="cache.default_marshaller">
                     <argument>redis://localhost</argument>
                     <argument type="collection">
                         <argument>env(base64:CACHE_DECRYPTION_KEY)</argument>
@@ -772,6 +771,7 @@ And add it to your :doc:`secret store </configuration/secrets>` as
         use Symfony\Component\Cache\Marshaller\SodiumMarshaller;
 
         $container->register(SodiumMarshaller::class)
+            ->decorate('cache.default_marshaller')
             ->addArgument(['env(base64:CACHE_DECRYPTION_KEY)'])
             ->addArgument(service('@Symfony\Component\Cache\Marshaller\SodiumMarshaller.inner'));
 
@@ -807,8 +807,7 @@ for reading and writing, and the additional key(s) will only be used for reading
                 https://symfony.com/schema/dic/symfony/symfony-1.0.xsd">
 
             <services>
-                <service id="Symfony\Component\Cache\Marshaller\SodiumMarshaller">
-                    <factory class="Symfony\Component\Cache\Adapter\RedisAdapter" method="createConnection"/>
+                <service id="Symfony\Component\Cache\Marshaller\SodiumMarshaller" decorates="cache.default_marshaller">
                     <argument>redis://localhost</argument>
                     <argument type="collection">
                         <argument>env(base64:CACHE_DECRYPTION_KEY)</argument>
@@ -825,6 +824,7 @@ for reading and writing, and the additional key(s) will only be used for reading
         use Symfony\Component\Cache\Marshaller\SodiumMarshaller;
 
         $container->register(SodiumMarshaller::class)
+            ->decorate('cache.default_marshaller')
             ->addArgument(['env(base64:CACHE_DECRYPTION_KEY)', 'env(base64:OLD_CACHE_DECRYPTION_KEY)'])
             ->addArgument(service('@Symfony\Component\Cache\Marshaller\SodiumMarshaller.inner'));