bug #26626 [WebProfilerBundle] use the router to resolve file links (nicolas-grekas)

nicolas-grekas · nicolas-grekas · commit 2faaf11e0393 · 2018-03-22T16:03:55.000+01:00
This PR was merged into the 3.4 branch. Discussion ---------- [WebProfilerBundle] use the router to resolve file links | Q | A | ------------- | --- | Branch? | 3.4 | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | #22290, #25886 | License | MIT | Doc PR | - Commits ------- 2cfc573 [WebProfilerBundle] use the router to resolve file links
diff --git a/src/Symfony/Bundle/WebProfilerBundle/Resources/config/profiler.xml b/src/Symfony/Bundle/WebProfilerBundle/Resources/config/profiler.xml
@@ -56,7 +56,20 @@
             <argument>%debug.file_link_format%</argument>
             <argument type="service" id="request_stack" on-invalid="ignore" />
             <argument>%kernel.project_dir%</argument>
-            <argument>/_profiler/open?file=%%f&amp;line=%%l#line%%l</argument>
+            <argument type="service">
+                <service class="string">
+                    <factory function="implode" />
+                    <argument type="collection">
+                        <argument type="service">
+                            <service class="string">
+                                <factory service="router" method="generate" />
+                                <argument>_profiler_open_file</argument>
+                            </service>
+                        </argument>
+                        <argument>?file=%%f&amp;line=%%l#line%%l</argument>
+                    </argument>
+                </service>
+            </argument>
         </service>
     </services>
 </container>
diff --git a/src/Symfony/Component/Routing/Router.php b/src/Symfony/Component/Routing/Router.php
@@ -302,7 +302,9 @@ function (ConfigCacheInterface $cache) {
             }
         );
 
-        require_once $cache->getPath();
+        if (!class_exists($this->options['matcher_cache_class'], false)) {
+            require_once $cache->getPath();
+        }
 
         return $this->matcher = new $this->options['matcher_cache_class']($this->context);
     }
@@ -334,7 +336,9 @@ function (ConfigCacheInterface $cache) {
                 }
             );
 
-            require_once $cache->getPath();
+            if (!class_exists($this->options['generator_cache_class'], false)) {
+                require_once $cache->getPath();
+            }
 
             $this->generator = new $this->options['generator_cache_class']($this->context, $this->logger);
         }

Original file line number	Diff line number	Diff line change
`@@ -302,7 +302,9 @@ function (ConfigCacheInterface $cache) {`
`302`	`302`	`}`
`303`	`303`	`);`
`304`	`304`
`305`		`- require_once $cache->getPath();`
	`305`	`+ if (!class_exists($this->options['matcher_cache_class'], false)) {`
	`306`	`+ require_once $cache->getPath();`
	`307`	`+ }`
`306`	`308`
`307`	`309`	`return $this->matcher = new $this->options['matcher_cache_class']($this->context);`
`308`	`310`	`}`
`@@ -334,7 +336,9 @@ function (ConfigCacheInterface $cache) {`
`334`	`336`	`}`
`335`	`337`	`);`
`336`	`338`
`337`		`- require_once $cache->getPath();`
	`339`	`+ if (!class_exists($this->options['generator_cache_class'], false)) {`
	`340`	`+ require_once $cache->getPath();`
	`341`	`+ }`
`338`	`342`
`339`	`343`	`$this->generator = new $this->options['generator_cache_class']($this->context, $this->logger);`
`340`	`344`	`}`