Issue #3302331 by anoopsingh92, svenryen: \Drupal calls should be avoided in classes, use dependency injection instead
