PSR-2 fixes and php_cs