Resolve #3502724 "Fix code quality issues reported by PHPStan"

Tom Keitelrequested to merge
issue/view_mode_switch-3502724:3502724-fix-code-quality into 2.x

Closes #3502724

Merge request reports