Done. Would be great to have some automated coding standard check for such cases. Maybe https://scrutinizer-ci.com/docs/tools/php/code-sniffer/ would fit our needs.