Merge branch 'hotfix/#7008-revert-#6989-self-reference-in-non-static-context'

Close #7008
PHPCS fixes for Zend\Paginator
Merge branch 'cs/#6993-zend-paginator-psr2-compliance' into develop

Close #6993
Forward port #6993