Issue #3507578: Fix issues raised by phpstan

Closes #3507578

Merge request reports

Loading