Merge branch 'cs/#6684-zend-text-cs-fixes'

Close #6684
PHPCS fixes for Zend\Tag
Merge branch 'cs/#6685-zend-tag-cs-fixes' into develop

Close #6685
Forward port #6685