bug #43627 [Framework][Secrets] Fix service definition when local vault is disabled (GromNaN)

fabpot · fabpot · commit 68537b2529b3 · 2021-10-26T10:07:22.000+02:00
This PR was merged into the 5.3 branch. Discussion ---------- [Framework][Secrets] Fix service definition when local vault is disabled | Q | A | ------------- | --- | Branch? | 5.3 | Bug fix? | yes | New feature? | no | Deprecations? | no | Tickets | - | License | MIT | Doc PR | - Local vault can be disabled with the following configuration: ``` framework: secrets: local_dotenv_file: ~ ``` This removes the service `secrets.local_vault` ([code](https://github.com/symfony/symfony/blob/5.3/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php#L1669)). The `secrets:...` commands support this by having `$localVault` argument nullable. When configuration was moved from XML to PHP in #37216, the attribute `on-invalid="ignore"` of some services was left. Commits ------- 0e11f5a Fix commands when local vault is disabled
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/config/console.php b/src/Symfony/Bundle/FrameworkBundle/Resources/config/console.php
@@ -298,7 +298,7 @@
         ->set('console.command.secrets_list', SecretsListCommand::class)
             ->args([
                 service('secrets.vault'),
-                service('secrets.local_vault'),
+                service('secrets.local_vault')->ignoreOnInvalid(),
             ])
             ->tag('console.command')
 
@@ -312,7 +312,7 @@
         ->set('console.command.secrets_encrypt_from_local', SecretsEncryptFromLocalCommand::class)
             ->args([
                 service('secrets.vault'),
-                service('secrets.local_vault'),
+                service('secrets.local_vault')->ignoreOnInvalid(),
             ])
             ->tag('console.command')
     ;
