This would be covered as part of phpcs fixes in https://www.drupal.org/projec...