Merge branch 'cs/#6972-zend-json-psr2-compliance'

Close #6972
PHPCS fixes for Zend\InputFilter
Merge branch 'cs/#6973-zend-inputfilter-psr2-compliance' into develop

Close #6973
Forward port #6973