PHPCS fixes for Zend\Uri
Merge branch 'cs/#6683-zend-uri-cs-fixes' into develop

Close #6683