Changed the way php-cs-fix runs
Merge branch 'master' into version-1.0.x