[DI] Remove LazyString from 4.4, before adding back to the String component

Author: nicolas-grekas

DependencyInjection/FrameworkExtension.php

@@ -1473,9 +1473,13 @@ private function registerSecretsConfiguration(array $config, ContainerBuilder $c
         }
 
         if ($config['decryption_env_var']) {
-            $container->getDefinition('secrets.decryption_key')->replaceArgument(1, $config['decryption_env_var']);
+            if (!preg_match('/^(?:\w*+:)*+\w++$/', $config['decryption_env_var'])) {
+                throw new InvalidArgumentException(sprintf('Invalid value "%s" set as "decryption_env_var": only "word" characters are allowed.', $config['decryption_env_var']));
+            }
+
+            $container->getDefinition('secrets.vault')->replaceArgument(1, "%env({$config['decryption_env_var']})%");
         } else {
-            $container->removeDefinition('secrets.decryption_key');
+            $container->getDefinition('secrets.vault')->replaceArgument(1, null);
         }
     }
 

Resources/config/secrets.xml

@@ -7,25 +7,7 @@
     <services>
         <service id="secrets.vault" class="Symfony\Bundle\FrameworkBundle\Secrets\SodiumVault">
             <argument>%kernel.project_dir%/config/secrets/%kernel.environment%</argument>
-            <argument type="service" id="secrets.decryption_key" on-invalid="ignore" />
-        </service>
-
-        <!--
-            LazyString::fromCallable() is used as a wrapper to lazily read the SYMFONY_DECRYPTION_SECRET var from the env.
-            By overriding this service and using the same strategy, the decryption key can be fetched lazily from any other service if needed.
-        -->
-        <service id="secrets.decryption_key" class="Symfony\Component\DependencyInjection\LazyString">
-            <factory class="Symfony\Component\DependencyInjection\LazyString" method="fromCallable" />
-            <argument type="service">
-                <service class="Closure">
-                    <factory class="Closure" method="fromCallable" />
-                    <argument type="collection">
-                        <argument type="service" id="service_container" />
-                        <argument>getEnv</argument>
-                    </argument>
-                </service>
-            </argument>
-            <argument>base64:default::SYMFONY_DECRYPTION_SECRET</argument>
+            <argument>%env(base64:default::SYMFONY_DECRYPTION_SECRET)%</argument>
         </service>
 
         <service id="secrets.local_vault" class="Symfony\Bundle\FrameworkBundle\Secrets\DotenvVault">

Tests/DependencyInjection/Fixtures/php/cache_env_var.php

@@ -34,7 +34,7 @@
 use Symfony\Component\DependencyInjection\ContainerInterface;
 use Symfony\Component\DependencyInjection\Definition;
 use Symfony\Component\DependencyInjection\Loader\ClosureLoader;
-use Symfony\Component\DependencyInjection\ParameterBag\ParameterBag;
+use Symfony\Component\DependencyInjection\ParameterBag\EnvPlaceholderParameterBag;
 use Symfony\Component\DependencyInjection\Reference;
 use Symfony\Component\EventDispatcher\EventDispatcherInterface;
 use Symfony\Component\HttpClient\ScopingHttpClient;
@@ -1403,20 +1403,6 @@ public function testCacheDefaultRedisProvider()
         $this->assertSame($redisUrl, $url);
     }
 
-    public function testCacheDefaultRedisProviderWithEnvVar()
-    {
-        $container = $this->createContainerFromFile('cache_env_var');
-
-        $redisUrl = 'redis://paas.com';
-        $providerId = '.cache_connection.'.ContainerBuilder::hash($redisUrl);
-
-        $this->assertTrue($container->hasDefinition($providerId));
-
-        $url = $container->getDefinition($providerId)->getArgument(0);
-
-        $this->assertSame($redisUrl, $url);
-    }
-
     public function testCachePoolServices()
     {
         $container = $this->createContainerFromFile('cache', [], true, false);
@@ -1584,7 +1570,7 @@ public function testMailer(): void
 
     protected function createContainer(array $data = [])
     {
-        return new ContainerBuilder(new ParameterBag(array_merge([
+        return new ContainerBuilder(new EnvPlaceholderParameterBag(array_merge([
             'kernel.bundles' => ['FrameworkBundle' => 'Symfony\\Bundle\\FrameworkBundle\\FrameworkBundle'],
             'kernel.bundles_metadata' => ['FrameworkBundle' => ['namespace' => 'Symfony\\Bundle\\FrameworkBundle', 'path' => __DIR__.'/../..']],
             'kernel.cache_dir' => __DIR__,