[Backport #1979 to 5.x] Rector / CS fixes

[github-actions]

Automated backport of #1979 to branch 5.x.

Do not modify this pull request.

Summary

Fix some rector and code style related warnings.

Type of Change

• Bug fix (non-breaking change that fixes an issue)
• New feature (non-breaking change that adds functionality)
• Enhancement (improvement to existing functionality)
• Breaking change (fix or feature that would cause existing functionality to change)
• Documentation update
• Refactor (no functional changes)
• Chore (maintenance, dependencies, CI)

Related Issues

n/a

Test Plan

n/a

Checklist

• My code follows the project's style guidelines
• I have performed a self-review of my code
• I have commented my code where necessary
• I have updated the documentation accordingly
• My changes generate no new warnings
• New and existing tests pass locally
• Any dependent changes have been merged and published

[github-actions]

Please cherry-pick the changes locally and resolve any conflicts.

git fetch origin backport-1979-to-5.x
git worktree add --checkout .worktree/backport-1979-to-5.x backport-1979-to-5.x
cd .worktree/backport-1979-to-5.x
git reset --hard HEAD^
git cherry-pick -x 5957b9d1d920a6b7aa6e2d8bb849245e5936d889
git push --force-with-lease