8000 [*Bundle] Replace some kernel.root_dir by kernel.project_dir · symfony/symfony@4add28b · GitHub
[go: up one dir, main page]
Skip to content

Commit 4add28b

8000 Browse files
nicolas-grekasnicolas-grekas
committed
[*Bundle] Replace some kernel.root_dir by kernel.project_dir
1 parent 7a70077 commit 4add28b

File tree

6 files changed

+6
-22
lines changed

6 files changed

+6
-22
lines changed

‎src/Symfony/Bundle/FrameworkBundle/Resources/config/services.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,7 @@
5656
<argument>%kernel.root_dir%/Resources</argument>
5757
<argument type="collection">
5858
<argument>%kernel.root_dir%</argument>
59+
<argument>%kernel.project_dir%</argument>
5960
</argument>
6061
</service>
6162
<service id="Symfony\Component\HttpKernel\Config\FileLocator" alias="file_locator" />

‎src/Symfony/Bundle/FrameworkBundle/Templating/Helper/CodeHelper.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ class CodeHelper extends Helper
3131
public function __construct($fileLinkFormat, $rootDir, $charset)
3232
{
3333
$this->fileLinkFormat = $fileLinkFormat ?: ini_get('xdebug.file_link_format') ?: get_cfg_var('xdebug.file_link_format');
34-
$this->rootDir = str_replace('\\', '/', $rootDir).'/';
34+
$this->rootDir = str_replace('\\', '/', dirname($rootDir)).'/';
3535
$this->charset = $charset;
3636
}
3737

‎src/Symfony/Bundle/WebProfilerBundle/DependencyInjection/WebProfilerExtension.php

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -53,24 +53,6 @@ public function load(array $configs, ContainerBuilder $container)
5353
$container->setParameter('web_profiler.debug_toolbar.intercept_redirects', $config['intercept_redirects']);
5454
$container->setParameter('web_profiler.debug_toolbar.mode', $config['toolbar'] ? WebDebugToolbarListener::ENABLED : WebDebugToolbarListener::DISABLED);
5555
}
56-
57-
$baseDir = array();
58-
$rootDir = $container->getParameter('kernel.root_dir');
59-
$rootDir = explode(DIRECTORY_SEPARATOR, realpath($rootDir) ?: $rootDir);
60-
$bundleDir = explode(DIRECTORY_SEPARATOR, __DIR__);
61-
for ($i = 0; isset($rootDir[$i], $bundleDir[$i]); ++$i) {
62-
if ($rootDir[$i] !== $bundleDir[$i]) {
63-
break;
64-
}
65-
$baseDir[] = $rootDir[$i];
66-
}
67-
$baseDir = implode(DIRECTORY_SEPARATOR, $baseDir);
68-
69-
$profilerController = $container->getDefinition('web_profiler.controller.profiler');
70-
$profilerController->replaceArgument(6, $baseDir);
71-
72-
$fileLinkFormatter = $container->getDefinition('debug.file_link_formatter');
73-
$fileLinkFormatter->replaceArgument(2, $baseDir);
7456
}
7557

7658
/**

‎src/Symfony/Bundle/WebProfilerBundle/Resources/config/profiler.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
<argument>%data_collector.templates%</argument>
1515
<argument>%web_profiler.debug_toolbar.position%</argument>
1616
<argument type="service" id="web_profiler.csp.handler" />
17-
<argument>null</argument>
17+
<argument>%kernel.project_dir%</argument>
1818
</service>
1919

2020
<service id="web_profiler.controller.router" class="Symfony\Bundle\WebProfilerBundle\Controller\RouterController" public="true">
@@ -55,7 +55,7 @@
5555
<service id="debug.file_link_formatter" class="Symfony\Component\HttpKernel\Debug\FileLinkFormatter">
5656
<argument>%debug.file_link_format%</argument>
5757
<argument type="service" id="request_stack" on-invalid="ignore" />
58-
<argument>null</argument>
58+
<argument>%kernel.project_dir%</argument>
5959
<argument>/_profiler/open?file=%%f&amp;line=%%l#line%%l</argument>
6060
</service>
6161
</services>

‎src/Symfony/Bundle/WebProfilerBundle/Tests/DependencyInjection/WebProfilerExtensionTest.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,7 @@ protected function setUp()
6060
$this->container->setParameter('kernel.bundles', array());
6161
$this->container->setParameter('kernel.cache_dir', __DIR__);
6262
$this->container->setParameter('kernel.debug', false);
63+
$this->container->setParameter('kernel.project_dir', __DIR__);
6364
$this->container->setParameter('kernel.root_dir', __DIR__);
6465
$this->container->setParameter('kernel.charset', 'UTF-8');
6566
$this->container->setParameter('debug.file_link_format', null);

‎src/Symfony/Bundle/WebProfilerBundle/composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
],
1818
"require": {
1919
"php": "^5.5.9|>=7.0.8",
20-
"symfony/http-kernel": "~3.2|~4.0",
20+
"symfony/http-kernel": "~3.3|~4.0",
2121
"symfony/polyfill-php70": "~1.0",
2222
"symfony/routing": "~2.8|~3.0|~4.0",
2323
"symfony/twig-bridge": "~2.8|~3.0|~4.0",

0 commit comments

Comments
 (0)
0