diff --git a/phpcs.xml.dist b/phpcs.xml.dist index 71f434574b38d5463306fc3011b7c906d006c0d5..76f5a1b2ffaf6a673a96474113b55ff503ad35d9 100644 --- a/phpcs.xml.dist +++ b/phpcs.xml.dist @@ -45,4 +45,10 @@ <exclude name="Squiz.Commenting.ClassComment.Missing"/> </rule> + <rule ref="Universal.NamingConventions.NoReservedKeywordParameterNames"> + <exclude-pattern>*src/Field/Traits/HtmlAttributes.php$</exclude-pattern> + <exclude-pattern>*src/Sanitizer/CallableSanitizer.php$</exclude-pattern> + <exclude-pattern>*src/Field.php$</exclude-pattern> + </rule> + </ruleset> diff --git a/src/ContainerForm.php b/src/ContainerForm.php index e3b6dde63d31bf31e483b37b6a3c69de2012a3f7..aeadc3b35cc81367d0eee68f0e19520a55bf9604 100644 --- a/src/ContainerForm.php +++ b/src/ContainerForm.php @@ -26,4 +26,3 @@ interface ContainerForm { */ public function put_data( PersistentContainer $container ); } - diff --git a/src/Field/DateField.php b/src/Field/DateField.php index 58346dae1ed4b571bc1d050b63601fd3b39089fb..3c1acde7a1648f428efbf9273cb23464f4345bc8 100644 --- a/src/Field/DateField.php +++ b/src/Field/DateField.php @@ -7,7 +7,7 @@ use WPDesk\Forms\Sanitizer\TextFieldSanitizer; class DateField extends BasicField { public function __construct() { - $this->set_placeholder('YYYY-MM-DD'); + $this->set_placeholder( 'YYYY-MM-DD' ); } public function get_type(): string { @@ -17,5 +17,4 @@ class DateField extends BasicField { public function get_template_name(): string { return 'input-text'; } - } diff --git a/src/Field/WPEditorField.php b/src/Field/WPEditorField.php index c7b99c630d490b56404f343a96a3c99b11cb7a0e..a13abc74881e3be4096502b45cf60405754c6043 100644 --- a/src/Field/WPEditorField.php +++ b/src/Field/WPEditorField.php @@ -7,6 +7,4 @@ class WPEditorField extends BasicField { public function get_template_name(): string { return 'wp-editor'; } - - } diff --git a/src/Form.php b/src/Form.php index b5014ff6368e1b32d1e918d83cb9e914a5223ba2..6a62c5c329111a404cd1ec09cee142c7e405a6f6 100644 --- a/src/Form.php +++ b/src/Form.php @@ -63,4 +63,3 @@ interface Form { */ public function get_form_id(): string; } - diff --git a/src/Form/FormWithFields.php b/src/Form/FormWithFields.php index 8d4961d02c541ee2170cbf5b792509143461e7cb..228c134ce2e78c1108e53c350fce193289020c64 100644 --- a/src/Form/FormWithFields.php +++ b/src/Form/FormWithFields.php @@ -149,7 +149,7 @@ class FormWithFields implements Form, ContainerForm, FieldProvider { } public function render_form( Renderer $renderer ): string { - $content = $renderer->render( + $content = $renderer->render( 'form-start', [ 'form' => $this, diff --git a/src/Resolver/DefaultFormFieldResolver.php b/src/Resolver/DefaultFormFieldResolver.php index b5c167502452dc45e910619ab753b69d5b710a80..4e3077a0cb2b87ef000ac269d3411a9e5a1cf70b 100644 --- a/src/Resolver/DefaultFormFieldResolver.php +++ b/src/Resolver/DefaultFormFieldResolver.php @@ -23,5 +23,4 @@ class DefaultFormFieldResolver implements Resolver { public function resolve( $name, Renderer $renderer = null ): string { return $this->dir_resolver->resolve( $name, $renderer ); } - } diff --git a/src/Sanitizer/CallableSanitizer.php b/src/Sanitizer/CallableSanitizer.php index da916abbb4971b884fb1f37368d8174299f35593..d839069bb868c9da310b908fe19e9dec9a21713f 100644 --- a/src/Sanitizer/CallableSanitizer.php +++ b/src/Sanitizer/CallableSanitizer.php @@ -16,5 +16,4 @@ class CallableSanitizer implements Sanitizer { public function sanitize( $value ): string { return call_user_func( $this->callable, $value ); } - } diff --git a/src/Sanitizer/EmailSanitizer.php b/src/Sanitizer/EmailSanitizer.php index 160ef3c7d20e6f1fdc38fbee9a7be97edd8ca896..91a798299b1f20bbae318d136c7df243cb3ac1db 100644 --- a/src/Sanitizer/EmailSanitizer.php +++ b/src/Sanitizer/EmailSanitizer.php @@ -9,5 +9,4 @@ 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 2647e663aed006e51bd7c0bf89a5b981d03618dd..f5290d57b47c6d7efd387badb22dd96a4041ed60 100644 --- a/src/Sanitizer/NoSanitize.php +++ b/src/Sanitizer/NoSanitize.php @@ -9,5 +9,4 @@ class NoSanitize implements Sanitizer { public function sanitize( $value ) { return $value; } - } diff --git a/src/Sanitizer/TextFieldSanitizer.php b/src/Sanitizer/TextFieldSanitizer.php index 2fa5e3f7db91859f882d64e927b67034ffbdc6f8..b0523adbd41cae1e6fac37d5ac10e4ce1fa7a78e 100644 --- a/src/Sanitizer/TextFieldSanitizer.php +++ b/src/Sanitizer/TextFieldSanitizer.php @@ -9,9 +9,8 @@ class TextFieldSanitizer implements Sanitizer { /** @return string|string[] */ public function sanitize( $value ) { if ( is_array( $value ) ) { - return array_map('sanitize_text_field', $value); + return array_map( 'sanitize_text_field', $value ); } return sanitize_text_field( $value ); } - } diff --git a/src/Serializer/ProductSelectSerializer.php b/src/Serializer/ProductSelectSerializer.php index dd034f0786c4085f2621148e1249259ba1bfd38b..a983c8140c7842aaf0b075ceb0540913993d32e6 100644 --- a/src/Serializer/ProductSelectSerializer.php +++ b/src/Serializer/ProductSelectSerializer.php @@ -29,5 +29,4 @@ class ProductSelectSerializer implements Serializer { public function unserialize( string $value ) { return $value; } - } diff --git a/src/Serializer/SerializeSerializer.php b/src/Serializer/SerializeSerializer.php index 776bd76f22628335d58466c3dc257761ca28b8b4..7749ba6fa30fe88337e3cd719a24dc233ef665e5 100644 --- a/src/Serializer/SerializeSerializer.php +++ b/src/Serializer/SerializeSerializer.php @@ -1,4 +1,5 @@ <?php +// phpcs:disable WordPress.PHP.DiscouragedPHPFunctions namespace WPDesk\Forms\Serializer; @@ -13,5 +14,4 @@ class SerializeSerializer implements Serializer { public function unserialize( string $value ) { return unserialize( $value ); } - } diff --git a/src/Validator/ChainValidator.php b/src/Validator/ChainValidator.php index 341abeec541d8fa18757c808aa69e1635a629d05..36ebdaf7c141cb15c2831843f36b608fd596a3e7 100644 --- a/src/Validator/ChainValidator.php +++ b/src/Validator/ChainValidator.php @@ -45,5 +45,4 @@ class ChainValidator implements Validator { public function get_messages(): array { return $this->messages; } - } diff --git a/src/Validator/NoValidateValidator.php b/src/Validator/NoValidateValidator.php index d3bf32f4dfb919ab53b5f2c5c53657f6ab9a4e71..4f84254c33e2cbf7508a08e8a9a850d0dd359c74 100644 --- a/src/Validator/NoValidateValidator.php +++ b/src/Validator/NoValidateValidator.php @@ -13,5 +13,4 @@ class NoValidateValidator implements Validator { public function get_messages(): array { return []; } - } diff --git a/src/Validator/NonceValidator.php b/src/Validator/NonceValidator.php index b8874289fde8342e868b9df682558bfe75ea3025..8b4f3c12f071d3ce67ba3dd5920f8dc8a840b4d2 100644 --- a/src/Validator/NonceValidator.php +++ b/src/Validator/NonceValidator.php @@ -21,5 +21,4 @@ class NonceValidator implements Validator { public function get_messages(): array { return []; } - } diff --git a/src/Validator/RequiredValidator.php b/src/Validator/RequiredValidator.php index 5d4851abba5c34a9e000727c672dc94195dba496..6d2c21f0e86e39b708fafc7290b630752dd2d8f2 100644 --- a/src/Validator/RequiredValidator.php +++ b/src/Validator/RequiredValidator.php @@ -13,5 +13,4 @@ class RequiredValidator implements Validator { public function get_messages(): array { return []; } - } diff --git a/templates/wp-editor.php b/templates/wp-editor.php index 90576aa779361a91ab35c22ff785e8d268992a94..bea6ac2d5814164e3c203d6f3a0492cae814fde5 100644 --- a/templates/wp-editor.php +++ b/templates/wp-editor.php @@ -22,4 +22,3 @@ $editor_settings = wp_parse_args( $field->get_attributes(), $default_settings ) $editor_id = uniqid( 'wyswig_' ); wp_editor( wp_kses_post( $value ), $editor_id, $editor_settings ); -?>