Remove generic concatenation spacing sniff
fix warning condition
Update CodeStyle folder in composer.json for autoload.
Merge branch 'master' into CodeStyle