Merge branch 'hotfix/86-php-7.2-finalization' into develop

Forward port #86 Conflicts: CHANGELOG.md
zendframework · Apr 9, 2018 · fe91d51 · fe91d51
2 parents 6fe9d82 + d7b4a38
commit fe91d51
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -20,7 +20,7 @@ All notable changes to this project will be documented in this file, in reverse
 
 - Nothing.
 
-## 2.9.3 - TBD
+## 2.9.3 - 2018-04-09
 
 ### Added
 
@@ -36,8 +36,10 @@ All notable changes to this project will be documented in this file, in reverse
 
 ### Fixed
 
-- [#79](https://github.com/zendframework/zend-log/pull/79) provides fixes to
-  ensure the `FingersCrossed` and `MongoDB` writers work under PHP 7.2.
+- [#79](https://github.com/zendframework/zend-log/pull/79) and
+  [#86](https://github.com/zendframework/zend-log/pull/86) provide fixes to
+  ensure the `FingersCrossed`, `Mongo`, and `MongoDB` writers work under PHP
+  7.2.
 
 ## 2.9.2 - 2017-05-17
 

diff --git a/src/Writer/Mongo.php b/src/Writer/Mongo.php
@@ -90,9 +90,10 @@ public function __construct($mongo, $database = null, $collection = null, array
      * This writer does not support formatting.
      *
      * @param string|FormatterInterface $formatter
+     * @param array|null $options (unused)
      * @return WriterInterface
      */
-    public function setFormatter($formatter)
+    public function setFormatter($formatter, array $options = null)
     {
         return $this;
     }