Merge branch 'cs/#6979-zend-text-psr2-compliance'

Close #6979
fix PHPCS errors for Zend\Uri
Merge branch 'cs/#6980-zend-uri-psr2-compliance' into develop

Close #6980
Forward port #6980