Fix PHPStan errors

Justin Wongrequested to merge
issue/ex_icons-3413441:3413441-fix-phpstan-errors into 8.x-1.x

Will need to revisit ignored errors for architectural changes.

Closes #3413441

Merge request reports