PHPCS fixes for Zend\Navigation
Merge branch 'cs/#6536-zend-navigation-psr2-compliance'

Close #6536