Merge branch 'hotfix/4787'

Close #4787
set factory in CollectionInputFilter
add newline at end of file
removed phpdoc package
[#4788] CS fixes

- trailing whitespace
Merge branch 'hotfix/4788' into develop

Forward port #4788