updated codebase to validate PSR2 codiing style