code style fixes for passing php-cs-fixer rules