PHPStan fixes

Closes #3421763

Merge request reports

Loading