fix: devel merge, reformat

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

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

src/Field/WyswigField.php

@@ -3,6 +3,7 @@
 namespace WPDesk\Forms\Field;
 
 class WyswigField extends BasicField {
+
 	public function get_template_name(): string {
 		return 'wyswig';
 	}

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.
 	 *

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 = '' );
 }

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

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.
 	 */

src/Sanitizer.php

@@ -3,6 +3,7 @@
 namespace WPDesk\Forms;
 
 interface Sanitizer {
+
 	/**
 	 * @param mixed $value
 	 *

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

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

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

src/Serializer.php

@@ -3,6 +3,7 @@
 namespace WPDesk\Forms;
 
 interface Serializer {
+
 	/**
 	 * @param mixed $value
 	 */

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

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 ) ) {

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

src/Validator.php

@@ -3,6 +3,7 @@
 namespace WPDesk\Forms;
 
 interface Validator {
+
 	/** @param mixed $value */
 	public function is_valid( $value ): bool;
 

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

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

templates/button.php

@@ -33,3 +33,4 @@
 		readonly="readonly"<?php endif; ?>
 
 ><?php echo \esc_html( $field->get_label() ); ?></button>
+

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,7 +24,6 @@
 					'name_prefix' => $name_prefix,
 					'value'       => $value,
 				]
-			)
 			);
 			?>