Merge "Fix some PHPDoc type hints in DatabaseMysqli"