Fix PHPCS - PHPSTAN issues

MR!9 is ready for a review.

Tested it and looks ok, I'll merge this to the main branch.

Thanks for this @ankitv18 , merged to the main branch.

Anything pending here? or can we mark this as Fixed?

Now that this issue is closed, please review the contribution record.

As a contributor, attribute any organization helped you, or if you volunteered your own time.

Maintainers, please credit people who helped resolve this issue.