Update monolog to 1.18.2

https://github.com/Seldaek/monolog/compare/1.17.2...1.18.2

Update KafkaHandlerTest.php

Depends-On: I32e9ebe0a10d97a1ccb0f4d605bd0ee9ba4e97f6
Change-Id: I35eedb6d95b68ebf90c00bb54469c9ff5731cdab

diff --git a/composer.json b/composer.json
index 56b27f8..702e8b5 100644 (file)
--- a/composer.json
+++ b/composer.json
@@ -42,7 +42,7 @@
                "jakub-onderka/php-parallel-lint": "0.9.2",
                "justinrainbow/json-schema": "~1.3",
                "mediawiki/mediawiki-codesniffer": "0.6.0",
-               "monolog/monolog": "~1.17.2",
+               "monolog/monolog": "~1.18.2",
                "nikic/php-parser": "1.4.1",
                "nmred/kafka-php": "0.1.5",
                "phpunit/phpunit": "4.8.24",

diff --git a/includes/debug/logger/monolog/LineFormatter.php b/includes/debug/logger/monolog/LineFormatter.php
index 13b80be..0ad9b15 100644 (file)
--- a/includes/debug/logger/monolog/LineFormatter.php
+++ b/includes/debug/logger/monolog/LineFormatter.php
@@ -99,7 +99,7 @@ class LineFormatter extends MonologLineFormatter {
         * @param Exception $e
         * @return string
         */
-       protected function normalizeException( Exception $e ) {
+       protected function normalizeException( $e ) {
                return $this->normalizeExceptionArray( $this->exceptionAsArray( $e ) );
        }
 

diff --git a/tests/phpunit/includes/debug/logger/monolog/KafkaHandlerTest.php b/tests/phpunit/includes/debug/logger/monolog/KafkaHandlerTest.php
index 3029948..e29d207 100644 (file)
--- a/tests/phpunit/includes/debug/logger/monolog/KafkaHandlerTest.php
+++ b/tests/phpunit/includes/debug/logger/monolog/KafkaHandlerTest.php
@@ -64,6 +64,7 @@ class KafkaHandlerTest extends MediaWikiTestCase {
                        'channel' => 'foo',
                        'level' => Logger::EMERGENCY,
                        'extra' => [],
+                       'context' => [],
                ] );
        }
 
@@ -98,6 +99,7 @@ class KafkaHandlerTest extends MediaWikiTestCase {
                        'channel' => 'foo',
                        'level' => Logger::EMERGENCY,
                        'extra' => [],
+                       'context' => [],
                ] );
 
                if ( !$expectException ) {
@@ -128,6 +130,7 @@ class KafkaHandlerTest extends MediaWikiTestCase {
                        'channel' => 'foo',
                        'level' => Logger::EMERGENCY,
                        'extra' => [],
+                       'context' => [],
                ] );
 
                if ( !$expectException ) {
@@ -163,6 +166,7 @@ class KafkaHandlerTest extends MediaWikiTestCase {
                                'channel' => 'foo',
                                'level' => Logger::EMERGENCY,
                                'extra' => [],
+                               'context' => [],
                        ] );
                }
        }
@@ -190,16 +194,19 @@ class KafkaHandlerTest extends MediaWikiTestCase {
                                'channel' => 'foo',
                                'level' => Logger::EMERGENCY,
                                'extra' => [],
+                               'context' => [],
                        ],
                        [
                                'channel' => 'foo',
                                'level' => Logger::EMERGENCY,
                                'extra' => [],
+                               'context' => [],
                        ],
                        [
                                'channel' => 'foo',
                                'level' => Logger::EMERGENCY,
                                'extra' => [],
+                               'context' => [],
                        ],
                ] );
        }