[MonologBridge] Improve FirePHPHandler

dunglas · dunglas · commit 1d93b5e26ad9 · 2018-07-17T14:18:04.000+02:00
diff --git a/src/Symfony/Bridge/Monolog/Handler/FirePHPHandler.php b/src/Symfony/Bridge/Monolog/Handler/FirePHPHandler.php
@@ -38,9 +38,10 @@ public function onKernelResponse(FilterResponseEvent $event)
             return;
         }
 
-        if (!preg_match('{\bFirePHP/\d+\.\d+\b}', $event->getRequest()->headers->get('User-Agent'))
-            && !$event->getRequest()->headers->has('X-FirePHP-Version')) {
-            $this->sendHeaders = false;
+        $request = $event->getRequest();
+        if (!preg_match('{\bFirePHP/\d+\.\d+\b}', $request->headers->get('User-Agent'))
+            && !$request->headers->has('X-FirePHP-Version')) {
+            self::$sendHeaders = false;
             $this->headers = array();
 
             return;
@@ -58,7 +59,7 @@ public function onKernelResponse(FilterResponseEvent $event)
      */
     protected function sendHeader($header, $content)
     {
-        if (!$this->sendHeaders) {
+        if (!self::$sendHeaders) {
             return;
         }
 

Original file line number	Diff line number	Diff line change
`@@ -38,9 +38,10 @@ public function onKernelResponse(FilterResponseEvent $event)`
`38`	`38`	`return;`
`39`	`39`	`}`
`40`	`40`
`41`		`- if (!preg_match('{\bFirePHP/\d+\.\d+\b}', $event->getRequest()->headers->get('User-Agent'))`
`42`		`- && !$event->getRequest()->headers->has('X-FirePHP-Version')) {`
`43`		`- $this->sendHeaders = false;`
	`41`	`+ $request = $event->getRequest();`
	`42`	`+ if (!preg_match('{\bFirePHP/\d+\.\d+\b}', $request->headers->get('User-Agent'))`
	`43`	`+ && !$request->headers->has('X-FirePHP-Version')) {`
	`44`	`+ self::$sendHeaders = false;`
`44`	`45`	`$this->headers = array();`
`45`	`46`
`46`	`47`	`return;`
`@@ -58,7 +59,7 @@ public function onKernelResponse(FilterResponseEvent $event)`
`58`	`59`	`*/`
`59`	`60`	`protected function sendHeader($header, $content)`
`60`	`61`	`{`
`61`		`- if (!$this->sendHeaders) {`
	`62`	`+ if (!self::$sendHeaders) {`
`62`	`63`	`return;`
`63`	`64`	`}`
`64`	`65`