Merge remote-tracking branch 'origin/1.12.x' into 2.0.x

Author: ondrejmirtes

resources/functionMap.php

@@ -994,8 +994,8 @@
 'closelog' => ['bool'],
 'Closure::__construct' => ['void'],
 'Closure::__invoke' => ['', '...args='=>''],
-'Closure::bind' => ['Closure', 'old'=>'Closure', 'to'=>'?object', 'scope='=>'object|class-string|\'static\'|null'],
-'Closure::bindTo' => ['Closure', 'new'=>'?object', 'newscope='=>'object|class-string|\'static\'|null'],
+'Closure::bind' => ['__benevolent<Closure|null>', 'old'=>'Closure', 'to'=>'?object', 'scope='=>'object|class-string|\'static\'|null'],
+'Closure::bindTo' => ['__benevolent<Closure|null>', 'new'=>'?object', 'newscope='=>'object|class-string|\'static\'|null'],
 'Closure::call' => ['', 'to'=>'object', '...parameters='=>''],
 'Closure::fromCallable' => ['Closure', 'callable'=>'callable'],
 'clusterObj::convertToString' => ['string'],