Use phpcs instead of php-cs-fixer
CS fixes

- Based on phpcs report
Merge branch 'hotfix/phpcs'

Use phpcs instead of php-cs-fixer