PSR-2 fixes with php-cs-fixer