Merge branch 'cs/#6978-zend-test-psr2-compliance'

Close #6978
fix PHPCS errors for Zend\Text
Merge branch 'cs/#6979-zend-text-psr2-compliance' into develop

Close #6979
Forward port #6979