feature #22791 [MonologBridge] remove deprecated features (xabbuh)

nicolas-grekas · nicolas-grekas · commit ee37c80012a4 · 2017-05-21T15:20:45.000+02:00
This PR was merged into the 4.0-dev branch. Discussion ---------- [MonologBridge] remove deprecated features | Q | A | ------------- | --- | Branch? | master | Bug fix? | no | New feature? | no | BC breaks? | yes | Deprecations? | no | Tests pass? | yes | Fixed tickets | | License | MIT | Doc PR | Commits ------- 731065a [MonologBridge] remove deprecated features
diff --git a/src/Symfony/Bridge/Monolog/CHANGELOG.md b/src/Symfony/Bridge/Monolog/CHANGELOG.md
@@ -1,6 +1,14 @@
 CHANGELOG
 =========
 
+4.0.0
+-----
+
+ * the `$format`, `$dateFormat`, `$allowInlineLineBreaks`, and `$ignoreEmptyContextAndExtra`
+   constructor arguments of the `ConsoleFormatter` class have been removed, use
+   `$options` instead
+ * the `DebugHandler` class has been removed
+
 3.3.0
 -----
 
diff --git a/src/Symfony/Bridge/Monolog/Formatter/ConsoleFormatter.php b/src/Symfony/Bridge/Monolog/Formatter/ConsoleFormatter.php
@@ -55,24 +55,8 @@ class ConsoleFormatter implements FormatterInterface
      *   * colors: If true, the log string contains ANSI code to add color;
      *   * multiline: If false, "context" and "extra" are dumped on one line.
      */
-    public function __construct($options = array())
+    public function __construct(array $options = array())
     {
-        // BC Layer
-        if (!is_array($options)) {
-            @trigger_error(sprintf('The constructor arguments $format, $dateFormat, $allowInlineLineBreaks, $ignoreEmptyContextAndExtra of "%s" are deprecated since 3.3 and will be removed in 4.0. Use $options instead.', self::class), E_USER_DEPRECATED);
-            $args = func_get_args();
-            $options = array();
-            if (isset($args[0])) {
-                $options['format'] = $args[0];
-            }
-            if (isset($args[1])) {
-                $options['date_format'] = $args[1];
-            }
-            if (isset($args[2])) {
-                $options['multiline'] = $args[2];
-            }
-        }
-
         $this->options = array_replace(array(
             'format' => self::SIMPLE_FORMAT,
             'date_format' => self::SIMPLE_DATE,
diff --git a/src/Symfony/Bridge/Monolog/Handler/DebugHandler.php b/src/Symfony/Bridge/Monolog/Handler/DebugHandler.php
diff --git a/src/Symfony/Bridge/Monolog/Tests/LoggerTest.php b/src/Symfony/Bridge/Monolog/Tests/LoggerTest.php
@@ -13,24 +13,11 @@
 
 use Monolog\Handler\TestHandler;
 use PHPUnit\Framework\TestCase;
-use Symfony\Bridge\Monolog\Handler\DebugHandler;
 use Symfony\Bridge\Monolog\Processor\DebugProcessor;
 use Symfony\Bridge\Monolog\Logger;
 
 class LoggerTest extends TestCase
 {
-    /**
-     * @group legacy
-     */
-    public function testGetLogsWithDebugHandler()
-    {
-        $handler = new DebugHandler();
-        $logger = new Logger(__METHOD__, array($handler));
-
-        $this->assertTrue($logger->error('error message'));
-        $this->assertSame(1, count($logger->getLogs()));
-    }
-
     public function testGetLogsWithoutDebugProcessor()
     {
         $handler = new TestHandler();
@@ -40,43 +27,6 @@ public function testGetLogsWithoutDebugProcessor()
         $this->assertSame(array(), $logger->getLogs());
     }
 
-    /**
-     * @group legacy
-     */
-    public function testCountErrorsWithDebugHandler()
-    {
-        $handler = new DebugHandler();
-        $logger = new Logger(__METHOD__, array($handler));
-
-        $this->assertTrue($logger->debug('test message'));
-        $this->assertTrue($logger->info('test message'));
-        $this->assertTrue($logger->notice('test message'));
-        $this->assertTrue($logger->warning('test message'));
-
-        $this->assertTrue($logger->error('test message'));
-        $this->assertTrue($logger->critical('test message'));
-        $this->assertTrue($logger->alert('test message'));
-        $this->assertTrue($logger->emergency('test message'));
-
-        $this->assertSame(4, $logger->countErrors());
-    }
-
-    /**
-     * @group legacy
-     */
-    public function testGetLogsWithDebugHandler2()
-    {
-        $logger = new Logger('test');
-        $logger->pushHandler(new DebugHandler());
-
-        $logger->addInfo('test');
-        $this->assertCount(1, $logger->getLogs());
-        list($record) = $logger->getLogs();
-
-        $this->assertEquals('test', $record['message']);
-        $this->assertEquals(Logger::INFO, $record['priority']);
-    }
-
     public function testCountErrorsWithoutDebugProcessor()
     {
         $handler = new TestHandler();
