Skip to content
Snippets Groups Projects
Commit ca1c9040 authored by Bartek Jaskulski's avatar Bartek Jaskulski
Browse files

Merge branch 'feature/strong-typing-pp' into 'feature/strong-typing' 

Feature/strong typing pp

See merge request !23
parents 679dcfd9 41941369
Branches
Tags
3 merge requests!28release: 3.0.0,!23Feature/strong typing pp,!19Add strong typing for 3.0 version
Pipeline #6505 passed
Stage: prepare-vendor
Stage: prepare-node
Stage: tools
Stage: tests
Stage: deploy
Show whitespace changes
Inline Side-by-side
Showing
with 79 additions and 168 deletions
src/Validator/RequiredValidator.php
+ 1
− 0
View file @ ca1c9040
......@@ -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
+ 7
− 17
View file @ ca1c9040
......@@ -10,26 +10,16 @@
?>
<button
type="<?php echo \esc_attr( $field->get_type() ); ?>"
name="<?php echo \esc_attr( $name_prefix ) . '[' . \esc_attr( $field->get_name() ) . ']'; ?>"
id="<?php echo \esc_attr( $field->get_id() ); ?>"
value="<?php echo \esc_html( $value ); ?>"
<?php if ( $field->has_classes() ) : ?>
class="<?php echo \esc_attr( $field->get_classes() ); ?>"
<?php endif; ?>
<?php foreach ( $field->get_attributes( [] ) as $key => $val ) : ?>
<?php foreach ( $field->get_attributes() as $key => $val ) : ?>
<?php echo \esc_attr( $key ) . '="' . \esc_attr( $val ) . '"'; ?>
<?php endforeach; ?>
type="<?php echo \esc_attr( $field->get_type() ); ?>"
name="<?php echo \esc_attr( $name_prefix ) . '[' . \esc_attr( $field->get_name() ) . ']'; ?>"
id="<?php echo \esc_attr( $field->get_id() ); ?>"
value="<?php echo \esc_html( $value ); ?>"
<?php
if ( $field->is_disabled() ) :
?>
disabled="disabled"<?php endif; ?>
<?php
if ( $field->is_readonly() ) :
?>
readonly="readonly"<?php endif; ?>
><?php echo \esc_html( $field->get_label() ); ?></button>
templates/form-field.php
+ 4
− 6
View file @ ca1c9040
......@@ -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,
]
)
);
?>
......
templates/form-label.php
+ 1
− 1
View file @ ca1c9040
......@@ -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>
templates/input-checkbox.php
+ 8
− 10
View file @ ca1c9040
......@@ -10,8 +10,7 @@
?>
<?php
echo wp_kses_post(
$renderer->render(
$renderer->output_render(
'input',
[
'field' => $field,
......@@ -19,5 +18,4 @@ echo wp_kses_post(
'name_prefix' => $name_prefix,
'value' => $value,
]
)
);
templates/input-date-picker.php
+ 8
− 10
View file @ ca1c9040
......@@ -7,8 +7,7 @@
* @var string $template_name Real field template.
*/
echo wp_kses_post(
$renderer->render(
$renderer->output_render(
'input',
[
'field' => $field,
......@@ -16,5 +15,4 @@ echo wp_kses_post(
'name_prefix' => $name_prefix,
'value' => $value,
]
)
);
templates/input-hidden.php
+ 8
− 10
View file @ ca1c9040
......@@ -9,8 +9,7 @@
?>
<?php
echo wp_kses_post(
$renderer->render(
$renderer->output_render(
'input',
[
'field' => $field,
......@@ -18,5 +17,4 @@ echo wp_kses_post(
'name_prefix' => $name_prefix,
'value' => $value,
]
)
);
templates/input-image.php
+ 18
− 10
View file @ ca1c9040
......@@ -13,15 +13,23 @@ $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 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 class="delete-custom-img
<?php
if ( ! $value ) :
?>
hidden<?php endif ?>" href="#">
<?php \esc_html_e( 'Remove image', 'wp-forms' ); ?>
</a>
</p>
</div>
......
templates/input-number.php
+ 8
− 10
View file @ ca1c9040
......@@ -7,8 +7,7 @@
* @var string $template_name Real field template.
*/
echo wp_kses_post(
$renderer->render(
$renderer->output_render(
'input',
[
'field' => $field,
......@@ -16,5 +15,4 @@ echo wp_kses_post(
'name_prefix' => $name_prefix,
'value' => $value,
]
)
);
templates/input-radio.php
+ 8
− 10
View file @ ca1c9040
......@@ -9,8 +9,7 @@
?>
<?php
echo wp_kses_post(
$renderer->render(
$renderer->output_render(
'input',
[
'field' => $field,
......@@ -18,5 +17,4 @@ echo wp_kses_post(
'name_prefix' => $name_prefix,
'value' => $value,
]
)
);
templates/input-submit.php
+ 0
− 12
View file @ ca1c9040
......@@ -24,18 +24,6 @@
name="<?php echo \esc_attr( $name_prefix ); ?>[<?php echo \esc_attr( $field->get_name() ); ?>]"
id="<?php echo \esc_attr( $field->get_id() ); ?>"
value="<?php echo \esc_html( $field->get_label() ); ?>"
<?php
if ( $field->is_required() ) :
?>
required="required"<?php endif; ?>
<?php
if ( $field->is_disabled() ) :
?>
disabled="disabled"<?php endif; ?>
<?php
if ( $field->is_readonly() ) :
?>
readonly="readonly"<?php endif; ?>
/>
</p>
</td>
......
templates/input-text-multiple.php
+ 0
− 12
View file @ ca1c9040
......@@ -43,18 +43,6 @@ if ( empty( $value ) || is_string( $value ) ) {
?>
<?php endforeach; ?>
<?php
if ( $field->is_required() ) :
?>
required="required"<?php endif; ?>
<?php
if ( $field->is_disabled() ) :
?>
disabled="disabled"<?php endif; ?>
<?php
if ( $field->is_readonly() ) :
?>
readonly="readonly"<?php endif; ?>
<?php if ( \in_array( $field->get_type(), [ 'number', 'text', 'hidden' ], true ) ) : ?>
value="<?php echo \esc_html( $text_value ); ?>"
<?php else : ?>
......
templates/input-text.php
+ 8
− 10
View file @ ca1c9040
......@@ -7,8 +7,7 @@
* @var string $template_name Real field template.
*/
echo wp_kses_post(
$renderer->render(
$renderer->output_render(
'input',
[
'field' => $field,
......@@ -16,5 +15,4 @@ echo wp_kses_post(
'name_prefix' => $name_prefix,
'value' => $value,
]
)
);
templates/input.php
+ 0
− 16
View file @ ca1c9040
......@@ -23,28 +23,12 @@ if ( $field->get_type() === 'checkbox' && $field->has_sublabel() ) :
class="<?php echo \esc_attr( $field->get_classes() ); ?>"
<?php endif; ?>
<?php if ( $field->get_type() === 'text' && $field->has_placeholder() ) : ?>
placeholder="<?php echo \esc_html( $field->get_placeholder() ); ?>"
<?php endif; ?>
<?php
foreach ( $field->get_attributes() as $key => $atr_val ) :
echo \esc_attr( $key ) . '="' . \esc_attr( $atr_val ) . '"';
?>
<?php endforeach; ?>
<?php
if ( $field->is_required() ) :
?>
required="required"<?php endif; ?>
<?php
if ( $field->is_disabled() ) :
?>
disabled="disabled"<?php endif; ?>
<?php
if ( $field->is_readonly() ) :
?>
readonly="readonly"<?php endif; ?>
<?php if ( \in_array( $field->get_type(), [ 'number', 'text', 'hidden' ], true ) ) : ?>
value="<?php echo \esc_html( $value ); ?>"
<?php else : ?>
......
templates/select.php
+ 0
− 17
View file @ ca1c9040
......@@ -17,23 +17,6 @@
<?php foreach ( $field->get_attributes() as $key => $attr_val ) : ?>
<?php echo \esc_attr( $key ); ?>="<?php echo \esc_attr( $attr_val ); ?>"
<?php endforeach; ?>
<?php
if ( $field->is_required() ) :
?>
required="required"<?php endif; ?>
<?php
if ( $field->is_disabled() ) :
?>
disabled="disabled"<?php endif; ?>
<?php
if ( $field->is_readonly() ) :
?>
readonly="readonly"<?php endif; ?>
<?php
if ( $field->is_multiple() ) :
?>
multiple="multiple"<?php endif; ?>
>
<?php
if ( $field->has_placeholder() ) :
......
templates/textarea.php
+ 0
− 17
View file @ ca1c9040
......@@ -18,23 +18,6 @@
<?php echo \esc_attr( $key ); ?>="<?php echo \esc_attr( $attr_val ); ?>"
<?php endforeach; ?>
<?php
if ( $field->is_required() ) :
?>
required="required"<?php endif; ?>
<?php
if ( $field->is_disabled() ) :
?>
disabled="disabled"<?php endif; ?>
<?php
if ( $field->is_readonly() ) :
?>
readonly="readonly"<?php endif; ?>
<?php
if ( $field->is_multiple() ) :
?>
multiple="multiple"<?php endif; ?>
<?php
if ( $field->has_placeholder() ) :
?>
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment