PHPCS fixes for Zend\Mail
Merge branch 'cs/#6987-zend-mail-psr2-compliance'

Close #6987