Issue #3313140: Circular reference of dependencies

src/Config/MailPluginOverrideBase.php

@@ -4,7 +4,6 @@ namespace Drupal\mailgroup\Config;
 
 use Drupal\Core\Cache\CacheableMetadata;
 use Drupal\Core\Config\StorageInterface;
-use Drupal\Core\Entity\EntityTypeManagerInterface;
 use Drupal\mailgroup\MailgroupMailDerivativeTrait;
 
 /**
@@ -14,23 +13,6 @@ abstract class MailPluginOverrideBase implements MailPluginOverrideInterface {
 
   use MailgroupMailDerivativeTrait;
 
-  /**
-   * The Mail Group storage.
-   *
-   * @var \Drupal\mailgroup\Entity\Storage\MailGroupStorageInterface
-   */
-  protected $mailGroupStorage;
-
-  /**
-   * Constructor.
-   *
-   * @param \Drupal\Core\Entity\EntityTypeManagerInterface $entity_type_manager
-   *   The entity type manager.
-   */
-  public function __construct(EntityTypeManagerInterface $entity_type_manager) {
-    $this->mailGroupStorage = $entity_type_manager->getStorage('mailgroup');
-  }
-
   /**
    * {@inheritdoc}
    */
@@ -63,10 +45,11 @@ abstract class MailPluginOverrideBase implements MailPluginOverrideInterface {
     $name = 'system.mail';
     if (in_array($name, $names)) {
 
+      $storage = \Drupal::entityTypeManager()->getStorage('mailgroup');
       $connection_plugin_ids = $this->getConnectionPluginIds();
       foreach ($connection_plugin_ids as $connection_plugin_id) {
 
-        $mailgroup_ids = $this->mailGroupStorage->getIdsByConnectionPlugin($connection_plugin_id);
+        $mailgroup_ids = $storage->getIdsByConnectionPlugin($connection_plugin_id);
         foreach ($mailgroup_ids as $mailgroup_id) {
 
           $id = $this->buildMailPluginDerivativeId($connection_plugin_id, $mailgroup_id);