Cavemanon/piratepoet
7
Fork 0
Code Pull Requests Actions Releases 16 Activity

Remove unnecessary service in email renderer

Browse Source 
[MAILPOET-5540]
This commit is contained in:
Rostislav Wolny
2023-09-07 20:37:29 +02:00
committed by Jan Lysý
parent 824a185197
commit 7233a9cb2b
3 changed files with 5 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
mailpoet/lib/DI/ContainerConfigurator.php
View File

@@ -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);

19
mailpoet/lib/EmailEditor/Engine/Renderer/BodyRenderer.php
View File

@@ -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);
}
}

10
mailpoet/lib/EmailEditor/Engine/Renderer/Renderer.php
View File

@@ -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);