[String] add LazyString to provide generic stringable objects

Author: nicolas-grekas

DependencyInjection/FrameworkExtension.php

@@ -112,6 +112,7 @@
 use Symfony\Component\Serializer\Normalizer\DenormalizerInterface;
 use Symfony\Component\Serializer\Normalizer\NormalizerInterface;
 use Symfony\Component\Stopwatch\Stopwatch;
+use Symfony\Component\String\LazyString;
 use Symfony\Component\String\Slugger\SluggerInterface;
 use Symfony\Component\Translation\Command\XliffLintCommand as BaseXliffLintCommand;
 use Symfony\Component\Translation\Translator;
@@ -1390,9 +1391,15 @@ private function registerSecretsConfiguration(array $config, ContainerBuilder $c
                 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']})%");
+            if (class_exists(LazyString::class)) {
+                $container->getDefinition('secrets.decryption_key')->replaceArgument(1, $config['decryption_env_var']);
+            } else {
+                $container->getDefinition('secrets.vault')->replaceArgument(1, "%env({$config['decryption_env_var']})%");
+                $container->removeDefinition('secrets.decryption_key');
+            }
         } else {
             $container->getDefinition('secrets.vault')->replaceArgument(1, null);
+            $container->removeDefinition('secrets.decryption_key');
         }
     }
 

Resources/config/secrets.xml

@@ -8,6 +8,10 @@
         <service id="secrets.vault" class="Symfony\Bundle\FrameworkBundle\Secrets\SodiumVault">
             <tag name="container.env_var_loader" />
             <argument />
+            <argument type="service" id="secrets.decryption_key" on-invalid="ignore" />
+        </service>
+
+        <service id="secrets.decryption_key" parent="getenv">
             <argument />
         </service>
 

Resources/config/services.xml

@@ -129,5 +129,19 @@
             <tag name="kernel.locale_aware" />
         </service>
         <service id="Symfony\Component\String\Slugger\SluggerInterface" alias="slugger" />
+
+        <!-- inherit from this service to lazily access env vars -->
+        <service id="getenv" class="Symfony\Component\String\LazyString" abstract="true">
+            <factory class="Symfony\Component\String\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>
+        </service>
     </services>
 </container>