[ticket/12675] Fix code sniffer complaints introduced by recent commits

PHPBB3-12675
Merge pull request #2561 from marc1706/ticket/12675

[ticket/12675] Fix code sniffer complaints introduced by recent commits

* marc1706/ticket/12675:
  [ticket/12675] Fix code sniffer complaints introduced by recent commits