Merge branch 'bugfix/remove-invalid-escaping' into 'master'

Bugfix/remove invalid escaping

See merge request !22

changelog.txt

 # Changelog
+## [2.4.10] - 2021-10-01
+### Changed
+- Render form data without using echo
 
 ## [2.4.9] - 2021-09-28
 ### Fixed

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",

templates/form-field.php

@@ -11,13 +11,21 @@
 
 <tr valign="top">
 	<?php if ( $field->has_label() ) : ?>
-		<?php echo $renderer->render( 'form-label', [ 'field' => $field ] );  // phpcs:ignore ?>
+		<?php $renderer->output_render( 'form-label', [ 'field' => $field ] ); ?>
 	<?php endif; ?>
 
 	<td class="forminp">
 		<?php
-		echo $renderer->render( $template_name, [ 'field' => $field, 'renderer' => $renderer, 'name_prefix' => $name_prefix, 'value' => $value ]); // phpcs:ignore
-		?>
+			$renderer->output_render(
+				$template_name,
+				[
+					'field'       => $field,
+					'renderer'    => $renderer,
+					'name_prefix' => $name_prefix,
+					'value'       => $value,
+				]
+			);
+			?>
 
 		<?php if ( $field->has_description() ) : ?>
 			<p class="description"><?php echo wp_kses_post( $field->get_description() ); ?></p>

templates/input-checkbox.php

@@ -10,4 +10,12 @@
 ?>
 
 <?php
-echo $renderer->render( 'input', [ 'field' => $field, 'renderer' => $renderer, 'name_prefix' => $name_prefix, 'value' => $value ] );  // phpcs:ignore;
+$renderer->output_render(
+	'input',
+	[
+		'field'       => $field,
+		'renderer'    => $renderer,
+		'name_prefix' => $name_prefix,
+		'value'       => $value,
+	]
+);

templates/input-date-picker.php

@@ -7,5 +7,12 @@
  * @var string $template_name Real field template.
  */
 
-echo $renderer->render( 'input',[ 'field' => $field, 'renderer' => $renderer, 'name_prefix' => $name_prefix, 'value' => $value ]); // phpcs:ignore
-
+$renderer->output_render(
+	'input',
+	[
+		'field'       => $field,
+		'renderer'    => $renderer,
+		'name_prefix' => $name_prefix,
+		'value'       => $value,
+	]
+);

templates/input-hidden.php

@@ -9,4 +9,12 @@
 
 ?>
 <?php
-echo $renderer->render( 'input', [ 'field' => $field, 'renderer' => $renderer, 'name_prefix' => $name_prefix, 'value' => $value ] ); // phpcs:ignore
+$renderer->output_render(
+	'input',
+	[
+		'field'       => $field,
+		'renderer'    => $renderer,
+		'name_prefix' => $name_prefix,
+		'value'       => $value,
+	]
+);

templates/input-number.php

@@ -7,4 +7,12 @@
  * @var string $template_name Real field template.
  */
 
-echo $renderer->render( 'input', ['field' => $field, 'renderer' => $renderer, 'name_prefix' => $name_prefix,'value' => $value ] ); // phpcs:ignore
+$renderer->output_render(
+	'input',
+	[
+		'field'       => $field,
+		'renderer'    => $renderer,
+		'name_prefix' => $name_prefix,
+		'value'       => $value,
+	]
+);

templates/input-radio.php

@@ -9,4 +9,12 @@
 
 ?>
 <?php
-echo $renderer->render( 'input', [ 'field' => $field, 'renderer' => $renderer, 'name_prefix' => $name_prefix, 'value' => $value ] );  // phpcs:ignore
+$renderer->output_render(
+	'input',
+	[
+		'field'       => $field,
+		'renderer'    => $renderer,
+		'name_prefix' => $name_prefix,
+		'value'       => $value,
+	]
+);

templates/input-text.php

@@ -7,4 +7,12 @@
  * @var string $template_name Real field template.
  */
 
-echo $renderer->render( 'input', [ 'field' => $field, 'renderer' => $renderer, 'name_prefix' => $name_prefix, 'value' => $value ] ); // phpcs:ignore
+$renderer->output_render(
+	'input',
+	[
+		'field'       => $field,
+		'renderer'    => $renderer,
+		'name_prefix' => $name_prefix,
+		'value'       => $value,
+	]
+);