From dc8237b4401f844e4b6f234af63d4ee555727c30 Mon Sep 17 00:00:00 2001
From: potreb <potreb@gmail.com>
Date: Tue, 5 Oct 2021 18:48:39 +0200
Subject: [PATCH] fix: devel merge, reformat
---
composer.json | 2 +-
src/ContainerForm.php | 2 +-
src/Escaper.php | 1 +
src/Field.php | 1 +
src/Field/BasicField.php | 4 +++-
src/Field/ButtonField.php | 1 +
src/Field/CheckboxField.php | 1 +
src/Field/DatePickerField.php | 1 +
src/Field/Header.php | 2 ++
src/Field/HiddenField.php | 1 +
src/Field/InputEmailField.php | 1 +
src/Field/InputNumberField.php | 1 +
src/Field/InputTextField.php | 1 +
src/Field/MultipleInputTextField.php | 1 +
src/Field/NoValueField.php | 1 +
src/Field/Paragraph.php | 1 +
src/Field/ProductSelect.php | 1 +
src/Field/RadioField.php | 1 +
src/Field/SubmitField.php | 1 +
src/Field/TimepickerField.php | 1 +
src/Field/Traits/HtmlAttributes.php | 7 ++++--
src/Field/WooSelect.php | 1 +
src/Field/WyswigField.php | 1 +
src/FieldProvider.php | 1 +
src/FieldRenderer.php | 1 +
src/FieldsDataReceiver.php | 5 +++-
src/Form.php | 2 +-
src/Sanitizer.php | 1 +
src/Sanitizer/EmailSanitizer.php | 1 +
src/Sanitizer/NoSanitize.php | 1 +
src/Sanitizer/TextFieldSanitizer.php | 1 +
src/Serializer.php | 1 +
src/Serializer/JsonSerializer.php | 1 +
src/Serializer/ProductSelectSerializer.php | 1 +
src/Serializer/SerializeSerializer.php | 1 +
src/Validator.php | 1 +
src/Validator/NoValidateValidator.php | 1 +
src/Validator/RequiredValidator.php | 1 +
templates/button.php | 1 +
templates/form-field.php | 10 ++++----
templates/form-label.php | 2 +-
templates/input-checkbox.php | 18 +++++++-------
templates/input-date-picker.php | 18 +++++++-------
templates/input-hidden.php | 18 +++++++-------
templates/input-image.php | 28 ++++++++++++++--------
templates/input-number.php | 18 +++++++-------
templates/input-radio.php | 18 +++++++-------
templates/input-text.php | 18 +++++++-------
48 files changed, 120 insertions(+), 84 deletions(-)
diff --git a/composer.json b/composer.json
index 8150bcf..03b48b4 100644
--- a/composer.json
+++ b/composer.json
@@ -20,7 +20,7 @@
"ext-curl": "*",
"ext-json": "*",
"wpdesk/wp-persistence": "^2.0|^3.0",
- "wpdesk/wp-view": "^1.1"
+ "wpdesk/wp-view": "^2"
},
"require-dev": {
"phpunit/phpunit": "<7",
diff --git a/src/ContainerForm.php b/src/ContainerForm.php
index bd5fc82..e3b6dde 100644
--- a/src/ContainerForm.php
+++ b/src/ContainerForm.php
@@ -4,7 +4,6 @@ namespace WPDesk\Forms;
use Psr\Container\ContainerInterface;
use WPDesk\Persistence\PersistentContainer;
-use Psr\Container\ContainerInterface;
/**
* Persistent container support for forms.
@@ -12,6 +11,7 @@ use Psr\Container\ContainerInterface;
* @package WPDesk\Forms
*/
interface ContainerForm {
+
/**
* @param ContainerInterface $data
*
diff --git a/src/Escaper.php b/src/Escaper.php
index 8c460dd..462295c 100644
--- a/src/Escaper.php
+++ b/src/Escaper.php
@@ -3,6 +3,7 @@
namespace WPDesk\Forms;
interface Escaper {
+
/** @param mixed $value */
public function escape( $value ): string;
}
diff --git a/src/Field.php b/src/Field.php
index 08329e7..b932f27 100644
--- a/src/Field.php
+++ b/src/Field.php
@@ -11,6 +11,7 @@ namespace WPDesk\Forms;
* @package WPDesk\Forms
*/
interface Field {
+
public function get_name(): string;
/** @return mixed */
diff --git a/src/Field/BasicField.php b/src/Field/BasicField.php
index 4c1dc0c..c1d5270 100644
--- a/src/Field/BasicField.php
+++ b/src/Field/BasicField.php
@@ -2,6 +2,7 @@
namespace WPDesk\Forms\Field;
+use BadMethodCallException;
use WPDesk\Forms\Field;
use WPDesk\Forms\Sanitizer;
use WPDesk\Forms\Sanitizer\NoSanitize;
@@ -17,6 +18,7 @@ use WPDesk\Forms\Validator\RequiredValidator;
* @package WPDesk\Forms
*/
abstract class BasicField implements Field {
+
use Field\Traits\HtmlAttributes;
const DEFAULT_PRIORITY = 10;
@@ -57,7 +59,7 @@ abstract class BasicField implements Field {
}
public function get_serializer(): Serializer {
- throw new \BadMethodCallException('You must define your serializer in a child class.');
+ throw new BadMethodCallException('You must define your serializer in a child class.');
}
final public function get_name(): string {
diff --git a/src/Field/ButtonField.php b/src/Field/ButtonField.php
index 6d01a1f..1a43c3f 100644
--- a/src/Field/ButtonField.php
+++ b/src/Field/ButtonField.php
@@ -3,6 +3,7 @@
namespace WPDesk\Forms\Field;
class ButtonField extends NoValueField {
+
public function get_template_name(): string {
return 'button';
}
diff --git a/src/Field/CheckboxField.php b/src/Field/CheckboxField.php
index d55269e..1411029 100644
--- a/src/Field/CheckboxField.php
+++ b/src/Field/CheckboxField.php
@@ -5,6 +5,7 @@ namespace WPDesk\Forms\Field;
use WPDesk\Forms\Field;
class CheckboxField extends BasicField {
+
const VALUE_TRUE = 'yes';
const VALUE_FALSE = 'no';
diff --git a/src/Field/DatePickerField.php b/src/Field/DatePickerField.php
index 7a69247..2ec2160 100644
--- a/src/Field/DatePickerField.php
+++ b/src/Field/DatePickerField.php
@@ -6,6 +6,7 @@ use WPDesk\Forms\Sanitizer;
use WPDesk\Forms\Sanitizer\TextFieldSanitizer;
class DatePickerField extends BasicField {
+
public function __construct() {
$this->add_class( 'date-picker' );
$this->set_placeholder( 'YYYY-MM-DD' );
diff --git a/src/Field/Header.php b/src/Field/Header.php
index a704f40..b588b8f 100644
--- a/src/Field/Header.php
+++ b/src/Field/Header.php
@@ -5,7 +5,9 @@ namespace WPDesk\Forms\Field;
use WPDesk\Forms\Field;
class Header extends NoValueField {
+
public function __construct() {
+ parent::__construct();
$this->meta['header_size'] = '';
}
diff --git a/src/Field/HiddenField.php b/src/Field/HiddenField.php
index e48742c..ff06bdc 100644
--- a/src/Field/HiddenField.php
+++ b/src/Field/HiddenField.php
@@ -6,6 +6,7 @@ use WPDesk\Forms\Sanitizer;
use WPDesk\Forms\Sanitizer\TextFieldSanitizer;
class HiddenField extends BasicField {
+
public function get_type(): string {
return 'hidden';
}
diff --git a/src/Field/InputEmailField.php b/src/Field/InputEmailField.php
index a54ab4a..36325f3 100644
--- a/src/Field/InputEmailField.php
+++ b/src/Field/InputEmailField.php
@@ -6,6 +6,7 @@ use WPDesk\Forms\Sanitizer;
use WPDesk\Forms\Sanitizer\EmailSanitizer;
class InputEmailField extends BasicField {
+
public function get_type(): string {
return 'email';
}
diff --git a/src/Field/InputNumberField.php b/src/Field/InputNumberField.php
index 380da44..84aac99 100644
--- a/src/Field/InputNumberField.php
+++ b/src/Field/InputNumberField.php
@@ -6,6 +6,7 @@ use WPDesk\Forms\Sanitizer;
use WPDesk\Forms\Sanitizer\TextFieldSanitizer;
class InputNumberField extends BasicField {
+
public function get_type(): string {
return 'number';
}
diff --git a/src/Field/InputTextField.php b/src/Field/InputTextField.php
index 24b0fa6..92f473d 100644
--- a/src/Field/InputTextField.php
+++ b/src/Field/InputTextField.php
@@ -6,6 +6,7 @@ use WPDesk\Forms\Sanitizer;
use WPDesk\Forms\Sanitizer\TextFieldSanitizer;
class InputTextField extends BasicField {
+
public function get_sanitizer(): Sanitizer {
return new TextFieldSanitizer();
}
diff --git a/src/Field/MultipleInputTextField.php b/src/Field/MultipleInputTextField.php
index 6648e2a..cf976fe 100644
--- a/src/Field/MultipleInputTextField.php
+++ b/src/Field/MultipleInputTextField.php
@@ -3,6 +3,7 @@
namespace WPDesk\Forms\Field;
class MultipleInputTextField extends InputTextField {
+
public function get_template_name(): string {
return 'input-text-multiple';
}
diff --git a/src/Field/NoValueField.php b/src/Field/NoValueField.php
index 5309170..a84a1a7 100644
--- a/src/Field/NoValueField.php
+++ b/src/Field/NoValueField.php
@@ -8,6 +8,7 @@ namespace WPDesk\Forms\Field;
* @package WPDesk\Forms
*/
abstract class NoValueField extends BasicField {
+
public function __construct() {
$this->set_name( '' );
}
diff --git a/src/Field/Paragraph.php b/src/Field/Paragraph.php
index 6e74de3..253eea0 100644
--- a/src/Field/Paragraph.php
+++ b/src/Field/Paragraph.php
@@ -3,6 +3,7 @@
namespace WPDesk\Forms\Field;
class Paragraph extends NoValueField {
+
public function get_template_name(): string {
return 'paragraph';
}
diff --git a/src/Field/ProductSelect.php b/src/Field/ProductSelect.php
index 8d8b5e6..ff14f8e 100644
--- a/src/Field/ProductSelect.php
+++ b/src/Field/ProductSelect.php
@@ -6,6 +6,7 @@ use WPDesk\Forms\Serializer\ProductSelectSerializer;
use WPDesk\Forms\Serializer;
class ProductSelect extends SelectField {
+
public function __construct() {
$this->set_multiple();
}
diff --git a/src/Field/RadioField.php b/src/Field/RadioField.php
index 3e20d1b..cd8fd51 100644
--- a/src/Field/RadioField.php
+++ b/src/Field/RadioField.php
@@ -3,6 +3,7 @@
namespace WPDesk\Forms\Field;
class RadioField extends BasicField {
+
public function get_template_name(): string {
return 'input-radio';
}
diff --git a/src/Field/SubmitField.php b/src/Field/SubmitField.php
index bcb00f7..0decb84 100644
--- a/src/Field/SubmitField.php
+++ b/src/Field/SubmitField.php
@@ -3,6 +3,7 @@
namespace WPDesk\Forms\Field;
class SubmitField extends NoValueField {
+
public function get_template_name(): string {
return 'input-submit';
}
diff --git a/src/Field/TimepickerField.php b/src/Field/TimepickerField.php
index c7c1a5d..0d5f0e3 100644
--- a/src/Field/TimepickerField.php
+++ b/src/Field/TimepickerField.php
@@ -6,6 +6,7 @@ use WPDesk\Forms\Serializer;
use WPDesk\Forms\Serializer\JsonSerializer;
class TimepickerField extends BasicField {
+
public function has_serializer(): bool {
return true;
}
diff --git a/src/Field/Traits/HtmlAttributes.php b/src/Field/Traits/HtmlAttributes.php
index 71eccba..4edae3b 100644
--- a/src/Field/Traits/HtmlAttributes.php
+++ b/src/Field/Traits/HtmlAttributes.php
@@ -2,6 +2,9 @@
namespace WPDesk\Forms\Field\Traits;
+use WPDesk\Forms\Field;
+use WPDesk\Forms\Form;
+
/**
* Implementation of HTML attributes like id, name, action etc.
*
@@ -44,7 +47,7 @@ trait HtmlAttributes {
* @param string $name
* @param string[]|string|bool $value
*
- * @return \WPDesk\Forms\Field|\WPDesk\Forms\Form
+ * @return Field|Form
*/
final public function set_attribute( string $name, $value ) {
$this->attributes[ $name ] = $value;
@@ -53,7 +56,7 @@ trait HtmlAttributes {
}
/**
- * @return \WPDesk\Forms\Field|\WPDesk\Forms\Form
+ * @return HtmlAttributes
*/
final public function unset_attribute( string $name ) {
unset( $this->attributes[ $name ] );
diff --git a/src/Field/WooSelect.php b/src/Field/WooSelect.php
index ec2719c..be348f9 100644
--- a/src/Field/WooSelect.php
+++ b/src/Field/WooSelect.php
@@ -3,6 +3,7 @@
namespace WPDesk\Forms\Field;
class WooSelect extends SelectField {
+
public function __construct() {
$this->set_multiple();
$this->add_class( 'wc-enhanced-select' );
diff --git a/src/Field/WyswigField.php b/src/Field/WyswigField.php
index a2f4168..145908f 100644
--- a/src/Field/WyswigField.php
+++ b/src/Field/WyswigField.php
@@ -3,6 +3,7 @@
namespace WPDesk\Forms\Field;
class WyswigField extends BasicField {
+
public function get_template_name(): string {
return 'wyswig';
}
diff --git a/src/FieldProvider.php b/src/FieldProvider.php
index e693d00..d8d281e 100644
--- a/src/FieldProvider.php
+++ b/src/FieldProvider.php
@@ -6,6 +6,7 @@ namespace WPDesk\Forms;
* FieldProvider is owner of FormFields. These fields can be used to render forms and process values.
*/
interface FieldProvider {
+
/**
* Returns owned fields.
*
diff --git a/src/FieldRenderer.php b/src/FieldRenderer.php
index f60c1b0..3e2191e 100644
--- a/src/FieldRenderer.php
+++ b/src/FieldRenderer.php
@@ -3,6 +3,7 @@
namespace WPDesk\Forms;
interface FieldRenderer {
+
/** @return string|array String or normalized array */
public function render_fields( FieldProvider $provider, array $fields_data, string $name_prefix = '' );
}
diff --git a/src/FieldsDataReceiver.php b/src/FieldsDataReceiver.php
index e41743d..961f897 100644
--- a/src/FieldsDataReceiver.php
+++ b/src/FieldsDataReceiver.php
@@ -2,6 +2,8 @@
namespace WPDesk\Forms;
+use Psr\Container\ContainerInterface;
+
/**
* Some field owners can receive and process field data.
* Probably should be used with FieldProvider interface.
@@ -9,10 +11,11 @@ namespace WPDesk\Forms;
* @package WPDesk\Forms
*/
interface FieldsDataReceiver {
+
/**
* Set values corresponding to fields.
*
* @return void
*/
- public function update_fields_data( \Psr\Container\ContainerInterface $data );
+ public function update_fields_data( ContainerInterface $data );
}
diff --git a/src/Form.php b/src/Form.php
index 5f8725d..b5014ff 100644
--- a/src/Form.php
+++ b/src/Form.php
@@ -2,7 +2,6 @@
namespace WPDesk\Forms;
-use WPDesk\Persistence\PersistentContainer;
use WPDesk\View\Renderer\Renderer;
/**
@@ -11,6 +10,7 @@ use WPDesk\View\Renderer\Renderer;
* @package WPDesk\Forms
*/
interface Form {
+
/**
* For some reason you may want to disable a form. Returns false when disabled.
*/
diff --git a/src/Sanitizer.php b/src/Sanitizer.php
index 3f57eac..000d3aa 100644
--- a/src/Sanitizer.php
+++ b/src/Sanitizer.php
@@ -3,6 +3,7 @@
namespace WPDesk\Forms;
interface Sanitizer {
+
/**
* @param mixed $value
*
diff --git a/src/Sanitizer/EmailSanitizer.php b/src/Sanitizer/EmailSanitizer.php
index 1a51a78..160ef3c 100644
--- a/src/Sanitizer/EmailSanitizer.php
+++ b/src/Sanitizer/EmailSanitizer.php
@@ -5,6 +5,7 @@ namespace WPDesk\Forms\Sanitizer;
use WPDesk\Forms\Sanitizer;
class EmailSanitizer implements Sanitizer {
+
public function sanitize( $value ): string {
return sanitize_email( $value );
}
diff --git a/src/Sanitizer/NoSanitize.php b/src/Sanitizer/NoSanitize.php
index a3fe4a6..2647e66 100644
--- a/src/Sanitizer/NoSanitize.php
+++ b/src/Sanitizer/NoSanitize.php
@@ -5,6 +5,7 @@ namespace WPDesk\Forms\Sanitizer;
use WPDesk\Forms\Sanitizer;
class NoSanitize implements Sanitizer {
+
public function sanitize( $value ) {
return $value;
}
diff --git a/src/Sanitizer/TextFieldSanitizer.php b/src/Sanitizer/TextFieldSanitizer.php
index 325c652..c0df5c3 100644
--- a/src/Sanitizer/TextFieldSanitizer.php
+++ b/src/Sanitizer/TextFieldSanitizer.php
@@ -5,6 +5,7 @@ namespace WPDesk\Forms\Sanitizer;
use WPDesk\Forms\Sanitizer;
class TextFieldSanitizer implements Sanitizer {
+
public function sanitize( $value ): string {
return sanitize_text_field( $value );
}
diff --git a/src/Serializer.php b/src/Serializer.php
index 2096b0f..ad5f888 100644
--- a/src/Serializer.php
+++ b/src/Serializer.php
@@ -3,6 +3,7 @@
namespace WPDesk\Forms;
interface Serializer {
+
/**
* @param mixed $value
*/
diff --git a/src/Serializer/JsonSerializer.php b/src/Serializer/JsonSerializer.php
index 9ded064..0048820 100644
--- a/src/Serializer/JsonSerializer.php
+++ b/src/Serializer/JsonSerializer.php
@@ -5,6 +5,7 @@ namespace WPDesk\Forms\Serializer;
use WPDesk\Forms\Serializer;
class JsonSerializer implements Serializer {
+
public function serialize( $value ): string {
return (string) json_encode( $value );
}
diff --git a/src/Serializer/ProductSelectSerializer.php b/src/Serializer/ProductSelectSerializer.php
index 7c4f0e8..dd034f0 100644
--- a/src/Serializer/ProductSelectSerializer.php
+++ b/src/Serializer/ProductSelectSerializer.php
@@ -10,6 +10,7 @@ use WPDesk\Forms\Serializer;
* @package WPDesk\Forms\Serializer
*/
class ProductSelectSerializer implements Serializer {
+
public function serialize( $value ): string {
$products_with_names = [];
if ( is_array( $value ) ) {
diff --git a/src/Serializer/SerializeSerializer.php b/src/Serializer/SerializeSerializer.php
index dde47cc..776bd76 100644
--- a/src/Serializer/SerializeSerializer.php
+++ b/src/Serializer/SerializeSerializer.php
@@ -5,6 +5,7 @@ namespace WPDesk\Forms\Serializer;
use WPDesk\Forms\Serializer;
class SerializeSerializer implements Serializer {
+
public function serialize( $value ): string {
return serialize( $value );
}
diff --git a/src/Validator.php b/src/Validator.php
index 2281820..9422fdb 100644
--- a/src/Validator.php
+++ b/src/Validator.php
@@ -3,6 +3,7 @@
namespace WPDesk\Forms;
interface Validator {
+
/** @param mixed $value */
public function is_valid( $value ): bool;
diff --git a/src/Validator/NoValidateValidator.php b/src/Validator/NoValidateValidator.php
index 04cf59c..d3bf32f 100644
--- a/src/Validator/NoValidateValidator.php
+++ b/src/Validator/NoValidateValidator.php
@@ -5,6 +5,7 @@ namespace WPDesk\Forms\Validator;
use WPDesk\Forms\Validator;
class NoValidateValidator implements Validator {
+
public function is_valid( $value ): bool {
return true;
}
diff --git a/src/Validator/RequiredValidator.php b/src/Validator/RequiredValidator.php
index 4e78faf..5d4851a 100644
--- a/src/Validator/RequiredValidator.php
+++ b/src/Validator/RequiredValidator.php
@@ -5,6 +5,7 @@ namespace WPDesk\Forms\Validator;
use WPDesk\Forms\Validator;
class RequiredValidator implements Validator {
+
public function is_valid( $value ): bool {
return $value !== null;
}
diff --git a/templates/button.php b/templates/button.php
index fd95750..214417d 100644
--- a/templates/button.php
+++ b/templates/button.php
@@ -33,3 +33,4 @@
readonly="readonly"<?php endif; ?>
><?php echo \esc_html( $field->get_label() ); ?></button>
+
diff --git a/templates/form-field.php b/templates/form-field.php
index 0fd07d5..09a0fe9 100644
--- a/templates/form-field.php
+++ b/templates/form-field.php
@@ -11,13 +11,12 @@
<tr valign="top">
<?php if ( $field->has_label() ) : ?>
- <?php echo wp_kses_post( $renderer->render( 'form-label', [ 'field' => $field ] ) ); ?>
+ <?php $renderer->output_render( 'form-label', [ 'field' => $field ] ); ?>
<?php endif; ?>
<td class="forminp">
<?php
- echo wp_kses_post(
- $renderer->render(
+ $renderer->output_render(
$template_name,
[
'field' => $field,
@@ -25,9 +24,8 @@
'name_prefix' => $name_prefix,
'value' => $value,
]
- )
- );
- ?>
+ );
+ ?>
<?php if ( $field->has_description() ) : ?>
<p class="description"><?php echo wp_kses_post( $field->get_description() ); ?></p>
diff --git a/templates/form-label.php b/templates/form-label.php
index 8eeaf28..9d960fe 100644
--- a/templates/form-label.php
+++ b/templates/form-label.php
@@ -9,7 +9,7 @@
<th class="titledesc" scope="row">
<label for="<?php echo \esc_attr( $field->get_id() ); ?>"><?php echo \esc_html( $field->get_label() ); ?>
<?php if ( $field->has_description_tip() ) : ?>
- <?php echo esc_html( wc_help_tip( $field->get_description_tip() ) ); ?>
+ <?php echo wp_kses_post( wc_help_tip( $field->get_description_tip() ) ); ?>
<?php endif ?>
</label>
</th>
diff --git a/templates/input-checkbox.php b/templates/input-checkbox.php
index 8474091..55f544f 100644
--- a/templates/input-checkbox.php
+++ b/templates/input-checkbox.php
@@ -10,14 +10,12 @@
?>
<?php
-echo wp_kses_post(
- $renderer->render(
- 'input',
- [
- 'field' => $field,
- 'renderer' => $renderer,
- 'name_prefix' => $name_prefix,
- 'value' => $value,
- ]
- )
+$renderer->output_render(
+ 'input',
+ [
+ 'field' => $field,
+ 'renderer' => $renderer,
+ 'name_prefix' => $name_prefix,
+ 'value' => $value,
+ ]
);
diff --git a/templates/input-date-picker.php b/templates/input-date-picker.php
index 3caa4c6..51e9715 100644
--- a/templates/input-date-picker.php
+++ b/templates/input-date-picker.php
@@ -7,14 +7,12 @@
* @var string $template_name Real field template.
*/
-echo wp_kses_post(
- $renderer->render(
- 'input',
- [
- 'field' => $field,
- 'renderer' => $renderer,
- 'name_prefix' => $name_prefix,
- 'value' => $value,
- ]
- )
+$renderer->output_render(
+ 'input',
+ [
+ 'field' => $field,
+ 'renderer' => $renderer,
+ 'name_prefix' => $name_prefix,
+ 'value' => $value,
+ ]
);
diff --git a/templates/input-hidden.php b/templates/input-hidden.php
index 6388552..7668c7f 100644
--- a/templates/input-hidden.php
+++ b/templates/input-hidden.php
@@ -9,14 +9,12 @@
?>
<?php
-echo wp_kses_post(
- $renderer->render(
- 'input',
- [
- 'field' => $field,
- 'renderer' => $renderer,
- 'name_prefix' => $name_prefix,
- 'value' => $value,
- ]
- )
+$renderer->output_render(
+ 'input',
+ [
+ 'field' => $field,
+ 'renderer' => $renderer,
+ 'name_prefix' => $name_prefix,
+ 'value' => $value,
+ ]
);
diff --git a/templates/input-image.php b/templates/input-image.php
index 5111c4c..ce099e4 100644
--- a/templates/input-image.php
+++ b/templates/input-image.php
@@ -13,17 +13,25 @@ $media_container_id = 'media_' . sanitize_key( $field->get_id() );
id="<?php echo \esc_attr( $field->get_id() ); ?>"/>
<div class="custom-img-container">
<?php if ( $value ) : ?>
- <img src="<?php echo \esc_url( $value ) ?>" alt="" width="100"/>
+ <img src="<?php echo \esc_url( $value ); ?>" alt="" width="100"/>
<?php endif; ?>
- </div>
- <p class="hide-if-no-js">
- <a class="upload-custom-img <?php if ( $value ): ?>hidden<?php endif ?>" href="<?php echo \esc_url( $value ) ?>">
- <?php \esc_html_e( 'Set image', 'wp-forms' ) ?>
- </a>
- <a class="delete-custom-img <?php if ( ! $value ): ?>hidden<?php endif ?>" href="#">
- <?php \esc_html_e( 'Remove image', 'wp-forms' ) ?>
- </a>
- </p>
+ </div>
+ <p class="hide-if-no-js">
+ <a class="upload-custom-img
+ <?php
+ if ( $value ) :
+ ?>
+ hidden<?php endif ?>" href="<?php echo \esc_url( $value ); ?>">
+ <?php \esc_html_e( 'Set image', 'wp-forms' ); ?>
+ </a>
+ <a class="delete-custom-img
+ <?php
+ if ( ! $value ) :
+ ?>
+ hidden<?php endif ?>" href="#">
+ <?php \esc_html_e( 'Remove image', 'wp-forms' ); ?>
+ </a>
+ </p>
</div>
<script>
jQuery( function ( $ ) {
diff --git a/templates/input-number.php b/templates/input-number.php
index 3caa4c6..51e9715 100644
--- a/templates/input-number.php
+++ b/templates/input-number.php
@@ -7,14 +7,12 @@
* @var string $template_name Real field template.
*/
-echo wp_kses_post(
- $renderer->render(
- 'input',
- [
- 'field' => $field,
- 'renderer' => $renderer,
- 'name_prefix' => $name_prefix,
- 'value' => $value,
- ]
- )
+$renderer->output_render(
+ 'input',
+ [
+ 'field' => $field,
+ 'renderer' => $renderer,
+ 'name_prefix' => $name_prefix,
+ 'value' => $value,
+ ]
);
diff --git a/templates/input-radio.php b/templates/input-radio.php
index 6388552..7668c7f 100644
--- a/templates/input-radio.php
+++ b/templates/input-radio.php
@@ -9,14 +9,12 @@
?>
<?php
-echo wp_kses_post(
- $renderer->render(
- 'input',
- [
- 'field' => $field,
- 'renderer' => $renderer,
- 'name_prefix' => $name_prefix,
- 'value' => $value,
- ]
- )
+$renderer->output_render(
+ 'input',
+ [
+ 'field' => $field,
+ 'renderer' => $renderer,
+ 'name_prefix' => $name_prefix,
+ 'value' => $value,
+ ]
);
diff --git a/templates/input-text.php b/templates/input-text.php
index 3caa4c6..51e9715 100644
--- a/templates/input-text.php
+++ b/templates/input-text.php
@@ -7,14 +7,12 @@
* @var string $template_name Real field template.
*/
-echo wp_kses_post(
- $renderer->render(
- 'input',
- [
- 'field' => $field,
- 'renderer' => $renderer,
- 'name_prefix' => $name_prefix,
- 'value' => $value,
- ]
- )
+$renderer->output_render(
+ 'input',
+ [
+ 'field' => $field,
+ 'renderer' => $renderer,
+ 'name_prefix' => $name_prefix,
+ 'value' => $value,
+ ]
);
--
GitLab