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

Use explicit code instead of PHP magic

Browse Source 
[MAILPOET-1798]
This commit is contained in:
Pavel Dohnal
2020-02-06 13:38:53 +01:00
committed by Jack Kitterhing
parent 8da7330a8d
commit 831a865c9e
2 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
lib/Config/PostEditorBlock.php
View File

@ -2,6 +2,7 @@
namespace MailPoet\Config; namespace MailPoet\Config;
use MailPoet\Entities\FormEntity;
use MailPoet\Form\FormsRepository; use MailPoet\Form\FormsRepository;
use MailPoet\Form\Widget; use MailPoet\Form\Widget;
use MailPoet\WP\Functions as WPFunctions; use MailPoet\WP\Functions as WPFunctions;
@ -72,7 +73,9 @@ class PostEditorBlock {
$forms = $this->formsRepository->findAllNotDeleted(); $forms = $this->formsRepository->findAllNotDeleted();
?> ?>
<script type="text/javascript"> <script type="text/javascript">
window.mailpoet_forms = <?php echo json_encode($forms) ?>; window.mailpoet_forms = <?php echo json_encode(array_map(function(FormEntity $form) {
return $form->toArray();
}, $forms)) ?>;
window.locale = { window.locale = {
selectForm: '<?php echo __('Select a MailPoet form', 'mailpoet') ?>', selectForm: '<?php echo __('Select a MailPoet form', 'mailpoet') ?>',
createForm: '<?php echo __('Create a new form', 'mailpoet') ?>', createForm: '<?php echo __('Create a new form', 'mailpoet') ?>',

4
lib/Entities/FormEntity.php
View File

@ -12,7 +12,7 @@ use MailPoetVendor\Doctrine\ORM\Mapping as ORM;
* @ORM\Entity() * @ORM\Entity()
* @ORM\Table(name="forms") * @ORM\Table(name="forms")
*/ */
class FormEntity implements \JsonSerializable { class FormEntity {
use AutoincrementedIdTrait; use AutoincrementedIdTrait;
use CreatedAtTrait; use CreatedAtTrait;
use UpdatedAtTrait; use UpdatedAtTrait;
@ -102,7 +102,7 @@ class FormEntity implements \JsonSerializable {
$this->styles = $styles; $this->styles = $styles;
} }
public function jsonSerialize() { public function toArray() {
return [ return [
'id' => $this->getId(), 'id' => $this->getId(),
'name' => $this->getName(), 'name' => $this->getName(),