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

made the kernel optional in all data collectors

Browse Source
This commit is contained in:
Fabien Potencier 2012-12-22 14:27:11 +01:00
parent 3341c8ec43
commit 5e359d3e9d
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Symfony/Bundle/FrameworkBundle/Resources/config/collectors.xml
View File

@ -18,7 +18,7 @@
<services>
<service id="data_collector.config" class="%data_collector.config.class%" public="false">
<tag name="data_collector" template="WebProfilerBundle:Collector:config" id="config" priority="255" />
<call method="setKernel"><argument type="service" id="kernel" /></call>
<call method="setKernel"><argument type="service" id="kernel" on-invalid="ignore" /></call>
</service>
<service id="data_collector.request" class="%data_collector.request.class%">
@ -42,7 +42,7 @@
<service id="data_collector.time" class="%data_collector.time.class%" public="false">
<tag name="data_collector" template="WebProfilerBundle:Collector:time" id="time" priority="255" />
<argument type="service" id="kernel" />
<argument type="service" id="kernel" on-invalid="ignore" />
</service>
<service id="data_collector.memory" class="%data_collector.memory.class%" public="false">

2
src/Symfony/Component/HttpKernel/DataCollector/ConfigDataCollector.php
View File

@ -31,7 +31,7 @@ class ConfigDataCollector extends DataCollector
*
* @param KernelInterface $kernel A KernelInterface instance
*/
public function setKernel(KernelInterface $kernel)
public function setKernel(KernelInterface $kernel = null)
{
$this->kernel = $kernel;
}