[TASK] psr2 compatibility