From 49ce6deafbe92f729a3eeb6731e45b748a71315c Mon Sep 17 00:00:00 2001 From: Mike Letellier Date: Wed, 3 Dec 2025 14:38:59 -0400 Subject: [PATCH 1/2] Stop making useless casts --- .../controllers/FrmDashboardController.php | 3 ++- classes/controllers/FrmFormsController.php | 6 ++--- classes/controllers/FrmXMLController.php | 6 ++--- classes/helpers/FrmAppHelper.php | 8 +++---- classes/helpers/FrmEntriesHelper.php | 2 +- classes/helpers/FrmStylesHelper.php | 6 ++--- classes/helpers/FrmXMLHelper.php | 4 ++-- classes/models/FrmAddon.php | 3 ++- classes/models/FrmDb.php | 4 ++-- classes/models/FrmEntry.php | 22 +++++++++---------- classes/models/FrmEntryMeta.php | 2 +- classes/models/FrmFieldFormHtml.php | 2 +- classes/models/FrmFieldOption.php | 2 +- classes/models/FrmForm.php | 4 ++-- classes/models/FrmMigrate.php | 2 +- classes/models/FrmNotification.php | 2 +- classes/models/FrmPersonalData.php | 8 +++---- classes/models/FrmStyle.php | 2 +- classes/models/FrmTableHTMLGenerator.php | 3 +-- classes/models/fields/FrmFieldType.php | 2 +- classes/widgets/FrmShowForm.php | 2 +- phpstan.neon | 1 - 22 files changed, 48 insertions(+), 48 deletions(-) diff --git a/classes/controllers/FrmDashboardController.php b/classes/controllers/FrmDashboardController.php index c39a18719a..4e7d11eedd 100644 --- a/classes/controllers/FrmDashboardController.php +++ b/classes/controllers/FrmDashboardController.php @@ -467,7 +467,7 @@ private static function inbox_clean_messages_cta( $cta ) { /** * Get the embed YouTube video from YouTube feed api. If there are 0 entries we show the welcome video otherwise latest video from FF YouTube channel is displayed. * - * @param int $entries_count The total entries available. + * @param int|string $entries_count The total entries available. * * @return string|null The YouTube video ID. */ @@ -488,6 +488,7 @@ private static function get_youtube_embed_video( $entries_count ) { if ( isset( $featured_video[0] ) ) { return $featured_video[0]['video-id']; } + return $featured_video['video-id'] ?? null; } diff --git a/classes/controllers/FrmFormsController.php b/classes/controllers/FrmFormsController.php index 6deca8b652..386fdd4dbe 100644 --- a/classes/controllers/FrmFormsController.php +++ b/classes/controllers/FrmFormsController.php @@ -1291,9 +1291,9 @@ public static function hidden_columns( $hidden_columns ) { } /** - * @param mixed $save - * @param string $option - * @param int $value + * @param mixed $save + * @param string $option + * @param int|string $value * * @return mixed */ diff --git a/classes/controllers/FrmXMLController.php b/classes/controllers/FrmXMLController.php index 1463779254..3810a1d81b 100644 --- a/classes/controllers/FrmXMLController.php +++ b/classes/controllers/FrmXMLController.php @@ -460,8 +460,8 @@ public static function export_xml() { } /** - * @param string[] $type - * @param array $args + * @param array|string $type + * @param array $args * * @psalm-param array{ids?: mixed} $args * @@ -608,7 +608,7 @@ public static function get_parent_terms_slugs( $terms ) { /** * Prepare the types array. * - * @param array $type + * @param array|string $type * * @return void */ diff --git a/classes/helpers/FrmAppHelper.php b/classes/helpers/FrmAppHelper.php index b31671dd20..ad46049843 100644 --- a/classes/helpers/FrmAppHelper.php +++ b/classes/helpers/FrmAppHelper.php @@ -2892,10 +2892,10 @@ public static function setup_edit_vars( $record, $table, $fields = '', $default } /** - * @param array $fields - * @param object $record - * @param array $values - * @param array $args + * @param array|string $fields + * @param object $record + * @param array $values + * @param array $args * * @return void */ diff --git a/classes/helpers/FrmEntriesHelper.php b/classes/helpers/FrmEntriesHelper.php index 1f180c3165..e3913a3b5d 100644 --- a/classes/helpers/FrmEntriesHelper.php +++ b/classes/helpers/FrmEntriesHelper.php @@ -24,7 +24,7 @@ class FrmEntriesHelper { const DRAFT_ENTRY_STATUS = 1; /** - * @param array $fields + * @param mixed $fields * @param object|string $form * @param bool $reset * @param array $args diff --git a/classes/helpers/FrmStylesHelper.php b/classes/helpers/FrmStylesHelper.php index f3d91229a1..7ac733c808 100644 --- a/classes/helpers/FrmStylesHelper.php +++ b/classes/helpers/FrmStylesHelper.php @@ -759,9 +759,9 @@ function ( $key ) use ( $defaults, $font_size, $base_font_size, &$settings ) { * * @since 6.14 * - * @param string $key Setting key. - * @param int $value Base font size value. - * @param array $defaults Default style settings. + * @param string $key Setting key. + * @param int|string $value Base font size value. + * @param array $defaults Default style settings. * * @return float */ diff --git a/classes/helpers/FrmXMLHelper.php b/classes/helpers/FrmXMLHelper.php index b47a204f75..ddcdca0f69 100644 --- a/classes/helpers/FrmXMLHelper.php +++ b/classes/helpers/FrmXMLHelper.php @@ -773,8 +773,8 @@ private static function migrate_placeholders( &$f ) { * * @since 4.0 * - * @param array $field - * @param string $type + * @param array|object $field + * @param string $type * * @return array */ diff --git a/classes/models/FrmAddon.php b/classes/models/FrmAddon.php index 9facde8898..0f1d13e7eb 100644 --- a/classes/models/FrmAddon.php +++ b/classes/models/FrmAddon.php @@ -742,7 +742,8 @@ private function last_checked() { // Get string into array for existing values. $last_checked = array( 'time' => $last_checked ); } - return $last_checked ? (array) $last_checked : array(); + + return $last_checked ? $last_checked : array(); } /** diff --git a/classes/models/FrmDb.php b/classes/models/FrmDb.php index 4726f647c5..ec3148299f 100644 --- a/classes/models/FrmDb.php +++ b/classes/models/FrmDb.php @@ -677,8 +677,8 @@ public static function prepend_and_or_where( $starts_with = ' WHERE ', $where = * * @since 2.05.06 * - * @param array $settings - * @param string $group + * @param array|object $settings + * @param string $group * * @return int|WP_Error */ diff --git a/classes/models/FrmEntry.php b/classes/models/FrmEntry.php index f1c3ca0e51..c07e83620b 100644 --- a/classes/models/FrmEntry.php +++ b/classes/models/FrmEntry.php @@ -721,7 +721,7 @@ public static function getAll( $where, $order_by = '', $limit = '', $meta = fals } /** - * @param int $field_id + * @param int|string $field_id * * @return string */ @@ -1052,7 +1052,7 @@ private static function insert_entry_into_database( $new_values ) { * * @since 2.0.16 * - * @param int $entry_id + * @param int|string $entry_id * * @return void */ @@ -1071,8 +1071,8 @@ private static function add_new_entry_to_frm_vars( $entry_id ) { * * @since 2.0.16 * - * @param array $values - * @param int $entry_id + * @param array $values + * @param int|string $entry_id * * @return void */ @@ -1170,9 +1170,9 @@ private static function after_insert_entry_in_database( $values, $new_values, $e * * @since 2.0.16 * - * @param int $id - * @param array $values - * @param string $update_type + * @param int|string $id + * @param array $values + * @param string $update_type * * @return bool $update */ @@ -1239,10 +1239,10 @@ private static function package_entry_to_update( $id, $values ) { * * @since 2.0.16 * - * @param bool|int $query_results - * @param int $id - * @param array $values - * @param array $new_values + * @param bool|int $query_results + * @param int|string $id + * @param array $values + * @param array $new_values * * @return void */ diff --git a/classes/models/FrmEntryMeta.php b/classes/models/FrmEntryMeta.php index abb3814676..4b86d81c41 100644 --- a/classes/models/FrmEntryMeta.php +++ b/classes/models/FrmEntryMeta.php @@ -392,7 +392,7 @@ public static function get_entry_meta_info( $entry_id ) { * @param string $limit * @param bool $stripslashes * - * @return array + * @return mixed */ public static function getAll( $where = array(), $order_by = '', $limit = '', $stripslashes = false ) { global $wpdb; diff --git a/classes/models/FrmFieldFormHtml.php b/classes/models/FrmFieldFormHtml.php index f596671c88..03ae036d31 100644 --- a/classes/models/FrmFieldFormHtml.php +++ b/classes/models/FrmFieldFormHtml.php @@ -29,7 +29,7 @@ class FrmFieldFormHtml { private $field_id; /** - * @var array + * @var array|object */ private $form = array(); diff --git a/classes/models/FrmFieldOption.php b/classes/models/FrmFieldOption.php index 792e0ee627..124b3f5662 100644 --- a/classes/models/FrmFieldOption.php +++ b/classes/models/FrmFieldOption.php @@ -93,7 +93,7 @@ public function print_single_option( $selected_value, $truncate, $use_value_as_l } if ( $use_value_as_label && '' === trim( $this->option_label ) ) { - $label = '' !== (string) $this->saved_value ? $this->saved_value : FrmAppHelper::get_no_label_text(); + $label = '' !== $this->saved_value ? $this->saved_value : FrmAppHelper::get_no_label_text(); } else { $label = $this->option_label; } diff --git a/classes/models/FrmForm.php b/classes/models/FrmForm.php index 468e589f16..a22cdde64c 100644 --- a/classes/models/FrmForm.php +++ b/classes/models/FrmForm.php @@ -831,7 +831,7 @@ public static function get_id_by_key( $key ) { /** * @since 3.0 * - * @param int $id + * @param int|string $id * * @return string form key */ @@ -1007,7 +1007,7 @@ public static function get_count() { return $counts; } - $results = (array) FrmDb::get_results( + $results = FrmDb::get_results( 'frm_forms', array( 'or' => 1, diff --git a/classes/models/FrmMigrate.php b/classes/models/FrmMigrate.php index fe26222837..58d1086a6e 100644 --- a/classes/models/FrmMigrate.php +++ b/classes/models/FrmMigrate.php @@ -554,7 +554,7 @@ private function migrate_to_86() { $fields = $this->get_fields_with_size(); - foreach ( (array) $fields as $f ) { + foreach ( $fields as $f ) { FrmAppHelper::unserialize_or_decode( $f->field_options ); $size = $f->field_options['size']; $this->maybe_convert_migrated_size( $size ); diff --git a/classes/models/FrmNotification.php b/classes/models/FrmNotification.php index f8b5df9926..337e8f2b31 100644 --- a/classes/models/FrmNotification.php +++ b/classes/models/FrmNotification.php @@ -69,7 +69,7 @@ private static function print_recipients( $atts ) { $sent_to = array_filter( $sent_to ); $temp = str_replace( '<', '<', $sent_to ); - echo ' ' . FrmAppHelper::kses( implode( ', ', (array) $temp ) ); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped + echo ' ' . FrmAppHelper::kses( implode( ', ', $temp ) ); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped } } } diff --git a/classes/models/FrmPersonalData.php b/classes/models/FrmPersonalData.php index 61e74b43dd..310421c7a2 100644 --- a/classes/models/FrmPersonalData.php +++ b/classes/models/FrmPersonalData.php @@ -76,7 +76,7 @@ public function export_data( $email, $page = 1 ) { return $data_to_export; } - foreach ( (array) $entries as $entry ) { + foreach ( $entries as $entry ) { $data_to_export['data'][] = array( 'group_id' => 'formidable', 'group_label' => __( 'Form Submissions', 'formidable' ), @@ -117,7 +117,7 @@ public function erase_data( $email, $page = 1 ) { // TODO: Add an option to anonymize the entries with wp_privacy_anonymize_data( 'email', 'e@e.com' ); - foreach ( (array) $entries as $entry ) { + foreach ( $entries as $entry ) { $removed = FrmEntry::destroy( $entry ); if ( $removed ) { @@ -138,7 +138,7 @@ public function erase_data( $email, $page = 1 ) { * * @param string $email * - * @return array of entry ids + * @return array Entry ids */ private function get_user_entries( $email ) { $query_args = array( @@ -159,7 +159,7 @@ private function get_user_entries( $email ) { $entries_by_user = FrmDb::get_col( 'frm_items', array( 'user_id' => $user->ID ), 'id', $query_args ); - $entry_ids = array_merge( (array) $entries_by_user, (array) $entries_by_email ); + $entry_ids = array_merge( $entries_by_user, $entries_by_email ); $entry_ids = array_unique( array_filter( $entry_ids ) ); return $entry_ids; diff --git a/classes/models/FrmStyle.php b/classes/models/FrmStyle.php index 55245843b2..ffbe5a222c 100644 --- a/classes/models/FrmStyle.php +++ b/classes/models/FrmStyle.php @@ -844,7 +844,7 @@ public function force_balanced_quotation( $value ) { * * @since 6.14 * - * @param int $style_id The post type "frm_styles" ID. + * @param int|string $style_id The post type "frm_styles" ID. * * @return string The json encoded template data */ diff --git a/classes/models/FrmTableHTMLGenerator.php b/classes/models/FrmTableHTMLGenerator.php index 2d0e4f3cd5..46450237cc 100644 --- a/classes/models/FrmTableHTMLGenerator.php +++ b/classes/models/FrmTableHTMLGenerator.php @@ -94,8 +94,7 @@ class FrmTableHTMLGenerator { * @param array $atts */ public function __construct( $type, $atts = array() ) { - - $this->type = (string) $type; + $this->type = $type; if ( isset( $atts['cell_padding'] ) ) { $this->cell_padding = $atts['cell_padding']; diff --git a/classes/models/fields/FrmFieldType.php b/classes/models/fields/FrmFieldType.php index bf2c7e0a58..512c09ae74 100644 --- a/classes/models/fields/FrmFieldType.php +++ b/classes/models/fields/FrmFieldType.php @@ -166,7 +166,7 @@ protected function set_field_id() { /** * @param string $column * - * @return array|string + * @return array|object|string */ public function get_field_column( $column ) { $field_val = ''; diff --git a/classes/widgets/FrmShowForm.php b/classes/widgets/FrmShowForm.php index ebbb5f5035..210d0dff08 100644 --- a/classes/widgets/FrmShowForm.php +++ b/classes/widgets/FrmShowForm.php @@ -63,7 +63,7 @@ public function form( $instance ) { 'form' => false, 'description' => false, ); - $instance = wp_parse_args( (array) $instance, $defaults ); + $instance = wp_parse_args( $instance, $defaults ); ?>