Fixed phpdoc that was lost on DI\* functions because of 0e267e2022
Merge branch 'master' into 5.0