return null doesn’t work as expected, use normal approach.

Signed-off-by: crynobone <crynobone@gmail.com>
Merge branch 'fix-function'
Merge branch 'master' into php5