Issue #3117966: \Drupal calls should be avoided in classes, use dependency injection instead