Fix issues reported by PHPCS

Hello GGH

I have reviewed the MR and it seems fine to me
moving the issue to RTBC and lets wait for some more feedback

There are currently no PHPCS failures in this module, see the scheduled pipelines.