Merge branch refs/heads/1.12.x into 2.1.x

Author: phpstan-bot

Diff for: resources/functionMap.php

@@ -6604,7 +6604,7 @@
 'MongoCollection::insert' => ['bool|array', 'a'=>'array', 'options='=>'array'],
 'MongoCollection::parallelCollectionScan' => ['MongoCommandCursor[]', 'num_cursors'=>'int'],
 'MongoCollection::remove' => ['bool|array', 'criteria='=>'array', 'options='=>'array'],
-'MongoCollection::save' => ['mixed', 'a'=>'array', 'options='=>'array'],
+'MongoCollection::save' => ['mixed', 'a'=>'array|object', 'options='=>'array'],
 'MongoCollection::setReadPreference' => ['bool', 'read_preference'=>'string', 'tags='=>'array'],
 'MongoCollection::setSlaveOkay' => ['bool', 'ok='=>'bool'],
 'MongoCollection::setWriteConcern' => ['bool', 'w'=>'mixed', 'wtimeout='=>'int'],
@@ -7173,7 +7173,7 @@
 'MongoLog::getCallback' => ['callable'],
 'MongoLog::getLevel' => ['int'],
 'MongoLog::getModule' => ['int'],
-'MongoLog::setCallback' => ['void', 'log_function'=>'callable'],
+'MongoLog::setCallback' => ['bool', 'log_function'=>'callable'],
 'MongoLog::setLevel' => ['void', 'level'=>'int'],
 'MongoLog::setModule' => ['void', 'module'=>'int'],
 'MongoPool::getSize' => ['int'],