Better usage of the rootDir

jeremyFreeAgent · jeremyFreeAgent · commit 837fdf392f5c · 2016-10-24T17:03:04.000+02:00
diff --git a/src/Symfony/Bundle/WebProfilerBundle/Controller/ProfilerController.php b/src/Symfony/Bundle/WebProfilerBundle/Controller/ProfilerController.php
@@ -35,7 +35,7 @@ class ProfilerController
     private $templates;
     private $toolbarPosition;
     private $cspHandler;
-    private $kernelRootDir;
+    private $rootDir;
 
     /**
      * Constructor.
@@ -45,17 +45,17 @@ class ProfilerController
      * @param \Twig_Environment     $twig            The twig environment
      * @param array                 $templates       The templates
      * @param string                $toolbarPosition The toolbar position (top, bottom, normal, or null -- use the configuration)
-     * @param string                $kernelRootDir   The Kernel root directory
+     * @param string                $rootDir         The project root directory
      */
-    public function __construct(UrlGeneratorInterface $generator, Profiler $profiler = null, \Twig_Environment $twig, array $templates, $toolbarPosition = 'normal', ContentSecurityPolicyHandler $cspHandler = null, $kernelRootDir = null)
+    public function __construct(UrlGeneratorInterface $generator, Profiler $profiler = null, \Twig_Environment $twig, array $templates, $toolbarPosition = 'normal', ContentSecurityPolicyHandler $cspHandler = null, $rootDir = null)
     {
         $this->generator = $generator;
         $this->profiler = $profiler;
         $this->twig = $twig;
         $this->templates = $templates;
         $this->toolbarPosition = $toolbarPosition;
         $this->cspHandler = $cspHandler;
-        $this->kernelRootDir = $kernelRootDir;
+        $this->rootDir = $rootDir;
     }
 
     /**
@@ -406,8 +406,8 @@ public function phpinfoAction()
      */
     public function openAction(Request $request)
     {
-        if (null === $this->kernelRootDir) {
-            throw new NotFoundHttpException('KernelRootDir should be set.');
+        if (null === $this->rootDir) {
+            throw new NotFoundHttpException('rootDir should be set.');
         }
 
         if ($this->profiler) {
@@ -417,7 +417,7 @@ public function openAction(Request $request)
         $file = $request->query->get('file');
         $line = $request->query->get('line');
 
-        $filename = dirname($this->kernelRootDir).DIRECTORY_SEPARATOR.$file;
+        $filename = $this->rootDir.DIRECTORY_SEPARATOR.$file;
 
         if (preg_match("'(^|[/\\\\])\.\.?([/\\\\]|$)'", $file) || !is_readable($filename)) {
             throw new NotFoundHttpException(sprintf('The file "%s" cannot be opened.', $file));
diff --git a/src/Symfony/Bundle/WebProfilerBundle/DependencyInjection/WebProfilerExtension.php b/src/Symfony/Bundle/WebProfilerBundle/DependencyInjection/WebProfilerExtension.php
@@ -52,6 +52,12 @@ public function load(array $configs, ContainerBuilder $container)
             $container->setParameter('web_profiler.debug_toolbar.intercept_redirects', $config['intercept_redirects']);
             $container->setParameter('web_profiler.debug_toolbar.mode', $config['toolbar'] ? WebDebugToolbarListener::ENABLED : WebDebugToolbarListener::DISABLED);
         }
+
+        $profilerController = $container->getDefinition('web_profiler.controller.profiler');
+        $profilerController->replaceArgument(6, dirname(dirname(dirname(dirname(dirname(dirname(dirname(dirname(__DIR__)))))))));
+
+        $fileLinkFormatter = $container->getDefinition('debug.file_link_formatter');
+        $fileLinkFormatter->replaceArgument(2, dirname(dirname(dirname(dirname(dirname(dirname(dirname(dirname(__DIR__)))))))));
     }
 
     /**
diff --git a/src/Symfony/Bundle/WebProfilerBundle/Resources/config/profiler.xml b/src/Symfony/Bundle/WebProfilerBundle/Resources/config/profiler.xml
@@ -12,7 +12,7 @@
             <argument>%data_collector.templates%</argument>
             <argument>%web_profiler.debug_toolbar.position%</argument>
             <argument type="service" id="web_profiler.csp.handler" />
-            <argument>%kernel.root_dir%</argument>
+            <argument>null</argument>
         </service>
 
         <service id="web_profiler.controller.router" class="Symfony\Bundle\WebProfilerBundle\Controller\RouterController">
@@ -52,7 +52,7 @@
         <service id="debug.file_link_formatter" class="Symfony\Component\HttpKernel\Debug\FileLinkFormatter" public="false">
             <argument>%debug.file_link_format%</argument>
             <argument type="service" id="request_stack" on-invalid="ignore" />
-            <argument>%kernel.root_dir%</argument>
+            <argument>null</argument>
             <argument>/_profiler/open?file=%%f&amp;line=%%l#line%%l</argument>
         </service>
     </services>
diff --git a/src/Symfony/Component/HttpKernel/Debug/FileLinkFormatter.php b/src/Symfony/Component/HttpKernel/Debug/FileLinkFormatter.php
@@ -76,7 +76,7 @@ private function getFileLinkFormat()
             if ($request instanceof Request) {
                 return array(
                     $request->getSchemeAndHttpHost().$request->getBaseUrl().$this->urlFormat,
-                    dirname($this->rootDir).DIRECTORY_SEPARATOR, '',
+                    $this->rootDir.DIRECTORY_SEPARATOR, '',
                 );
             }
         }

Original file line number	Diff line number	Diff line change
`@@ -52,6 +52,12 @@ public function load(array $configs, ContainerBuilder $container)`
`52`	`52`	`$container->setParameter('web_profiler.debug_toolbar.intercept_redirects', $config['intercept_redirects']);`
`53`	`53`	`$container->setParameter('web_profiler.debug_toolbar.mode', $config['toolbar'] ? WebDebugToolbarListener::ENABLED : WebDebugToolbarListener::DISABLED);`
`54`	`54`	`}`
	`55`	`+`
	`56`	`+ $profilerController = $container->getDefinition('web_profiler.controller.profiler');`
	`57`	`+ $profilerController->replaceArgument(6, dirname(dirname(dirname(dirname(dirname(dirname(dirname(dirname(__DIR__)))))))));`
	`58`	`+`
	`59`	`+ $fileLinkFormatter = $container->getDefinition('debug.file_link_formatter');`
	`60`	`+ $fileLinkFormatter->replaceArgument(2, dirname(dirname(dirname(dirname(dirname(dirname(dirname(dirname(__DIR__)))))))));`
`55`	`61`	`}`
`56`	`62`
`57`	`63`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -76,7 +76,7 @@ private function getFileLinkFormat()`
`76`	`76`	`if ($request instanceof Request) {`
`77`	`77`	`return array(`
`78`	`78`	`$request->getSchemeAndHttpHost().$request->getBaseUrl().$this->urlFormat,`
`79`		`- dirname($this->rootDir).DIRECTORY_SEPARATOR, '',`
	`79`	`+ $this->rootDir.DIRECTORY_SEPARATOR, '',`
`80`	`80`	`);`
`81`	`81`	`}`
`82`	`82`	`}`