\Drupal calls should be avoided in classes, use dependency injection instead

Most of the changes in this patch were previously merged as part of 📌 Fix phpcs coding standard Fixed but the dependency injection here resolved some critical errors introduced there. Thanks very much for your work here.

Automatically closed - issue fixed for 2 weeks with no activity.