Worked on fixing PHPStan issues.

Closes #3472853

Merge request reports

Loading