Added tests, fixed a bunch of bugs

src/Monolog/Formatter/SimpleFormatter.php

@@ -11,6 +11,8 @@
 
 namespace Monolog\Formatter;
 
+use Monolog\Logger;
+
 class SimpleFormatter implements FormatterInterface
 {
     const SIMPLE_FORMAT = "[%date%] %log%.%level%: %message%\n";
@@ -29,7 +31,7 @@ class SimpleFormatter implements FormatterInterface
     {
         $defaults = array(
             'log' => $log,
-            'level' => $level,
+            'level' => Logger::getLevelName($level),
             'date' => date($this->dateFormat),
         );
 
@@ -40,6 +42,7 @@ class SimpleFormatter implements FormatterInterface
             $vars['message'] = $message;
         }
 
+        $message = $this->format;
         foreach ($vars as $var => $val) {
             $message = str_replace('%'.$var.'%', $val, $message);
         }

src/Monolog/Log.php

@@ -15,13 +15,15 @@ use Monolog\Writer\WriterInterface;
 
 class Log
 {
+    protected $level;
     protected $name;
     protected $writers;
 
-    public function __construct($name, $writers = array())
+    public function __construct($name, $level = Logger::WARN, $writers = array())
     {
         $this->name = $name;
-        $this->writers = $writers;
+        $this->level = $level;
+        $this->writers = (array) $writers;
     }
 
     public function getName()
@@ -51,6 +53,6 @@ class Log
 
     public function getLevel()
     {
-        return $level;
+        return $this->level;
     }
 }

src/Monolog/Logger.php

@@ -19,11 +19,19 @@ class Logger
     const ERROR = 15;
     const FATAL = 20;
 
+    protected static $levels = array(
+        1 => 'DEBUG',
+        5 => 'INFO',
+        10 => 'WARN',
+        15 => 'ERROR',
+        20 => 'FATAL',
+    );
+
     protected $logs;
 
     public function __construct($logs = array())
     {
-        $this->logs = $logs;
+        $this->logs = (array) $logs;
     }
 
     public function addLog(Log $log)
@@ -36,7 +44,7 @@ class Logger
         if (null === $log) {
             $logs = $this->logs;
         } else {
-            $logs = (array) $log;
+            $logs = is_array($log) ? array_flip($log) : array($log => true);
         }
         foreach ($logs as $log => $dummy) {
             $this->logs[$log]->log($level, $message);
@@ -67,4 +75,9 @@ class Logger
     {
         $this->log(self::FATAL, $message, $log);
     }
+
+    public static function getLevelName($level)
+    {
+        return self::$levels[$level];
+    }
 }

src/Monolog/Writer/StreamWriter.php

@@ -33,16 +33,27 @@ class StreamWriter implements WriterInterface
         if (null === $this->stream) {
             $this->stream = fopen($this->url, 'a');
         }
-        fwrite($this->stream, $this->formatter->format($log, $level, $message));
+        if ($this->formatter) {
+            $message = $this->formatter->format($log, $level, $message);
+        }
+        fwrite($this->stream, (string) $message);
     }
 
     public function close()
     {
         fclose($this->stream);
+        $this->stream = null;
     }
 
     public function setFormatter(FormatterInterface $formatter)
     {
         $this->formatter = $formatter;
     }
+
+    public function __destruct()
+    {
+        if (null !== $this->stream) {
+            $this->close();
+        }
+    }
 }

tests/Monolog/Formatter/SimpleFormatterTest.php

@@ -0,0 +1,35 @@
+<?php
+
+/*
+ * This file is part of the Monolog package.
+ *
+ * (c) Jordi Boggiano <j.boggiano@seld.be>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Monolog\Formatter;
+
+use Monolog\Logger;
+
+class SimpleFormatterTest extends \PHPUnit_Framework_TestCase
+{
+    public function testDefFormatWithString()
+    {
+        $formatter = new SimpleFormatter(null, 'Y-m-d');
+        $message = $formatter->format('log', Logger::WARN, 'foo');
+        $this->assertEquals('['.date('Y-m-d').'] log.WARN: foo'."\n", $message);
+    }
+
+    public function testDefFormatWithArray()
+    {
+        $formatter = new SimpleFormatter(null, 'Y-m-d');
+        $message = $formatter->format('xx', Logger::FATAL, array(
+            'log' => 'log',
+            'level' => 'WARN',
+            'message' => 'foo'
+        ));
+        $this->assertEquals('['.date('Y-m-d').'] log.WARN: foo'."\n", $message);
+    }
+}

tests/Monolog/LogTest.php

@@ -0,0 +1,44 @@
+<?php
+
+/*
+ * This file is part of the Monolog package.
+ *
+ * (c) Jordi Boggiano <j.boggiano@seld.be>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Monolog;
+
+class LogTest extends \PHPUnit_Framework_TestCase
+{
+    public function testLog()
+    {
+        $logger = new Log('bob');
+        $writer1 = $this->getMock('Monolog\Writer\NullWriter', array('write'));
+        $writer1->expects($this->once())
+            ->method('write')
+            ->with('bob', Logger::WARN, 'test');
+        $writer2 = $this->getMock('Monolog\Writer\NullWriter', array('write'));
+        $writer2->expects($this->once())
+            ->method('write')
+            ->with('bob', Logger::WARN, 'test');
+        $logger->addWriter($writer1);
+        $logger->addWriter($writer2);
+        $logger->log(Logger::WARN, 'test');
+    }
+
+    public function testLogLowLevel()
+    {
+        $logger = new Log('bob');
+        $logger->setLevel(Logger::FATAL);
+        $this->assertEquals(Logger::FATAL, $logger->getLevel());
+
+        $writer1 = $this->getMock('Monolog\Writer\NullWriter', array('write'));
+        $writer1->expects($this->never())
+            ->method('write');
+        $logger->addWriter($writer1);
+        $logger->log(Logger::WARN, 'test');
+    }
+}

tests/Monolog/LoggerTest.php

@@ -0,0 +1,45 @@
+<?php
+
+/*
+ * This file is part of the Monolog package.
+ *
+ * (c) Jordi Boggiano <j.boggiano@seld.be>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Monolog;
+
+class LoggerTest extends \PHPUnit_Framework_TestCase
+{
+    public function testLogAll()
+    {
+        $logger = new Logger();
+        $log1 = $this->getMock('Monolog\Log', array('log'), array('a'));
+        $log1->expects($this->once())
+            ->method('log');
+        $log2 = $this->getMock('Monolog\Log', array('log'), array('b'));
+        $log2->expects($this->once())
+            ->method('log');
+        $logger->addLog($log1);
+        $logger->addLog($log2);
+        $logger->warn('test');
+    }
+
+    public function testLogFiltered()
+    {
+        $logger = new Logger();
+        $log1 = $this->getMock('Monolog\Log', array('log'), array('a'));
+        $log1->expects($this->exactly(2))
+            ->method('log');
+        $log2 = $this->getMock('Monolog\Log', array('log'), array('b'));
+        $log2->expects($this->never())
+            ->method('log');
+        $logger->addLog($log1);
+        $logger->addLog($log2);
+
+        $logger->warn('test', 'a');
+        $logger->warn('test', array('a'));
+    }
+}

tests/Monolog/Writer/StreamWriterTest.php

@@ -0,0 +1,37 @@
+<?php
+
+/*
+ * This file is part of the Monolog package.
+ *
+ * (c) Jordi Boggiano <j.boggiano@seld.be>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Monolog\Writer;
+
+use Monolog\Logger;
+
+class StreamWritterTest extends \PHPUnit_Framework_TestCase
+{
+    public function testWrite()
+    {
+        $handle = fopen('php://memory', 'a+');
+        $writer = new StreamWriter($handle);
+        $writer->write('log', Logger::WARN, 'test');
+        $writer->write('log', Logger::WARN, 'test2');
+        $writer->write('log', Logger::WARN, 'test3');
+        fseek($handle, 0);
+        $this->assertEquals('testtest2test3', fread($handle, 100));
+    }
+
+    public function testClose()
+    {
+        $handle = fopen('php://memory', 'a+');
+        $writer = new StreamWriter($handle);
+        $this->assertTrue(is_resource($handle));
+        $writer->close();
+        $this->assertFalse(is_resource($handle));
+    }
+}