首页 发现 帮助
注册 登录
VendorSoftware
/
symfony
2
0
派生 0
文件 工单管理 0 合并请求 0 Wiki
浏览代码

Remove kernel from the web debug toolbar

Antoine Hérault 14 年之前
父节点
8cb400a5d8
当前提交
614cf4c7b0
共有 3 个文件被更改，包括 4 次插入 和 10 次删除
合并视图 显示文件统计
  1. 0 1
      src/Symfony/Bundle/WebProfilerBundle/Resources/config/toolbar.xml
  2. 2 5
      src/Symfony/Bundle/WebProfilerBundle/Tests/WebDebugToolbarListenerTest.php
  3. 2 4
      src/Symfony/Bundle/WebProfilerBundle/WebDebugToolbarListener.php

+ 0 - 1
src/Symfony/Bundle/WebProfilerBundle/Resources/config/toolbar.xml
查看文件 

@@ -12,7 +12,6 @@
 
     <services>
 
     <services>
 
         <service id="debug.toolbar" class="%debug.toolbar.class%">
 
         <service id="debug.toolbar" class="%debug.toolbar.class%">
 
             <tag name="kernel.listener" event="onCoreResponse" priority="-128" />
 
             <tag name="kernel.listener" event="onCoreResponse" priority="-128" />
 
-            <argument type="service" id="http_kernel" />
 
             <argument type="service" id="templating.engine.twig" />
 
             <argument type="service" id="templating.engine.twig" />
 
             <argument>%debug.toolbar.intercept_redirects%</argument>
 
             <argument>%debug.toolbar.intercept_redirects%</argument>
 
         </service>
 
         </service>

+ 2 - 5
src/Symfony/Bundle/WebProfilerBundle/Tests/WebDebugToolbarListenerTest.php
查看文件 

@@ -21,14 +21,13 @@ class WebDebugToolbarListenerTest extends \PHPUnit_Framework_TestCase
 
      */
 
      */
 
     public function testInjectToolbar($content, $expected)
 
     public function testInjectToolbar($content, $expected)
 
     {
 
     {
 
-        $kernel = $this->getMock('Symfony\Bundle\FrameworkBundle\HttpKernel', array(), array(), '', false);
 
         $templating = $this->getMock('Symfony\Bundle\TwigBundle\TwigEngine', array(), array(), '', false);
 
         $templating = $this->getMock('Symfony\Bundle\TwigBundle\TwigEngine', array(), array(), '', false);
 
         $templating->expects($this->any())
 
         $templating->expects($this->any())
 
                  ->method('render')
 
                  ->method('render')
 
                  ->will($this->returnValue('WDT'));
 
                  ->will($this->returnValue('WDT'));
 
         ;
 
         ;
 
         $request = $this->getMock('Symfony\Component\HttpFoundation\Request');
 
         $request = $this->getMock('Symfony\Component\HttpFoundation\Request');
 
-        $listener = new WebDebugToolbarListener($kernel, $templating);
 
+        $listener = new WebDebugToolbarListener($templating);
 
         $m = new \ReflectionMethod($listener, 'injectToolbar');
 
         $m = new \ReflectionMethod($listener, 'injectToolbar');
 
         $m->setAccessible(true);
 
         $m->setAccessible(true);
 
 
 
@@ -51,9 +50,7 @@ class WebDebugToolbarListenerTest extends \PHPUnit_Framework_TestCase
 
             <head></head>
 
             <head></head>
 
             <body>
 
             <body>
 
             <textarea><html><head></head><body></body></html></textarea>
 
             <textarea><html><head></head><body></body></html></textarea>
 
-            
-WDT
 
-</body>
 
+            \nWDT\n</body>
 
             </html>"),
 
             </html>"),
 
         );
 
         );
 
     }
 
     }

+ 2 - 4
src/Symfony/Bundle/WebProfilerBundle/WebDebugToolbarListener.php
查看文件 

@@ -30,13 +30,11 @@ use Symfony\Bundle\TwigBundle\TwigEngine;
 
  */
 
  */
 
 class WebDebugToolbarListener
 
 class WebDebugToolbarListener
 
 {
 
 {
 
-    protected $kernel;
 
     protected $templating;
 
     protected $templating;
 
     protected $interceptRedirects;
 
     protected $interceptRedirects;
 
 
 
-    public function __construct(HttpKernel $kernel, TwigEngine $templating, $interceptRedirects = false)
 
+    public function __construct(TwigEngine $templating, $interceptRedirects = false)
 
     {
 
     {
 
-        $this->kernel = $kernel;
 
         $this->templating = $templating;
 
         $this->templating = $templating;
 
         $this->interceptRedirects = $interceptRedirects;
 
         $this->interceptRedirects = $interceptRedirects;
 
     }
 
     }
 
@@ -48,7 +46,7 @@ class WebDebugToolbarListener
 
         }
 
         }
 
 
 
         $response = $event->getResponse();
 
         $response = $event->getResponse();
 
-	$request = $event->getRequest();
 
+        $request = $event->getRequest();
 
 
 
         if ($response->headers->has('X-Debug-Token') && $response->isRedirect() && $this->interceptRedirects) {
 
         if ($response->headers->has('X-Debug-Token') && $response->isRedirect() && $this->interceptRedirects) {
 
             // keep current flashes for one more request
 
             // keep current flashes for one more request