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

Close #7008
PHPCS fixes for Zend\Test