fixed conflicted phpdoc return values (see #6511
Merge branch 'hotfix/#6512-fix-#6511-sharedeventmanager-return-values-phpdoc'

Close #6512
Close #6511