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