Merge branch 'cs/#7047-zend-cache-psr2-compliance'

Close #7047
cs fixes for Zend\Code
Merge branch 'cs/#7048-zend-code-psr2-compliance' into develop

Close #7048
Forward port #7048