[ticket/11981] Fix code sniffer complaints

PHPBB3-11981
Merge remote-tracking branch 'marc1706/ticket/11981' into develop

* marc1706/ticket/11981:
  [ticket/11981] Fix code sniffer complaints