PHPCS fixes for Zend\Escaper
Merge branch 'cs/#6538-zend-escaper-cs-fixes' into develop

Close #6538