Fix for odd php-cs-fixer finds
Merge branch 'hotfix/#6462-fix-phpcs-reported-errors'

Close #6462