[ticket/11444] Reorder methods

PHPBB3-11444
[ticket/11444] Reapply the fix for PHPBB3-12435 and fix tests

PHPBB3-11444