Fix PHPCS issues reported by gitlab CI

Problem/Motivation

When running the gitlab CI pipeline we see multiple PHPCS issues reported and hence for Drupal to fulfil all coding standards we should fix these issues.

Gitlab CI pipeline - https://git.drupalcode.org/issue/subrequests-3434821/-/jobs/2214497