DW-439: Changed stuff after code review

Author: martinyde

os2forms_digital_post.services.yml

@@ -9,3 +9,4 @@ services:
 
   os2forms_digital_post.webform_helper:
     class: Drupal\os2forms_digital_post\Helper\WebformHelper
+    arguments: ["@entity_type.manager", "@renderer"]

src/Commands/CreatePdf.php

@@ -37,22 +37,14 @@ class CreatePdf extends DrushCommands {
    */
   protected $entityTypeManager;
 
-  /**
-   * The drupal renderer.
-   *
-   * @var Drupal\Core\Render\Renderer
-   */
-  protected $renderer;
-
   /**
    * Constructor.
    */
-  public function __construct(WebformHelper $webformHelper, TemplateManager $templateManager, EntityTypeManagerInterface $entity_type_manager, Renderer $renderer) {
+  public function __construct(WebformHelper $webformHelper, TemplateManager $templateManager, EntityTypeManagerInterface $entity_type_manager) {
     parent::__construct();
     $this->webformHelper = $webformHelper;
     $this->templateManager = $templateManager;
     $this->entityTypeManager = $entity_type_manager;
-    $this->renderer = $renderer;
   }
 
   /**
@@ -102,7 +94,7 @@ public function create($template, array $options = [
       ],
     ])));
 
-    $context = $this->webformHelper->getTemplateContext($webform_submission, $cprServiceResult, $this->entityTypeManager, $this->renderer, []);
+    $context = $this->webformHelper->getTemplateContext($webform_submission, $cprServiceResult, []);
 
     $pdf = $this->templateManager->renderPdf($template, $context);
     $filePath = dirname(DRUPAL_ROOT) . $options['file_location'] . '/' . $options['file_name'];

src/Helper/WebformHelper.php

@@ -12,14 +12,37 @@
  */
 final class WebformHelper {
 
+  /**
+   * The entity type manager.
+   *
+   * @var \Drupal\Core\Entity\EntityTypeManagerInterface
+   */
+  protected $entityTypeManager;
+
+  /**
+   * The drupal renderer.
+   *
+   * @var Drupal\Core\Render\Renderer
+   */
+  protected $renderer;
+
+  /**
+   * Constructor.
+   */
+  public function __construct(EntityTypeManagerInterface $entity_type_manager, Renderer $renderer) {
+    $this->entityTypeManager = $entity_type_manager;
+    $this->renderer = $renderer;
+  }
+
   /**
    * Get template context.
    */
-  public function getTemplateContext(WebformSubmissionInterface $webformSubmission, CprServiceResult $cprServiceResult, EntityTypeManagerInterface $entity_type_manager, Renderer $renderer, array $configuration = []) {
+  public function getTemplateContext(WebformSubmissionInterface $webformSubmission, CprServiceResult $cprServiceResult, array $configuration = []) {
     $webform = $webformSubmission->getWebform();
-    $view_builder = $entity_type_manager->getViewBuilder('webform_submission');
+
+    $view_builder = $this->entityTypeManager->getViewBuilder('webform_submission');
     $pre_render = $view_builder->view($webformSubmission, 'HTML');
-    $webformSubmissionRendered = $renderer->renderPlain($pre_render);
+    $webformSubmissionRendered = $this->renderer->renderPlain($pre_render);
 
     // We cannot use “side” (from address lookup via cpr) as “suiteIdentifier”
     // when sending digital port. Therefore we append it to “floor” instead.

src/Plugin/WebformHandler/DigitalPostWebformHandler.php

@@ -317,7 +317,7 @@ public function postSave(WebformSubmissionInterface $webform_submission, $update
     /** @var \Drupal\os2forms_cpr_lookup\CPR\CprServiceResult $cprSearchResult */
     $cprSearchResult = $this->cprService->search($submissionData[$this->configuration['cpr_element']]);
 
-    $context = $this->webformHelper->getTemplateContext($webform_submission, $cprSearchResult, $this->entityTypeManager, $this->renderer, $this->configuration);
+    $context = $this->webformHelper->getTemplateContext($webform_submission, $cprSearchResult, $this->configuration);
 
     if (TRUE === $this->configuration['debug']) {
       $this->templateManager->renderPdf($this->configuration['template'], $context, TRUE);