bug #15549 [FrameworkBundle] Fix precedence of xdebug.file_link_format (nicolas-grekas)
This PR was merged into the 2.3 branch.
Discussion
----------
[FrameworkBundle] Fix precedence of xdebug.file_link_format
| Q | A
| ------------- | ---
| Bug fix? | yes
| New feature? | no
| BC breaks? | no
| Deprecations? | no
| Tests pass? | yes
| Fixed tickets | -
| License | MIT
| Doc PR | https://github.com/symfony/symfony-docs/pull/5625
See https://github.com/symfony/symfony-demo/pull/148#issuecomment-131058728
Commits
-------
adb5327
[FrameworkBundle] Fix precedence of xdebug.file_link_format
This commit is contained in:
commit
1076a0f551
@ -356,6 +356,7 @@ class FrameworkExtension extends Extension
|
|||||||
$loader->load('templating.xml');
|
$loader->load('templating.xml');
|
||||||
$loader->load('templating_php.xml');
|
$loader->load('templating_php.xml');
|
||||||
|
|
||||||
|
if (!$container->hasParameter('templating.helper.code.file_link_format')) {
|
||||||
$links = array(
|
$links = array(
|
||||||
'textmate' => 'txmt://open?url=file://%%f&line=%%l',
|
'textmate' => 'txmt://open?url=file://%%f&line=%%l',
|
||||||
'macvim' => 'mvim://open?url=file://%%f&line=%%l',
|
'macvim' => 'mvim://open?url=file://%%f&line=%%l',
|
||||||
@ -363,7 +364,8 @@ class FrameworkExtension extends Extension
|
|||||||
'sublime' => 'subl://open?url=file://%%f&line=%%l',
|
'sublime' => 'subl://open?url=file://%%f&line=%%l',
|
||||||
);
|
);
|
||||||
|
|
||||||
$container->setParameter('templating.helper.code.file_link_format', isset($links[$ide]) ? $links[$ide] : $ide);
|
$container->setParameter('templating.helper.code.file_link_format', ini_get('xdebug.file_link_format') ?: get_cfg_var('xdebug.file_link_format') ?: (isset($links[$ide]) ? $links[$ide] : $ide));
|
||||||
|
}
|
||||||
$container->setParameter('templating.helper.form.resources', $config['form']['resources']);
|
$container->setParameter('templating.helper.form.resources', $config['form']['resources']);
|
||||||
$container->setParameter('fragment.renderer.hinclude.global_template', $config['hinclude_default_template']);
|
$container->setParameter('fragment.renderer.hinclude.global_template', $config['hinclude_default_template']);
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user