Skip to content

Commit

Permalink
bug #31302 [FramworkBundle] mark any env vars found in the ide settin…
Browse files Browse the repository at this point in the history
…g as used (nicolas-grekas)

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
  • Loading branch information
fabpot committed Apr 29, 2019
2 parents 52be2bb + e461d36 commit dc4fb76
Showing 1 changed file with 2 additions and 0 deletions.
Expand Up @@ -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));
}
Expand Down

0 comments on commit dc4fb76

Please sign in to comment.