From 83b84ff8188d9af5fa6d903f21cc8b0a25df6b4b Mon Sep 17 00:00:00 2001
From: ChristianB <cbergau86@gmail.com>
Date: Thu, 31 Jan 2013 10:39:11 +0100
Subject: [PATCH] Pass $record['formatted'] as the user parameter for zend
 monitor. Refactored test.

---
 src/Monolog/Handler/ZendMonitorHandler.php    | 13 +++++++----
 .../Handler/ZendMonitorHandlerTest.php        | 23 +++++++++++++++----
 2 files changed, 27 insertions(+), 9 deletions(-)

diff --git a/src/Monolog/Handler/ZendMonitorHandler.php b/src/Monolog/Handler/ZendMonitorHandler.php
index 1e9741e8..770cb13a 100644
--- a/src/Monolog/Handler/ZendMonitorHandler.php
+++ b/src/Monolog/Handler/ZendMonitorHandler.php
@@ -61,9 +61,11 @@ class ZendMonitorHandler extends AbstractProcessingHandler
     protected function write(array $record)
     {
         if ($this->isZendServer()) {
-            $formatter = $this->getDefaultFormatter();
-            $record = $formatter->format($record);
-            $this->writeZendMonitorCustomEvent($this->levelMap[$record['level']], $record['message']);
+            $this->writeZendMonitorCustomEvent(
+                $this->levelMap[$record['level']],
+                $record['message'],
+                $record['formatted']
+            );
         }
     }
 
@@ -72,10 +74,11 @@ class ZendMonitorHandler extends AbstractProcessingHandler
      *
      * @param   int     $level
      * @param   string  $message
+     * @param   array   $formatted
      */
-    protected function writeZendMonitorCustomEvent($level, $message)
+    protected function writeZendMonitorCustomEvent($level, $message, $formatted)
     {
-        zend_monitor_custom_event($level, $message);
+        zend_monitor_custom_event($level, $message, $formatted);
     }
 
     /**
diff --git a/tests/Monolog/Handler/ZendMonitorHandlerTest.php b/tests/Monolog/Handler/ZendMonitorHandlerTest.php
index e88aacf2..6d441c6b 100644
--- a/tests/Monolog/Handler/ZendMonitorHandlerTest.php
+++ b/tests/Monolog/Handler/ZendMonitorHandlerTest.php
@@ -40,16 +40,31 @@ class ZendMonitorHandlerTest extends TestCase
     public function testWrite()
     {
         $record = $this->getRecord();
+        $formatterResult = array(
+            'message' => $record['message']
+        );
 
         $zendMonitor = $this->getMockBuilder('Monolog\Handler\ZendMonitorHandler')
-                            ->setMethods(array('writeZendMonitorCustomEvent'))
-                            ->getMock();
+            ->setMethods(array('writeZendMonitorCustomEvent', 'getDefaultFormatter'))
+            ->getMock();
+
+        $formatterMock = $this->getMockBuilder('Monolog\Formatter\NormalizerFormatter')
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $formatterMock->expects($this->once())
+            ->method('format')
+            ->will($this->returnValue($formatterResult));
+
+        $zendMonitor->expects($this->once())
+            ->method('getDefaultFormatter')
+            ->will($this->returnValue($formatterMock));
 
         $levelMap = $zendMonitor->getLevelMap();
 
         $zendMonitor->expects($this->once())
-                    ->method('writeZendMonitorCustomEvent')
-                    ->with($levelMap[$record['level']], $record['message']);
+            ->method('writeZendMonitorCustomEvent')
+            ->with($levelMap[$record['level']], $record['message'], $formatterResult);
 
         $zendMonitor->handle($record);
     }