[GOZ-18] Meet psr-2 requirements