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

Refactor renderHTML method from static to instance method

Browse Source 
[MAILPOET-2665]
This commit is contained in:
Rostislav Wolny
2020-01-29 15:41:05 +01:00
committed by Jack Kitterhing
parent b8dd243ec1
commit 087a610be5
3 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -28,6 +28,9 @@ class Forms extends APIEndpoint {
/** @var UserFlagsController */ /** @var UserFlagsController */
private $userFlags; private $userFlags;
/** @var FormRenderer */
private $formRenderer;
public $permissions = [ public $permissions = [
'global' => AccessControl::PERMISSION_MANAGE_FORMS, 'global' => AccessControl::PERMISSION_MANAGE_FORMS,
]; ];
@ -36,12 +39,14 @@ class Forms extends APIEndpoint {
Listing\BulkActionController $bulkAction, Listing\BulkActionController $bulkAction,
Listing\Handler $listingHandler, Listing\Handler $listingHandler,
Util\Styles $formStylesUtils, Util\Styles $formStylesUtils,
UserFlagsController $userFlags UserFlagsController $userFlags,
FormRenderer $formRenderer
) { ) {
$this->bulkAction = $bulkAction; $this->bulkAction = $bulkAction;
$this->listingHandler = $listingHandler; $this->listingHandler = $listingHandler;
$this->formStylesUtils = $formStylesUtils; $this->formStylesUtils = $formStylesUtils;
$this->userFlags = $userFlags; $this->userFlags = $userFlags;
$this->formRenderer = $formRenderer;
} }
public function get($data = []) { public function get($data = []) {
@ -130,7 +135,7 @@ class Forms extends APIEndpoint {
public function previewEditor($data = []) { public function previewEditor($data = []) {
// html // html
$html = FormRenderer::renderHTML($data); $html = $this->formRenderer->renderHTML($data);
// convert shortcodes // convert shortcodes
$html = WPFunctions::get()->doShortcode($html); $html = WPFunctions::get()->doShortcode($html);

2
lib/Form/Renderer.php
View File

@ -18,7 +18,7 @@ class Renderer {
return $html; return $html;
} }
public static function renderHTML($form = []) { public function renderHTML($form = []) {
if (isset($form['body']) && !empty($form['body'])) { if (isset($form['body']) && !empty($form['body'])) {
return static::renderBlocks($form['body']); return static::renderBlocks($form['body']);
} }

2
lib/Form/Widget.php
View File

@ -219,7 +219,7 @@ class Widget extends \WP_Widget {
'form' => $form, 'form' => $form,
'title' => $title, 'title' => $title,
'styles' => $this->formRenderer->renderStyles($form, '#' . $formId), 'styles' => $this->formRenderer->renderStyles($form, '#' . $formId),
'html' => FormRenderer::renderHTML($form), 'html' => $this->formRenderer->renderHTML($form),
'before_widget' => $beforeWidget, 'before_widget' => $beforeWidget,
'after_widget' => $afterWidget, 'after_widget' => $afterWidget,
'before_title' => $beforeTitle, 'before_title' => $beforeTitle,