Merge branch 'cs/#6660-prefer-single-quotes'

Close #6660
PHPCS fixes for Zend\Text
Merge branch 'cs/#6684-zend-text-cs-fixes' into develop

Close #6684
Forward port #6684