@@ -144,7 +144,7 @@ public function render_submenu_page() {
* Save a submenu page
*/
public function handle_submenu_save() {
- // phpcs:ignore WordPress.PHP.StrictComparisons.LooseComparison, WordPress.Security.NonceVerification.Recommended -- baseline
+ // phpcs:ignore Universal.Operators.StrictComparisons, WordPress.Security.NonceVerification.Recommended -- baseline
if ( empty( $_GET['page'] ) || $_GET['page'] != $this->menu_slug ) {
return;
}
diff --git a/php/context/class-fieldmanager-context-term.php b/php/context/class-fieldmanager-context-term.php
index 6f9ce6a5ec..ce19dc57e0 100644
--- a/php/context/class-fieldmanager-context-term.php
+++ b/php/context/class-fieldmanager-context-term.php
@@ -223,7 +223,7 @@ public function add_term_fields( $taxonomy ) {
*/
public function edit_term_fields( $term, $taxonomy ) {
// Check if this term's parent matches the specified term if it is set.
- // phpcs:ignore WordPress.PHP.StrictComparisons.LooseComparison -- baseline
+ // phpcs:ignore Universal.Operators.StrictComparisons -- baseline
if ( 0 !== strlen( $this->parent ) && $this->parent != $term->parent ) {
return;
}
@@ -500,5 +500,4 @@ protected function delete_data( $term_id, $meta_key, $meta_value = '' ) {
return delete_term_meta( $term_id, $meta_key, $meta_value );
}
}
-
}
diff --git a/php/datasource/class-fieldmanager-datasource-post.php b/php/datasource/class-fieldmanager-datasource-post.php
index 730c32f11d..a8be668feb 100644
--- a/php/datasource/class-fieldmanager-datasource-post.php
+++ b/php/datasource/class-fieldmanager-datasource-post.php
@@ -158,9 +158,9 @@ public function get_items( $fragment = null ) {
if ( $post_id ) {
$exact_post = get_post( $post_id );
if ( $exact_post && (
- // phpcs:ignore WordPress.PHP.StrictComparisons.LooseComparison -- baseline
+ // phpcs:ignore Universal.Operators.StrictComparisons -- baseline
'any' == $post_args['post_type'] ||
- // phpcs:ignore WordPress.PHP.StrictComparisons.LooseComparison -- baseline
+ // phpcs:ignore Universal.Operators.StrictComparisons -- baseline
$post_args['post_type'] == $exact_post->post_type ||
// phpcs:ignore WordPress.PHP.StrictInArray.MissingTrueStrict -- baseline
in_array( $exact_post->post_type, $post_args['post_type'] )
@@ -242,7 +242,7 @@ public function title_like( $where, $wp_query ) {
* @param array $current_values Existing post values.
*/
public function presave_alter_values( Fieldmanager_Field $field, $values, $current_values ) {
- // phpcs:ignore WordPress.PHP.StrictComparisons.LooseComparison -- baseline
+ // phpcs:ignore Universal.Operators.StrictComparisons -- baseline
if ( 'post' == $field->data_type && ! empty( $this->reciprocal ) && ! empty( $current_values ) && is_array( $current_values ) ) {
foreach ( $current_values as $reciprocal_post_id ) {
delete_post_meta( $reciprocal_post_id, $this->reciprocal, $field->data_id );
@@ -281,7 +281,7 @@ public function presave( Fieldmanager_Field $field, $value, $current_value ) {
}
}
- // phpcs:ignore WordPress.PHP.StrictComparisons.LooseComparison -- baseline
+ // phpcs:ignore Universal.Operators.StrictComparisons -- baseline
if ( $this->save_to_post_parent && 1 == $field->limit && 'post' == $field->data_type ) {
if ( ! wp_is_post_revision( $field->data_id ) ) {
Fieldmanager_Context_Post::safe_update_post(
@@ -331,7 +331,7 @@ public function preload_alter_values( Fieldmanager_Field $field, $values ) {
if ( $this->only_save_to_post_parent ) {
$post_parent = wp_get_post_parent_id( $field->data_id );
if ( $post_parent ) {
- // phpcs:ignore WordPress.PHP.StrictComparisons.LooseComparison -- baseline
+ // phpcs:ignore Universal.Operators.StrictComparisons -- baseline
return ( 1 == $field->limit && empty( $field->multiple ) ) ? $post_parent : array( $post_parent );
}
}
@@ -367,7 +367,6 @@ public function get_edit_link( $value ) {
esc_html__( 'Edit', 'fieldmanager' )
);
}
-
}
/**
@@ -446,7 +445,7 @@ function fm_url_to_post_id( $url ) {
foreach ( (array) $rewrite as $match => $query ) {
// If the requesting file is the anchor of the match, prepend it
// to the path info.
- // phpcs:ignore WordPress.PHP.StrictComparisons.LooseComparison -- baseline
+ // phpcs:ignore Universal.Operators.StrictComparisons -- baseline
if ( ! empty( $url ) && ( $url != $request ) && ( strpos( $match, $url ) === 0 ) ) {
$request_match = $url . '/' . $request;
}
diff --git a/php/datasource/class-fieldmanager-datasource-term.php b/php/datasource/class-fieldmanager-datasource-term.php
index 7006937de0..a8dae279cd 100644
--- a/php/datasource/class-fieldmanager-datasource-term.php
+++ b/php/datasource/class-fieldmanager-datasource-term.php
@@ -156,7 +156,7 @@ public function preload_alter_values( Fieldmanager_Field $field, $values ) {
}
if ( count( $terms ) > 0 ) {
- // phpcs:ignore WordPress.PHP.StrictComparisons.LooseComparison -- baseline
+ // phpcs:ignore Universal.Operators.StrictComparisons -- baseline
if ( 1 == $field->limit && empty( $field->multiple ) ) {
return $terms[0]->term_id;
} else {
@@ -390,8 +390,8 @@ protected function build_hierarchical_term_data( $parent_terms, $tax_args, $dept
if ( ! empty( $pattern ) ) {
$tax_args['search'] = $pattern;
}
- $child_terms = get_terms( $this->get_taxonomies(), $tax_args );
- // phpcs:ignore WordPress.PHP.StrictComparisons.LooseComparison -- baseline
+ $child_terms = get_terms( array_merge( $tax_args, array( 'taxonomy' => $this->get_taxonomies() ) ) );
+ // phpcs:ignore Universal.Operators.StrictComparisons -- baseline
if ( 0 == $this->taxonomy_hierarchical_depth || $depth + 1 < $this->taxonomy_hierarchical_depth ) {
if ( ! empty( $child_terms ) ) {
$stack = $this->build_hierarchical_term_data( $child_terms, $this->taxonomy_args, $depth + 1, $stack );
@@ -447,8 +447,8 @@ private function get_term( $term_id ) {
return $term;
} else {
$terms = get_terms(
- $this->get_taxonomies(),
array(
+ 'taxonomy' => $this->get_taxonomies(),
'hide_empty' => false,
'include' => array( $term_id ),
'number' => 1,
@@ -492,5 +492,4 @@ public function get_edit_link( $value ) {
esc_html__( 'Edit', 'fieldmanager' )
);
}
-
}
diff --git a/php/datasource/class-fieldmanager-datasource-user.php b/php/datasource/class-fieldmanager-datasource-user.php
index 8a73040b03..e1f9b2df11 100644
--- a/php/datasource/class-fieldmanager-datasource-user.php
+++ b/php/datasource/class-fieldmanager-datasource-user.php
@@ -96,29 +96,33 @@ public function __construct( $options = array() ) {
// phpcs:ignore WordPress.PHP.StrictInArray.MissingTrueStrict -- baseline
if ( ! in_array( $this->store_property, $this->allowed_store_properties ) ) {
throw new FM_Developer_Exception(
- sprintf(
- /* translators: 1: stored property, 2: allowed store properties */
- __( 'Store property %1$s is invalid. Must be one of %2$s.', 'fieldmanager' ),
- $this->store_property,
- implode( ', ', $this->allowed_store_properties )
+ esc_html(
+ sprintf(
+ /* translators: 1: stored property, 2: allowed store properties */
+ __( 'Store property %1$s is invalid. Must be one of %2$s.', 'fieldmanager' ),
+ $this->store_property,
+ implode( ', ', $this->allowed_store_properties )
+ )
)
);
}
- // phpcs:ignore WordPress.PHP.StrictComparisons.LooseComparison -- baseline
+ // phpcs:ignore Universal.Operators.StrictComparisons -- baseline
if ( ! empty( $this->reciprocal ) && 'ID' != $this->store_property ) {
- throw new FM_Developer_Exception( __( 'You cannot use reciprocal relationships with FM_Datasource_User if store_property is not set to ID.', 'fieldmanager' ) );
+ throw new FM_Developer_Exception( esc_html__( 'You cannot use reciprocal relationships with FM_Datasource_User if store_property is not set to ID.', 'fieldmanager' ) );
}
// Validate improper usage of display property.
// phpcs:ignore WordPress.PHP.StrictInArray.MissingTrueStrict -- baseline
if ( ! in_array( $this->display_property, $this->allowed_display_properties ) ) {
throw new FM_Developer_Exception(
- sprintf(
- /* translators: 1: display property, 2: allowed display properties */
- __( 'Display property %1$s is invalid. Must be one of %2$s.', 'fieldmanager' ),
- $this->display_property,
- implode( ', ', $this->allowed_display_properties )
+ esc_html(
+ sprintf(
+ /* translators: 1: display property, 2: allowed display properties */
+ __( 'Display property %1$s is invalid. Must be one of %2$s.', 'fieldmanager' ),
+ $this->display_property,
+ implode( ', ', $this->allowed_display_properties )
+ )
)
);
}
@@ -208,7 +212,7 @@ public function get_ajax_action() {
* @return string Sanitized values.
*/
public function presave_alter_values( Fieldmanager_Field $field, $values, $current_values ) {
- // phpcs:ignore WordPress.PHP.StrictComparisons.LooseComparison -- baseline
+ // phpcs:ignore Universal.Operators.StrictComparisons -- baseline
if ( 'post' != $field->data_type || ! $this->reciprocal || 'ID' != $this->store_property ) {
return $values;
}
@@ -265,7 +269,7 @@ public function presave( Fieldmanager_Field $field, $value, $current_value ) {
/* translators: %s: user id */
wp_die( esc_html( sprintf( __( 'Tried to refer to user "%s" which current user cannot edit.', 'fieldmanager' ), $v ) ) );
}
- // phpcs:ignore WordPress.PHP.StrictComparisons.LooseComparison -- baseline
+ // phpcs:ignore Universal.Operators.StrictComparisons -- baseline
if ( $this->reciprocal && 'ID' == $this->store_property ) {
call_user_func(
/**
diff --git a/php/datasource/class-fieldmanager-datasource.php b/php/datasource/class-fieldmanager-datasource.php
index 9392fe0d0d..75c8e3989f 100644
--- a/php/datasource/class-fieldmanager-datasource.php
+++ b/php/datasource/class-fieldmanager-datasource.php
@@ -98,11 +98,10 @@ public function __construct( $options = array() ) {
}
if ( get_class( $this ) === __CLASS__ && empty( $options ) ) {
- $message = __( 'Invalid options for Datasource; must use the options parameter to supply an array.', 'fieldmanager' );
if ( Fieldmanager_Field::$debug ) {
- throw new FM_Developer_Exception( $message );
+ throw new FM_Developer_Exception( esc_html__( 'Invalid options for Datasource; must use the options parameter to supply an array.', 'fieldmanager' ) );
} else {
- wp_die( esc_html( $message ), esc_html__( 'Invalid Datasource Options', 'fieldmanager' ) );
+ wp_die( esc_html__( 'Invalid options for Datasource; must use the options parameter to supply an array.', 'fieldmanager' ), esc_html__( 'Invalid Datasource Options', 'fieldmanager' ) );
}
}
@@ -209,7 +208,7 @@ public function autocomplete_search() {
* @param mixed $current_values Current value.
* @return string $values Cleaned value.
*/
- public function presave_alter_values( Fieldmanager_Field $field, $values, $current_values ) {
+ public function presave_alter_values( Fieldmanager_Field $field, $values, $current_values ) { // phpcs:ignore Generic.CodeAnalysis.UnusedFunctionParameter.FoundAfterLastUsed -- $current_values is required by the interface and used by subclasses
// nothing here, but some child classes need this method.
return $values;
}
@@ -233,7 +232,7 @@ public function preload_alter_values( Fieldmanager_Field $field, $values ) {
* @param mixed $current_value Current value.
* @return string $values Cleaned value.
*/
- public function presave( Fieldmanager_Field $field, $value, $current_value ) {
+ public function presave( Fieldmanager_Field $field, $value, $current_value ) { // phpcs:ignore Generic.CodeAnalysis.UnusedFunctionParameter.FoundAfterLastUsed -- $current_value is required by the interface and used by subclasses
if ( is_array( $value ) ) {
return array_map( 'sanitize_text_field', $value );
}
@@ -246,7 +245,7 @@ public function presave( Fieldmanager_Field $field, $value, $current_value ) {
* @param mixed $value The current value.
* @return string HTML string.
*/
- public function get_view_link( $value ) {
+ public function get_view_link( $value ) { // phpcs:ignore Generic.CodeAnalysis.UnusedFunctionParameter.Found -- $value is required by the interface and used by subclasses
return '';
}
@@ -256,8 +255,7 @@ public function get_view_link( $value ) {
* @param int|string $value The current value.
* @return string HTML string.
*/
- public function get_edit_link( $value ) {
+ public function get_edit_link( $value ) { // phpcs:ignore Generic.CodeAnalysis.UnusedFunctionParameter.Found -- $value is required by the interface and used by subclasses
return '';
}
-
}
diff --git a/php/util/class-fieldmanager-util-assets.php b/php/util/class-fieldmanager-util-assets.php
index 27ec652f89..36eecbcb86 100644
--- a/php/util/class-fieldmanager-util-assets.php
+++ b/php/util/class-fieldmanager-util-assets.php
@@ -212,7 +212,7 @@ public function add_script( $args ) {
}
// Set the default directory.
- // phpcs:ignore WordPress.PHP.StrictComparisons.LooseComparison -- baseline
+ // phpcs:ignore Universal.Operators.StrictComparisons -- baseline
if ( '' == $args['plugin_dir'] ) {
$args['plugin_dir'] = fieldmanager_get_baseurl(); // Allow overrides for child plugins.
}
@@ -272,7 +272,7 @@ public function add_style( $args ) {
}
// Set the default directory.
- // phpcs:ignore WordPress.PHP.StrictComparisons.LooseComparison -- baseline
+ // phpcs:ignore Universal.Operators.StrictComparisons -- baseline
if ( '' == $args['plugin_dir'] ) {
$args['plugin_dir'] = fieldmanager_get_baseurl(); // Allow overrides for child plugins.
}
diff --git a/php/util/class-fieldmanager-util-term-meta.php b/php/util/class-fieldmanager-util-term-meta.php
index a91e5ddd99..bc2fa8d7e0 100644
--- a/php/util/class-fieldmanager-util-term-meta.php
+++ b/php/util/class-fieldmanager-util-term-meta.php
@@ -292,7 +292,7 @@ public function add_term_meta_post( $term_id, $taxonomy ) {
);
// Check the result.
- // phpcs:ignore WordPress.PHP.StrictComparisons.LooseComparison -- baseline
+ // phpcs:ignore Universal.Operators.StrictComparisons -- baseline
if ( 0 != $result ) {
return $result;
} else {
@@ -327,7 +327,7 @@ public function collect_garbage( $term_id, $tt_id, $taxonomy ) {
*/
public function split_shared_term( $old_term_id, $new_term_id, $term_taxonomy_id, $taxonomy ) {
$post_id = $this->get_term_meta_post_id( $old_term_id, $taxonomy );
- // phpcs:ignore WordPress.PHP.StrictComparisons.LooseComparison -- baseline
+ // phpcs:ignore Universal.Operators.StrictComparisons -- baseline
if ( false != $post_id ) {
wp_update_post(
array(
@@ -422,4 +422,3 @@ function fm_update_term_meta( $term_id, $taxonomy, $meta_key, $meta_value, $meta
function fm_delete_term_meta( $term_id, $taxonomy, $meta_key, $meta_value = '' ) {
return Fieldmanager_Util_Term_Meta()->delete_term_meta( $term_id, $taxonomy, $meta_key, $meta_value );
}
-
diff --git a/php/util/class-fieldmanager-util-validation.php b/php/util/class-fieldmanager-util-validation.php
index 31a07adf24..c2f8b72174 100644
--- a/php/util/class-fieldmanager-util-validation.php
+++ b/php/util/class-fieldmanager-util-validation.php
@@ -107,7 +107,7 @@ private function setup( $form_id, $context ) {
// Add the appropriate action hook to finalize and output validation JS.
// Also determine where the jQuery validation script needs to be added.
- // phpcs:ignore WordPress.PHP.StrictComparisons.LooseComparison -- baseline
+ // phpcs:ignore Universal.Operators.StrictComparisons -- baseline
if ( 'page' == $context ) {
// Currently only the page context outputs to the frontend.
$action = 'wp_footer';
@@ -168,11 +168,8 @@ public function add_field( &$fm ) {
// This is not a rule available in jQuery validation.
/* translators: %s: validation key */
$fm->_invalid_definition( sprintf( __( 'The validation rule "%s" does not exist.', 'fieldmanager' ), $validation_key ) );
- } else {
- // This rule is valid so check for any messages.
- if ( isset( $fm->validation_messages[ $validation_key ] ) ) {
- $messages[ $validation_key ] = $fm->validation_messages[ $validation_key ];
- }
+ } elseif ( isset( $fm->validation_messages[ $validation_key ] ) ) {
+ $messages[ $validation_key ] = $fm->validation_messages[ $validation_key ];
}
}
}
@@ -180,7 +177,7 @@ public function add_field( &$fm ) {
// If this is the term context and the field is required, modify the original element to have the required property.
// This is necessary because it is the only way validation is supported on the term add form.
// Other validation methods won't work and will just fail gracefully.
- // phpcs:ignore WordPress.PHP.StrictComparisons.LooseComparison -- baseline
+ // phpcs:ignore Universal.Operators.StrictComparisons -- baseline
if ( 'term' == $this->context && isset( $fm->validation_rules['required'] ) && $fm->validation_rules['required'] ) {
$fm->required = true;
}
@@ -244,12 +241,12 @@ public function add_validation() {
// Add the Fieldmanager validation script and CSS.
// This is not done via the normal enqueue process since there is no way to know at that point if any fields will require validation.
// Doing this here avoids loading JS/CSS for validation if not in use.
- echo sprintf(
+ printf(
"
\n",
'stylesheet',
esc_url( fieldmanager_get_baseurl() )
);
- echo sprintf(
+ printf(
"<%s type='%s' src='%sjs/validation/fieldmanager-validation.js?ver=0.3'>\n",
'script',
'text/javascript',
@@ -257,7 +254,7 @@ public function add_validation() {
);
// Add the jQuery validation script.
- echo sprintf(
+ printf(
"<%s type='%s' src='%sjs/validation/jquery.validate.min.js'>\n",
'script',
'text/javascript',
@@ -265,7 +262,7 @@ public function add_validation() {
);
// Add the ignore, rules and messages to final validate method with form ID, wrap in script tags and output.
- echo sprintf(
+ printf(
"\t\n",
esc_attr( $this->form_id ),
esc_js( $ignore_js ),
diff --git a/phpcs.xml b/phpcs.xml
index 6bab965b5c..0f654fd773 100644
--- a/phpcs.xml
+++ b/phpcs.xml
@@ -12,6 +12,26 @@
+
+
+
+
+
+
+
+
+
+
@@ -47,7 +67,13 @@
-
+
+
+
+
+
+
+