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

Close #6685