diogo/symfony
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch '2.3' into 2.7

Browse Source 
* 2.3:
  fixed CS
  [FrameworkBundle] Fix precedence of xdebug.file_link_format
This commit is contained in:
Fabien Potencier 2015-08-24 08:37:42 +02:00
commit ce93f61437
4 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
View File

@ -471,6 +471,7 @@ class FrameworkExtension extends Extension
{ {
$loader->load('templating.xml'); $loader->load('templating.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',
@ -478,7 +479,9 @@ 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('fragment.renderer.hinclude.global_template', $config['hinclude_default_template']); $container->setParameter('fragment.renderer.hinclude.global_template', $config['hinclude_default_template']);
if ($container->getParameter('kernel.debug')) { if ($container->getParameter('kernel.debug')) {