code refactoring - decouple repec service from factory

src/Series/Base.php

@@ -43,6 +43,13 @@ abstract class Base {
    */
   protected $messenger;
 
+  /**
+   * Bundle specific setting in repec settings.
+   *
+   * @var \Drupal\Core\Config\ImmutableConfig
+   */
+  protected $bundleSettings;
+
   /**
    * Base constructor.
    *
@@ -54,12 +61,15 @@ abstract class Base {
    *   Messenger.
    * @param \Drupal\Core\Entity\ContentEntityInterface $entity
    *   The entity.
+   * @param array|null $bundle_settings
+   *   Bundle specific setting in repec settings.
    */
-  public function __construct(ImmutableConfig $settings, EntityTypeManagerInterface $entity_type_manager, MessengerInterface $messenger, ContentEntityInterface $entity) {
+  public function __construct(ImmutableConfig $settings, EntityTypeManagerInterface $entity_type_manager, MessengerInterface $messenger, ContentEntityInterface $entity, array $bundle_settings) {
     $this->settings = $settings;
     $this->entityTypeManager = $entity_type_manager;
     $this->messenger = $messenger;
     $this->entity = $entity;
+    $this->bundleSettings = $bundle_settings;
   }
 
   /**
@@ -79,14 +89,8 @@ abstract public function getDefault() : array;
    * @throws \Drupal\repec\Series\CreateException
    */
   public function create(array $template) {
-    /** @var array $bundle_settings */
-    // The following is already done in
-    // \Drupal\repec\Repec::getEntityBundleSettings
-    // TODO: Move this to a parent service or something.
-    $bundle_settings = unserialize($this->settings->get("repec_bundle.{$this->entity->getEntityTypeId()}.{$this->entity->bundle()}"));
-
     /** @var string $serie_directory_config */
-    $serie_directory_config = $bundle_settings['serie_directory'];
+    $serie_directory_config = $this->bundleSettings['serie_directory'];
 
     $archive_directory = "public://{$this->settings->get('base_path')}/{$this->settings->get('archive_code')}/";
 

src/TemplateFactory.php

@@ -63,7 +63,11 @@ public function __construct(EntityTypeManagerInterface $entity_type_manager, Con
    */
   public function create($series_type, ContentEntityInterface $entity) : Base {
     $template_class = "Drupal\\repec\\Series\\$series_type\\Template";
-    return new $template_class($this->configFactory->get('repec.settings'), $this->entityTypeManager, $this->messenger, $entity);
+    /** @var \Drupal\Core\Config\ImmutableConfig $repec_settings */
+    $repec_settings = $this->configFactory->get('repec.settings');
+    /** @var array|null $bundle_settings */
+    $bundle_settings = unserialize($repec_settings->get("repec_bundle.{$entity->getEntityTypeId()}.{$entity->bundle()}"));
+    return new $template_class($repec_settings, $this->entityTypeManager, $this->messenger, $entity, $bundle_settings);
   }
 
 }