fix: #3616592 Fix issues raised by phpcs

Liam Morlandrequested to merge
issue/salesforce-3616592:3616592-fix-issues-raised into 6.0.x

Closes #3616592

Merge request reports