Revert "Issue #3257760 by gaurav.kapoor, andregp, rsvelko: Resolve warning...
Revert "Issue #3257760 by gaurav.kapoor, andregp, rsvelko: Resolve warning messages shown by the PHPCS" - wrong commit message, reverting and will re-commit with OK msg
This reverts commit d7ee4ef6.