To deal with some php warnings, we should add explicit return types to a couple of functions.
Needs review
2.0
Code