From db3830fb1b495d94f6454bd04c0b4cd67baecaf0 Mon Sep 17 00:00:00 2001
From: Bart Jaskulski <bjaskulski@protonmail.com>
Date: Wed, 30 Oct 2024 14:12:06 +0100
Subject: [PATCH] style: misc style fixes
Signed-off-by: Bart Jaskulski <bjaskulski@protonmail.com>
---
phpcs.xml.dist | 6 ++++++
src/ContainerForm.php | 1 -
src/Field/DateField.php | 3 +--
src/Field/WPEditorField.php | 2 --
src/Form.php | 1 -
src/Form/FormWithFields.php | 2 +-
src/Resolver/DefaultFormFieldResolver.php | 1 -
src/Sanitizer/CallableSanitizer.php | 1 -
src/Sanitizer/EmailSanitizer.php | 1 -
src/Sanitizer/NoSanitize.php | 1 -
src/Sanitizer/TextFieldSanitizer.php | 3 +--
src/Serializer/ProductSelectSerializer.php | 1 -
src/Serializer/SerializeSerializer.php | 2 +-
src/Validator/ChainValidator.php | 1 -
src/Validator/NoValidateValidator.php | 1 -
src/Validator/NonceValidator.php | 1 -
src/Validator/RequiredValidator.php | 1 -
templates/wp-editor.php | 1 -
18 files changed, 10 insertions(+), 20 deletions(-)
diff --git a/phpcs.xml.dist b/phpcs.xml.dist
index 71f4345..76f5a1b 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 e3b6dde..aeadc3b 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 58346da..3c1acde 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 c7b99c6..a13abc7 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 b5014ff..6a62c5c 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 8d4961d..228c134 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 b5c1675..4e3077a 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 da916ab..d839069 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 160ef3c..91a7982 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 2647e66..f5290d5 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 2fa5e3f..b0523ad 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 dd034f0..a983c81 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 776bd76..7749ba6 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 341abee..36ebdaf 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 d3bf32f..4f84254 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 b887428..8b4f3c1 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 5d4851a..6d2c21f 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 90576aa..bea6ac2 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 );
-?>
--
GitLab