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

Refactor getStyles method from static to instance method

Browse Source 
[MAILPOET-2665]
This commit is contained in:
Rostislav Wolny
2020-01-29 15:45:32 +01:00
committed by Jack Kitterhing
parent 087a610be5
commit 37423908d7
3 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/API/JSON/v1/Forms.php
View File

@ -141,7 +141,7 @@ class Forms extends APIEndpoint {
$html = WPFunctions::get()->doShortcode($html); $html = WPFunctions::get()->doShortcode($html);
// styles // styles
$css = $this->formStylesUtils->render(FormRenderer::getStyles($data)); $css = $this->formStylesUtils->render($this->formRenderer->getStyles($data));
return $this->successResponse([ return $this->successResponse([
'html' => $html, 'html' => $html,

11
lib/AdminPages/Pages/FormEditor.php
View File

@ -22,14 +22,19 @@ class FormEditor {
/** @var CustomFieldsResponseBuilder */ /** @var CustomFieldsResponseBuilder */
private $customFieldsResponseBuilder; private $customFieldsResponseBuilder;
/** @var FormRenderer */
private $formRenderer;
public function __construct( public function __construct(
PageRenderer $pageRenderer, PageRenderer $pageRenderer,
CustomFieldsRepository $customFieldsRepository, CustomFieldsRepository $customFieldsRepository,
CustomFieldsResponseBuilder $customFieldsResponseBuilder CustomFieldsResponseBuilder $customFieldsResponseBuilder,
FormRenderer $formRenderer
) { ) {
$this->pageRenderer = $pageRenderer; $this->pageRenderer = $pageRenderer;
$this->customFieldsRepository = $customFieldsRepository; $this->customFieldsRepository = $customFieldsRepository;
$this->customFieldsResponseBuilder = $customFieldsResponseBuilder; $this->customFieldsResponseBuilder = $customFieldsResponseBuilder;
$this->formRenderer = $formRenderer;
} }
public function render() { public function render() {
@ -38,7 +43,7 @@ class FormEditor {
if ($form instanceof Form) { if ($form instanceof Form) {
$form = $form->asArray(); $form = $form->asArray();
} }
$form['styles'] = FormRenderer::getStyles($form); $form['styles'] = $this->formRenderer->getStyles($form);
$customFields = $this->customFieldsRepository->findAll(); $customFields = $this->customFieldsRepository->findAll();
$dateTypes = Block\Date::getDateTypes(); $dateTypes = Block\Date::getDateTypes();
$data = [ $data = [
@ -50,7 +55,7 @@ class FormEditor {
], ],
'pages' => Pages::getAll(), 'pages' => Pages::getAll(),
'segments' => Segment::getSegmentsWithSubscriberCount(), 'segments' => Segment::getSegmentsWithSubscriberCount(),
'styles' => FormRenderer::getStyles($form), 'styles' => $this->formRenderer->getStyles($form),
'date_types' => array_map(function ($label, $value) { 'date_types' => array_map(function ($label, $value) {
return [ return [
'label' => $label, 'label' => $label,

4
lib/Form/Renderer.php
View File

@ -12,7 +12,7 @@ class Renderer {
$html = '<style type="text/css">'; $html = '<style type="text/css">';
$html .= '.mailpoet_hp_email_label{display:none;}'; // move honeypot field out of sight $html .= '.mailpoet_hp_email_label{display:none;}'; // move honeypot field out of sight
$html .= $styles->render(static::getStyles($form), $prefix); $html .= $styles->render($this->getStyles($form), $prefix);
$html .= '</style>'; $html .= '</style>';
return $html; return $html;
@ -25,7 +25,7 @@ class Renderer {
return ''; return '';
} }
public static function getStyles($form = []) { public function getStyles($form = []) {
if (isset($form['styles']) if (isset($form['styles'])
&& strlen(trim($form['styles'])) > 0) { && strlen(trim($form['styles'])) > 0) {
return strip_tags($form['styles']); return strip_tags($form['styles']);