Issue #3612319: Address PHPStan issues

Closes #3612319

Merge request reports

Loading