Bug 1575955: fixing function signatures for PHP7

They need to  be consistent in PHP7 and include the parameter types.

behatnotneeded - existing tests are ok

Change-Id: I5d94ee53962a92db6faf3718e5a54f48ea31e367
Signed-off-by: Robert Lyon <robertl@catalyst.net.nz>