[WebProfiler] fixed WDT display

fabpot · fabpot · commit e1116524ed79 · 2010-10-26T17:42:44.000+02:00
diff --git a/src/Symfony/Bundle/WebProfilerBundle/Tests/WebDebugToolbarListenerTest.php b/src/Symfony/Bundle/WebProfilerBundle/Tests/WebDebugToolbarListenerTest.php
@@ -0,0 +1,60 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Bundle\WebProfilerBundle\Tests;
+
+use Symfony\Bundle\WebProfilerBundle\WebDebugToolbarListener;
+use Symfony\Component\HttpFoundation\Response;
+
+class WebDebugToolbarListenerTest extends \PHPUnit_Framework_TestCase
+{
+    /**
+     * @dataProvider getInjectToolbarTests
+     */
+    public function testInjectToolbar($content, $expected)
+    {
+        $resolver = $this->getMock('Symfony\Bundle\FrameworkBundle\Controller\ControllerResolver', array(), array(), '', false);
+        $resolver->expects($this->any())
+                 ->method('render')
+                 ->will($this->returnValue('WDT'));
+        ;
+        $request = $this->getMock('Symfony\Component\HttpFoundation\Request');
+        $listener = new WebDebugToolbarListener($resolver);
+        $r = new \ReflectionObject($listener);
+        $m = $r->getMethod('injectToolbar');
+        $m->setAccessible(true);
+
+        $response = new Response($content);
+
+        $m->invoke($listener, $request, $response);
+        $this->assertEquals($expected, $response->getContent());
+    }
+
+    public function getInjectToolbarTests()
+    {
+        return array(
+            array('<html><head></head><body></body></html>', "<html><head></head><body>\nWDT\n</body></html>"),
+            array('<html>
+            <head></head>
+            <body>
+            <textarea><html><head></head><body></body></html></textarea>
+            </body>
+            </html>', "<html>
+            <head></head>
+            <body>
+            <textarea><html><head></head><body></body></html></textarea>
+            
+WDT
+</body>
+            </html>"),
+        );
+    }
+}
diff --git a/src/Symfony/Bundle/WebProfilerBundle/WebDebugToolbarListener.php b/src/Symfony/Bundle/WebProfilerBundle/WebDebugToolbarListener.php
@@ -72,7 +72,7 @@ public function handle(Event $event, Response $response)
             return $response;
         }
 
-        $response->setContent($this->injectToolbar($request, $response));
+        $this->injectToolbar($request, $response);
 
         return $response;
     }
@@ -86,12 +86,23 @@ public function handle(Event $event, Response $response)
      */
     protected function injectToolbar(Request $request, Response $response)
     {
+        if (function_exists('mb_stripos')) {
+            $posrFunction = 'mb_strripos';
+            $substrFunction = 'mb_substr';
+        } else {
+            $posrFunction = 'strripos';
+            $substrFunction = 'substr';
+        }
+
         $toolbar = "\n".str_replace("\n", '', $this->resolver->render('WebProfilerBundle:Profiler:toolbar'))."\n";
-        $content = str_ireplace('</body>', $toolbar.'</body>', $response->getContent(), $count);
-        if (!$count) {
+        $content = $response->getContent();
+
+        if (false === $pos = $posrFunction($content, '</body>')) {
             $content .= $toolbar;
+        } else {
+            $content = $substrFunction($content, 0, $pos).$toolbar.$substrFunction($content, $pos);
         }
 
-        return $content;
+        $response->setContent($content);
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -72,7 +72,7 @@ public function handle(Event $event, Response $response)`
`72`	`72`	`return $response;`
`73`	`73`	`}`
`74`	`74`
`75`		`- $response->setContent($this->injectToolbar($request, $response));`
	`75`	`+ $this->injectToolbar($request, $response);`
`76`	`76`
`77`	`77`	`return $response;`
`78`	`78`	`}`
`@@ -86,12 +86,23 @@ public function handle(Event $event, Response $response)`
`86`	`86`	`*/`
`87`	`87`	`protected function injectToolbar(Request $request, Response $response)`
`88`	`88`	`{`
	`89`	`+ if (function_exists('mb_stripos')) {`
	`90`	`+ $posrFunction = 'mb_strripos';`
	`91`	`+ $substrFunction = 'mb_substr';`
	`92`	`+ } else {`
	`93`	`+ $posrFunction = 'strripos';`
	`94`	`+ $substrFunction = 'substr';`
	`95`	`+ }`
	`96`	`+`
`89`	`97`	`$toolbar = "\n".str_replace("\n", '', $this->resolver->render('WebProfilerBundle:Profiler:toolbar'))."\n";`
`90`		`- $content = str_ireplace('</body>', $toolbar.'</body>', $response->getContent(), $count);`
`91`		`- if (!$count) {`
	`98`	`+ $content = $response->getContent();`
	`99`	`+`
	`100`	`+ if (false === $pos = $posrFunction($content, '</body>')) {`
`92`	`101`	`$content .= $toolbar;`
	`102`	`+ } else {`
	`103`	`+ $content = $substrFunction($content, 0, $pos).$toolbar.$substrFunction($content, $pos);`
`93`	`104`	`}`
`94`	`105`
`95`		`- return $content;`
	`106`	`+ $response->setContent($content);`
`96`	`107`	`}`
`97`	`108`	`}`