symfony
diff --git a/‎UPGRADE-3.0.md
Copy file name to clipboardExpand all lines: UPGRADE-3.0.md
+8Lines changed: 8 additions & 0 deletions b/‎UPGRADE-3.0.md
Copy file name to clipboardExpand all lines: UPGRADE-3.0.md
+8Lines changed: 8 additions & 0 deletions
diff --git a/‎src/Symfony/Bridge/Monolog/Logger.php
Copy file name to clipboardExpand all lines: src/Symfony/Bridge/Monolog/Logger.php
-40Lines changed: 0 additions & 40 deletions b/‎src/Symfony/Bridge/Monolog/Logger.php
Copy file name to clipboardExpand all lines: src/Symfony/Bridge/Monolog/Logger.php
-40Lines changed: 0 additions & 40 deletions
diff --git a/‎src/Symfony/Bridge/Monolog/Tests/LoggerTest.php
Copy file name to clipboard
+61Lines changed: 61 additions & 0 deletions b/‎src/Symfony/Bridge/Monolog/Tests/LoggerTest.php
Copy file name to clipboard
+61Lines changed: 61 additions & 0 deletions
@@ -998,3 +998,11 @@ UPGRADE FROM 2.x to 3.0
  * `Process::setStdin()` and `Process::getStdin()` have been removed. Use
    `Process::setInput()` and `Process::getInput()` that works the same way.
  * `Process::setInput()` and `ProcessBuilder::setInput()` do not accept non-scalar types.
+
+### Monolog Bridge
+
+ * `Symfony\Bridge\Monolog\Logger::emerg()` was removed. Use `emergency()` which is PSR-3 compatible.
+ * `Symfony\Bridge\Monolog\Logger::crit()` was removed. Use `critical()` which is PSR-3 compatible.
+ * `Symfony\Bridge\Monolog\Logger::err()` was removed. Use `error()` which is PSR-3 compatible.
+ * `Symfony\Bridge\Monolog\Logger::warn()` was removed. Use `warning()` which is PSR-3 compatible.
+
@@ -22,46 +22,6 @@
  */
 class Logger extends BaseLogger implements LoggerInterface, DebugLoggerInterface
 {
-    /**
-     * @deprecated since 2.2, to be removed in 3.0. Use emergency() which is PSR-3 compatible.
-     */
-    public function emerg($message, array $context = array())
-    {
-        trigger_error('The emerg() method of the Monolog Logger was removed. You should use the new method emergency() instead, which is PSR-3 compatible.', E_USER_DEPRECATED);
-
-        return parent::addRecord(BaseLogger::EMERGENCY, $message, $context);
-    }
-
-    /**
-     * @deprecated since 2.2, to be removed in 3.0. Use critical() which is PSR-3 compatible.
-     */
-    public function crit($message, array $context = array())
-    {
-        trigger_error('The crit() method of the Monolog Logger was removed. You should use the new method critical() instead, which is PSR-3 compatible.', E_USER_DEPRECATED);
-
-        return parent::addRecord(BaseLogger::CRITICAL, $message, $context);
-    }
-
-    /**
-     * @deprecated since 2.2, to be removed in 3.0. Use error() which is PSR-3 compatible.
-     */
-    public function err($message, array $context = array())
-    {
-        trigger_error('The err() method of the Monolog Logger was removed. You should use the new method error() instead, which is PSR-3 compatible.', E_USER_DEPRECATED);
-
-        return parent::addRecord(BaseLogger::ERROR, $message, $context);
-    }
-
-    /**
-     * @deprecated since 2.2, to be removed in 3.0. Use warning() which is PSR-3 compatible.
-     */
-    public function warn($message, array $context = array())
-    {
-        trigger_error('The warn() method of the Monolog Logger was removed. You should use the new method warning() instead, which is PSR-3 compatible.', E_USER_DEPRECATED);
-
-        return parent::addRecord(BaseLogger::WARNING, $message, $context);
-    }
-
     /**
      * @see Symfony\Component\HttpKernel\Log\DebugLoggerInterface
      */
 
@@ -0,0 +1,61 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Bridge\Monolog\Tests;
+
+use Symfony\Bridge\Monolog\Logger;
+
+class LoggerTest extends \PHPUnit_Framework_TestCase
+{
+    public function testGetLogsWithDebugHandler()
+    {
+        $expectedLogs = array('foo', 'bar');
+
+        $debugHandler = $this->getMock('Symfony\Component\HttpKernel\Log\DebugLoggerInterface');
+        $debugHandler
+            ->expects($this->any())
+            ->method('getLogs')
+            ->will($this->returnValue($expectedLogs))
+        ;
+
+        $logger = new Logger('foobar', array($debugHandler));
+        $this->assertEquals($expectedLogs, $logger->getLogs());
+    }
+
+    public function testGetLogsWithoutDebugHandler()
+    {
+        $handler = $this->getMock('Symfony\Component\HttpKernel\Log\LoggerInterface');
+
+        $logger = new Logger('foobar', array($handler));
+        $this->assertEquals(array(), $logger->getLogs());
+    }
+
+    public function testCountErrorsWithDebugHandler()
+    {
+        $debugHandler = $this->getMock('Symfony\Component\HttpKernel\Log\DebugLoggerInterface');
+        $debugHandler
+            ->expects($this->any())
+            ->method('countErrors')
+            ->will($this->returnValue(5))
+        ;
+
+        $logger = new Logger('foobar', array($debugHandler));
+        $this->assertEquals(5, $logger->countErrors());
+    }
+
+    public function testCountErrorsWithoutDebugHandler()
+    {
+        $handler = $this->getMock('Symfony\Component\HttpKernel\Log\LoggerInterface');
+
+        $logger = new Logger('foobar', array($handler));
+        $this->assertEquals(0, $logger->countErrors());
+    }
+}