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

Close #6980