Merge branch 'cs/#6522-zend-code-psr2-compliance'

Close #6522
PHPCS fixes for Zend\Cache
Merge branch 'cs/#6521-zend-cache-psr2-compliance' into develop

Forward port #6521