phpcs fixes for PSR1,PSR2