Skip to content

Commit 747c98f

Browse files
committed
[FrameworkBundle] removed the debug.file_link_format parameter
1 parent 4d4876d commit 747c98f

File tree

2 files changed

+13
-11
lines changed

2 files changed

+13
-11
lines changed

src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -83,14 +83,6 @@ public function load(array $configs, ContainerBuilder $container)
8383

8484
$container->getDefinition('exception_listener')->setArgument(0, $config['exception_controller']);
8585

86-
$links = array(
87-
'textmate' => 'txmt://open?url=file://%f&line=%l',
88-
'macvim' => 'mvim://open?url=file://%f&line=%l',
89-
);
90-
91-
$link = isset($links[$config['ide']]) ? $links[$config['ide']] : $config['ide'];
92-
$container->setParameter('debug.file_link_format', str_replace('%', '%%', $link));
93-
9486
if (!empty($config['test'])) {
9587
$loader->load('test.xml');
9688
$config['session']['storage_id'] = 'array';
@@ -117,7 +109,7 @@ public function load(array $configs, ContainerBuilder $container)
117109
}
118110

119111
if (isset($config['templating'])) {
120-
$this->registerTemplatingConfiguration($config['templating'], $container, $loader);
112+
$this->registerTemplatingConfiguration($config['templating'], $config['ide'], $container, $loader);
121113
}
122114

123115
if (isset($config['translator'])) {
@@ -317,11 +309,21 @@ private function registerSessionConfiguration(array $config, ContainerBuilder $c
317309
* @param ContainerBuilder $container A ContainerBuilder instance
318310
* @param XmlFileLoader $loader An XmlFileLoader instance
319311
*/
320-
private function registerTemplatingConfiguration(array $config, ContainerBuilder $container, XmlFileLoader $loader)
312+
private function registerTemplatingConfiguration(array $config, $ide, ContainerBuilder $container, XmlFileLoader $loader)
321313
{
322314
$loader->load('templating.xml');
323315
$loader->load('templating_php.xml');
324316

317+
$links = array(
318+
'textmate' => 'txmt://open?url=file://%f&line=%l',
319+
'macvim' => 'mvim://open?url=file://%f&line=%l',
320+
);
321+
322+
$container
323+
->getDefinition('templating.helper.code')
324+
->setArgument(0, str_replace('%', '%%', isset($links[$ide]) ? $links[$ide] : $ide))
325+
;
326+
325327
if ($container->getParameter('kernel.debug')) {
326328
$loader->load('templating_debug.xml');
327329
}

src/Symfony/Bundle/FrameworkBundle/Resources/config/templating_php.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@
6262

6363
<service id="templating.helper.code" class="%templating.helper.code.class%">
6464
<tag name="templating.helper" alias="code" />
65-
<argument>%debug.file_link_format%</argument>
65+
<argument /> <!-- file link format -->
6666
<argument>%kernel.root_dir%</argument>
6767
</service>
6868

0 commit comments

Comments
 (0)