Issue #3178534: Fix various doc comment type hints reported by PHPStan