Messages are now passed as arrays

7 files changed, 16 insertions, 11 deletions

diff --git a/src/Monolog/Formatter/FormatterInterface.php b/src/Monolog/Formatter/FormatterInterface.php
index 18b8dd9..1fa15e2 100644
--- a/src/Monolog/Formatter/FormatterInterface.php
+++ b/src/Monolog/Formatter/FormatterInterface.php
@@ -13,5 +13,5 @@ namespace Monolog\Formatter;
 
 interface FormatterInterface
 {
-    function format($log, $level, $message);
+    function format($log, $message);
 }
diff --git a/src/Monolog/Formatter/SimpleFormatter.php b/src/Monolog/Formatter/SimpleFormatter.php
index 9c7f343..3a2d2ee 100644
--- a/src/Monolog/Formatter/SimpleFormatter.php
+++ b/src/Monolog/Formatter/SimpleFormatter.php
@@ -27,19 +27,19 @@ class SimpleFormatter implements FormatterInterface
         $this->dateFormat = $dateFormat ?: self::SIMPLE_DATE;
     }
 
-    public function format($log, $level, $message)
+    public function format($log, $message)
     {
         $defaults = array(
             'log' => $log,
-            'level' => Logger::getLevelName($level),
+            'level' => Logger::getLevelName($message['level']),
             'date' => date($this->dateFormat),
         );
 
-        if (is_array($message)) {
-            $vars = array_merge($defaults, $message);
+        if (is_array($message['message'])) {
+            $vars = array_merge($defaults, $message['message']);
         } else {
             $vars = $defaults;
-            $vars['message'] = $message;
+            $vars['message'] = $message['message'];
         }
 
         $message = $this->format;
diff --git a/src/Monolog/Log.php b/src/Monolog/Log.php
index fee2029..253cf7d 100644
--- a/src/Monolog/Log.php
+++ b/src/Monolog/Log.php
@@ -22,6 +22,7 @@ class Log
     public function __construct($name, $level = Logger::WARNING, $writers = array())
     {
         $this->name = $name;
+        // TODO move level down to the writers
         $this->level = $level;
         $this->writers = is_array($writers) ? $writers : array($writers);
     }
diff --git a/src/Monolog/Logger.php b/src/Monolog/Logger.php
index 5a4f9f8..a220c87 100644
--- a/src/Monolog/Logger.php
+++ b/src/Monolog/Logger.php
@@ -62,6 +62,10 @@ class Logger
 
     public function addMessage($level, $message, $log = null)
     {
+        $message = array(
+            'message' => $message,
+            'level' => $level,
+        );
         if (null === $log) {
             $logs = $this->logs;
         } else {
diff --git a/src/Monolog/Writer/NullWriter.php b/src/Monolog/Writer/NullWriter.php
index 4ca4ae9..c44a61f 100644
--- a/src/Monolog/Writer/NullWriter.php
+++ b/src/Monolog/Writer/NullWriter.php
@@ -15,7 +15,7 @@ use Monolog\Formatter\FormatterInterface;
 
 class NullWriter implements WriterInterface
 {
-    public function write($log, $level, $message)
+    public function write($log, $message)
     {
     }
 
diff --git a/src/Monolog/Writer/StreamWriter.php b/src/Monolog/Writer/StreamWriter.php
index dd3042a..09d5203 100644
--- a/src/Monolog/Writer/StreamWriter.php
+++ b/src/Monolog/Writer/StreamWriter.php
@@ -28,15 +28,15 @@ class StreamWriter implements WriterInterface
         }
     }
 
-    public function write($log, $level, $message)
+    public function write($log, $message)
     {
         if (null === $this->stream) {
             $this->stream = fopen($this->url, 'a');
         }
         if ($this->formatter) {
-            $message = $this->formatter->format($log, $level, $message);
+            $message = $this->formatter->format($log, $message);
         }
-        fwrite($this->stream, (string) $message);
+        fwrite($this->stream, (string) $message['message']);
     }
 
     public function close()
diff --git a/src/Monolog/Writer/WriterInterface.php b/src/Monolog/Writer/WriterInterface.php
index cd6ad5d..f8dffb3 100644
--- a/src/Monolog/Writer/WriterInterface.php
+++ b/src/Monolog/Writer/WriterInterface.php
@@ -16,6 +16,6 @@ use Monolog\Formatter\FormatterInterface;
 interface WriterInterface
 {
     function setFormatter(FormatterInterface $formatter);
-    function write($log, $level, $message);
+    function write($log, $message);
     function close();
 }