Fix phpstan issues

Closes #3445719

added 4 commits

• d30af121 - 1 commit from branch project:8.x-1.x
• bb207aa3 - Use di
• b3c2e67b - Merge branch '8.x-1.x' into 3445719-fix-phpstan-issues
• 445cb207 - Don't allow stan issues

Compare with previous version

started a merge train

merged