Use @return null instead of @return void

PHPBB3-12514
Move requires to the top of the files

PHPBB3-12514