From 7233a9cb2bc9b6a8aad45e44d5b2a389c025dc87 Mon Sep 17 00:00:00 2001
From: Rostislav Wolny <rosta.wolny@automattic.com>
Date: Thu, 7 Sep 2023 20:37:29 +0200
Subject: [PATCH] Remove unnecessary service in email renderer

[MAILPOET-5540]
---
 mailpoet/lib/DI/ContainerConfigurator.php     |  1 -
 .../Engine/Renderer/BodyRenderer.php          | 19 -------------------
 .../EmailEditor/Engine/Renderer/Renderer.php  | 10 +++++-----
 3 files changed, 5 insertions(+), 25 deletions(-)
 delete mode 100644 mailpoet/lib/EmailEditor/Engine/Renderer/BodyRenderer.php

diff --git a/mailpoet/lib/DI/ContainerConfigurator.php b/mailpoet/lib/DI/ContainerConfigurator.php
index 3f35217c41..e82cb6c87b 100644
--- a/mailpoet/lib/DI/ContainerConfigurator.php
+++ b/mailpoet/lib/DI/ContainerConfigurator.php
@@ -316,7 +316,6 @@ class ContainerConfigurator implements IContainerConfigurator {
     $container->autowire(\MailPoet\EmailEditor\Engine\EmailEditor::class)->setPublic(true);
     $container->autowire(\MailPoet\EmailEditor\Engine\AssetsCleaner::class)->setPublic(true);
     $container->autowire(\MailPoet\EmailEditor\Engine\Renderer\Renderer::class)->setPublic(true);
-    $container->autowire(\MailPoet\EmailEditor\Engine\Renderer\BodyRenderer::class)->setPublic(true);
     $container->autowire(\MailPoet\EmailEditor\Engine\Renderer\BlocksRenderer::class)->setPublic(true);
     $container->autowire(\MailPoet\EmailEditor\Engine\Renderer\BlocksRegistry::class)->setPublic(true);
     $container->autowire(\MailPoet\EmailEditor\Engine\Renderer\Preprocessor::class)->setPublic(true);
diff --git a/mailpoet/lib/EmailEditor/Engine/Renderer/BodyRenderer.php b/mailpoet/lib/EmailEditor/Engine/Renderer/BodyRenderer.php
deleted file mode 100644
index 35303aeff7..0000000000
--- a/mailpoet/lib/EmailEditor/Engine/Renderer/BodyRenderer.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php declare(strict_types = 1);
-
-namespace MailPoet\EmailEditor\Engine\Renderer;
-
-class BodyRenderer {
-
-  /** @var BlocksRenderer */
-  private $blocksRenderer;
-
-  public function __construct(
-    BlocksRenderer $blocksRenderer
-  ) {
-    $this->blocksRenderer = $blocksRenderer;
-  }
-
-  public function renderBody(array $parsedBlocks): string {
-    return $this->blocksRenderer->render($parsedBlocks);
-  }
-}
diff --git a/mailpoet/lib/EmailEditor/Engine/Renderer/Renderer.php b/mailpoet/lib/EmailEditor/Engine/Renderer/Renderer.php
index bd940337af..40594c6c85 100644
--- a/mailpoet/lib/EmailEditor/Engine/Renderer/Renderer.php
+++ b/mailpoet/lib/EmailEditor/Engine/Renderer/Renderer.php
@@ -10,8 +10,8 @@ class Renderer {
   /** @var \MailPoetVendor\CSS */
   private $cssInliner;
 
-  /** @var BodyRenderer */
-  private $bodyRenderer;
+  /** @var BlocksRenderer */
+  private $blocksRenderer;
 
   /** @var Preprocessor */
   private $preprocessor;
@@ -25,11 +25,11 @@ class Renderer {
   public function __construct(
     \MailPoetVendor\CSS $cssInliner,
     Preprocessor $preprocessor,
-    BodyRenderer $bodyRenderer
+    BlocksRenderer $blocksRenderer
   ) {
     $this->cssInliner = $cssInliner;
     $this->preprocessor = $preprocessor;
-    $this->bodyRenderer = $bodyRenderer;
+    $this->blocksRenderer = $blocksRenderer;
   }
 
   public function render(\WP_Post $post, string $subject, string $preHeader, string $language, $metaRobots = ''): array {
@@ -37,7 +37,7 @@ class Renderer {
     $parsedBlocks = $parser->parse($post->post_content); // phpcs:ignore Squiz.NamingConventions.ValidVariableName.MemberNotCamelCaps
 
     $parsedBlocks = $this->preprocessor->preprocess($parsedBlocks);
-    $renderedBody = $this->bodyRenderer->renderBody($parsedBlocks);
+    $renderedBody = $this->blocksRenderer->render($parsedBlocks);
 
     $styles = (string)file_get_contents(dirname(__FILE__) . '/' . self::STYLES_FILE);
     $styles = apply_filters('mailpoet_email_renderer_styles', $styles, $post);