Fixed PSR-2 support