update wrt PHPCS changes in report-memory-improvements branch