bug #31302 [FramworkBundle] mark any env vars found in the ide setting as used (nicolas-grekas)

fabpot · fabpot · commit dc4fb76717c0 · 2019-04-29T08:51:40.000+02:00
This PR was merged into the 3.4 branch. Discussion ---------- [FramworkBundle] mark any env vars found in the ide setting as used | Q | A | ------------- | --- | Branch? | 3.4 | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | #31119 | License | MIT | Doc PR | - Commits ------- e461d36 [FramworkBundle] mark any env vars found in the ide setting as used
diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
@@ -212,6 +212,8 @@ public function load(array $configs, ContainerBuilder $container)
                     'phpstorm' => 'phpstorm://open?file=%%f&line=%%l',
                 ];
                 $ide = $config['ide'];
+                // mark any env vars found in the ide setting as used
+                $container->resolveEnvPlaceholders($ide);
 
                 $container->setParameter('templating.helper.code.file_link_format', str_replace('%', '%%', ini_get('xdebug.file_link_format') ?: get_cfg_var('xdebug.file_link_format')) ?: (isset($links[$ide]) ? $links[$ide] : $ide));
             }

Original file line number	Diff line number	Diff line change
`@@ -212,6 +212,8 @@ public function load(array $configs, ContainerBuilder $container)`
`212`	`212`	`'phpstorm' => 'phpstorm://open?file=%%f&line=%%l',`
`213`	`213`	`];`
`214`	`214`	`$ide = $config['ide'];`
	`215`	`+ // mark any env vars found in the ide setting as used`
	`216`	`+ $container->resolveEnvPlaceholders($ide);`
`215`	`217`
`216`	`218`	`$container->setParameter('templating.helper.code.file_link_format', str_replace('%', '%%', ini_get('xdebug.file_link_format') ?: get_cfg_var('xdebug.file_link_format')) ?: (isset($links[$ide]) ? $links[$ide] : $ide));`
`217`	`219`	`}`