diff --git a/classes/controllers/FrmAddonsController.php b/classes/controllers/FrmAddonsController.php index 7e765d22f4..6956970b57 100644 --- a/classes/controllers/FrmAddonsController.php +++ b/classes/controllers/FrmAddonsController.php @@ -307,7 +307,6 @@ protected static function get_api_addons() { */ public static function get_addons_count() { $addons = self::get_api_addons(); - return count( $addons ); } diff --git a/classes/controllers/FrmEntriesController.php b/classes/controllers/FrmEntriesController.php index 247c586b18..61dc553499 100644 --- a/classes/controllers/FrmEntriesController.php +++ b/classes/controllers/FrmEntriesController.php @@ -424,7 +424,6 @@ public static function update_hidden_cols( $meta_id, $object_id, $meta_key, $met */ private static function hidden_column_key( $menu_name = '' ) { $base = self::base_column_key( $menu_name ); - return 'manage' . $base . 'columnshidden'; } @@ -835,7 +834,6 @@ public static function prepare_redirect_url( $url ) { */ public static function delete_entry_before_redirect( $url, $form, $atts ) { self::_delete_entry( $atts['id'], $form ); - return $url; } diff --git a/classes/controllers/FrmFieldsController.php b/classes/controllers/FrmFieldsController.php index 022e6b1fae..bd78bf3d37 100644 --- a/classes/controllers/FrmFieldsController.php +++ b/classes/controllers/FrmFieldsController.php @@ -150,7 +150,6 @@ public static function duplicate() { */ public static function get_field_array_from_id( $field_id ) { $field = FrmField::getOne( $field_id ); - return FrmFieldsHelper::setup_edit_vars( $field ); } diff --git a/classes/controllers/FrmFormsController.php b/classes/controllers/FrmFormsController.php index a925446ab1..9a15f06350 100644 --- a/classes/controllers/FrmFormsController.php +++ b/classes/controllers/FrmFormsController.php @@ -85,7 +85,6 @@ public static function logic_tip() { */ public static function prevent_divi_conflict( $shortcodes ) { $shortcodes[] = 'formidable'; - return $shortcodes; } @@ -1635,7 +1634,6 @@ private static function get_settings_tabs( $values ) { */ public static function advanced_settings( $values ) { $first_h3 = 'frm_first_h3'; - include FrmAppHelper::plugin_path() . '/classes/views/frm-forms/settings-advanced.php'; } @@ -2236,7 +2234,6 @@ public static function rename_form() { */ public static function json_error( $errors ) { $errors['json'] = __( 'Abnormal HTML characters prevented your form from saving correctly', 'formidable' ); - return $errors; } @@ -2623,7 +2620,6 @@ private static function get_saved_errors( $form, $params ) { */ public static function just_created_entry( $form_id ) { global $frm_vars; - return isset( $frm_vars['created_entries'] ) && isset( $frm_vars['created_entries'][ $form_id ] ) && isset( $frm_vars['created_entries'][ $form_id ]['entry_id'] ) ? $frm_vars['created_entries'][ $form_id ]['entry_id'] : 0; } diff --git a/classes/controllers/FrmSettingsController.php b/classes/controllers/FrmSettingsController.php index ffe3110496..63faf21945 100644 --- a/classes/controllers/FrmSettingsController.php +++ b/classes/controllers/FrmSettingsController.php @@ -305,7 +305,6 @@ public static function maybe_render_currency_selector( $frm_settings ) { */ public static function message_settings() { $frm_settings = FrmAppHelper::get_settings(); - include FrmAppHelper::plugin_path() . '/classes/views/frm-settings/messages.php'; } @@ -330,7 +329,6 @@ public static function captcha_settings() { */ public static function email_settings() { $frm_settings = FrmAppHelper::get_settings(); - include FrmAppHelper::plugin_path() . '/classes/views/frm-settings/email/email-styles.php'; } @@ -369,7 +367,6 @@ public static function payments_settings() { */ public static function misc_settings() { $frm_settings = FrmAppHelper::get_settings(); - include FrmAppHelper::plugin_path() . '/classes/views/frm-settings/misc.php'; } diff --git a/classes/controllers/FrmStylesController.php b/classes/controllers/FrmStylesController.php index b6a66fa9e0..d551fdcc4f 100644 --- a/classes/controllers/FrmStylesController.php +++ b/classes/controllers/FrmStylesController.php @@ -1211,7 +1211,6 @@ public static function enqueue_style() { */ public static function get_style_opts() { $frm_style = new FrmStyle(); - return $frm_style->get_all(); } @@ -1325,7 +1324,6 @@ public static function show_entry_styles( $default_styles ) { */ public static function &important_style( $important, $field ) { $important = self::get_style_val( 'important_style', $field['form_id'] ); - return $important; } diff --git a/classes/factories/FrmFieldFactory.php b/classes/factories/FrmFieldFactory.php index ccf5d6991a..113fe1f205 100644 --- a/classes/factories/FrmFieldFactory.php +++ b/classes/factories/FrmFieldFactory.php @@ -74,7 +74,6 @@ public static function get_field_object( $field ) { */ public static function get_field_type( $field_type, $field = 0 ) { $class = self::get_field_type_class( $field_type ); - return empty( $class ) ? new FrmFieldDefault( $field, $field_type ) : new $class( $field, $field_type ); } @@ -137,7 +136,6 @@ public static function field_has_html( $type ) { */ public static function field_has_property( $type, $property ) { $field = self::get_field_type( $type ); - return $field->{$property}; } } diff --git a/classes/helpers/FrmAppHelper.php b/classes/helpers/FrmAppHelper.php index a4c8370ab8..f6eda592c6 100644 --- a/classes/helpers/FrmAppHelper.php +++ b/classes/helpers/FrmAppHelper.php @@ -295,7 +295,6 @@ public static function get_settings( $args = array() ) { */ public static function get_menu_name() { $frm_settings = self::get_settings(); - return FrmAddonsController::is_license_expired() || ! self::pro_is_installed() ? 'Formidable' : $frm_settings->menu; } @@ -1050,7 +1049,6 @@ private static function decode_amp( &$string ) { */ public static function kses( $value, $allowed = array() ) { $allowed_html = self::allowed_html( $allowed ); - return wp_kses( $value, $allowed_html ); } @@ -3221,7 +3219,6 @@ private static function add_time_to_date( $time_format, $date ) { */ public static function get_localized_date( $date_format, $date ) { $date = get_date_from_gmt( $date ); - return date_i18n( $date_format, strtotime( $date ) ); } @@ -4890,7 +4887,6 @@ public static function dismiss_warning_message( $option = '' ) { */ public static function copy_for_lite_license() { $message = __( 'You\'re using Formidable Forms Lite - no license needed. Enjoy!', 'formidable' ) . ' 🙂'; - return apply_filters( 'frm_license_type_text', $message ); } diff --git a/classes/helpers/FrmEntriesHelper.php b/classes/helpers/FrmEntriesHelper.php index e190713f73..3123be8cb9 100644 --- a/classes/helpers/FrmEntriesHelper.php +++ b/classes/helpers/FrmEntriesHelper.php @@ -908,7 +908,6 @@ public static function get_entry_status( $status ) { */ public static function get_entry_status_label( $status ) { $statuses = self::get_entry_statuses(); - return $statuses[ self::get_entry_status( $status ) ]; } diff --git a/classes/helpers/FrmFieldsHelper.php b/classes/helpers/FrmFieldsHelper.php index fe6b6c783f..2cdaa600b8 100644 --- a/classes/helpers/FrmFieldsHelper.php +++ b/classes/helpers/FrmFieldsHelper.php @@ -71,7 +71,6 @@ public static function get_html_id( $field, $plus = '' ) { */ public static function setup_edit_vars( $field, $doing_ajax = false ) { $values = self::field_object_to_array( $field ); - return apply_filters( 'frm_setup_edit_field_vars', $values, array( 'doing_ajax' => $doing_ajax ) ); } @@ -186,7 +185,6 @@ private static function prepare_front_field( &$field_array, $field, $args ) { */ public static function get_default_field_options( $type ) { $field_type = FrmFieldFactory::get_field_type( $type ); - return $field_type->get_default_field_options(); } @@ -418,7 +416,6 @@ private static function prepare_field_options_for_display( &$field_array, $field */ public static function get_default_field( $type ) { $field_type = FrmFieldFactory::get_field_type( $type ); - return $field_type->get_new_field_defaults(); } @@ -764,7 +761,6 @@ private static function get_default_value_type( $field ) { */ public static function get_value_from_array( $opt, $opt_key, $field ) { $opt = apply_filters( 'frm_field_value_saved', $opt, $opt_key, $field ); - return FrmFieldsController::check_value( $opt, $opt_key, $field ); } @@ -777,7 +773,6 @@ public static function get_value_from_array( $opt, $opt_key, $field ) { */ public static function get_label_from_array( $opt, $opt_key, $field ) { $opt = apply_filters( 'frm_field_label_seen', $opt, $opt_key, $field ); - return FrmFieldsController::check_label( $opt ); } diff --git a/classes/helpers/FrmFormsHelper.php b/classes/helpers/FrmFormsHelper.php index 9d4089a5d4..9860eb0bba 100644 --- a/classes/helpers/FrmFormsHelper.php +++ b/classes/helpers/FrmFormsHelper.php @@ -31,7 +31,6 @@ public static function form_error_class() { */ public static function get_direct_link( $key, $form = false ) { $target_url = esc_url( admin_url( 'admin-ajax.php?action=frm_forms_preview&form=' . $key ) ); - return apply_filters( 'frm_direct_link', $target_url, $key, $form ); } @@ -1101,7 +1100,6 @@ private static function form_has_top_labels( $form ) { */ private static function field_has_top_label( $field, $form ) { $label_position = FrmFieldsHelper::label_position( $field['label'], $field, $form ); - return in_array( $label_position, array( 'top', 'inside', 'hidden' ), true ); } @@ -1340,7 +1338,6 @@ private static function get_form_name_from_data( $data ) { */ public static function delete_trash_link( $id, $status, $length = 'label' ) { $link_details = self::delete_trash_info( $id, $status ); - return self::format_link_html( $link_details, $length ); } diff --git a/classes/helpers/FrmListHelper.php b/classes/helpers/FrmListHelper.php index da0da42efc..7c768f42b2 100644 --- a/classes/helpers/FrmListHelper.php +++ b/classes/helpers/FrmListHelper.php @@ -752,7 +752,6 @@ private function link_label( $link ) { private function current_url() { $current_url = set_url_scheme( 'http://' . FrmAppHelper::get_server_value( 'HTTP_HOST' ) . FrmAppHelper::get_server_value( 'REQUEST_URI' ) ); - return remove_query_arg( array( 'hotkeys_highlight_last', 'hotkeys_highlight_first' ), $current_url ); } diff --git a/classes/helpers/FrmStylesHelper.php b/classes/helpers/FrmStylesHelper.php index d9aa2b6bb8..e50046efb7 100644 --- a/classes/helpers/FrmStylesHelper.php +++ b/classes/helpers/FrmStylesHelper.php @@ -281,7 +281,6 @@ private static function get_rgb_array_from_hex( $hex ) { */ public static function hex2rgba( $hex, $a ) { $rgb = self::hex2rgb( $hex ); - return 'rgba(' . $rgb . ',' . $a . ')'; } diff --git a/classes/helpers/FrmSubmitHelper.php b/classes/helpers/FrmSubmitHelper.php index 775000e178..9148e558ce 100644 --- a/classes/helpers/FrmSubmitHelper.php +++ b/classes/helpers/FrmSubmitHelper.php @@ -89,7 +89,6 @@ private static function has_submit_field_in_list( $fields ) { */ public static function get_current_action_from_global_var( $form_id ) { global $frm_vars; - return $frm_vars['form_params'][ $form_id ]['action'] ?? 'create'; } diff --git a/classes/models/FrmAddon.php b/classes/models/FrmAddon.php index 97deff86cb..b409f72267 100644 --- a/classes/models/FrmAddon.php +++ b/classes/models/FrmAddon.php @@ -139,7 +139,6 @@ public static function load_hooks() { */ public function insert_installed_addon( $plugins ) { $plugins[ $this->plugin_slug ] = $this; - return $plugins; } @@ -150,7 +149,6 @@ public function insert_installed_addon( $plugins ) { */ public static function get_addon( $plugin_slug ) { $plugins = apply_filters( 'frm_installed_addons', array() ); - return $plugins[ $plugin_slug ] ?? false; } @@ -303,7 +301,6 @@ public function activate_defined_license() { */ public function get_defined_license() { $constant_name = 'FRM_' . strtoupper( $this->plugin_slug ) . '_LICENSE'; - return defined( $constant_name ) ? constant( $constant_name ) : false; } diff --git a/classes/models/FrmDb.php b/classes/models/FrmDb.php index 615fb9a349..7e0a39974c 100644 --- a/classes/models/FrmDb.php +++ b/classes/models/FrmDb.php @@ -231,7 +231,6 @@ private static function add_query_placeholder( $key, $value, &$where ) { */ public static function get_count( $table, $where = array(), $args = array() ) { $count = self::get_var( $table, $where, 'COUNT(*)', $args ); - return (int) $count; } @@ -534,7 +533,6 @@ private static function esc_query_args( &$args ) { */ public static function esc_like( $term ) { global $wpdb; - return $wpdb->esc_like( $term ); } @@ -635,7 +633,6 @@ public static function esc_limit( $limit ) { */ public static function prepare_array_values( $array, $type = '%s' ) { $placeholders = array_fill( 0, count( $array ), $type ); - return implode( ', ', $placeholders ); } diff --git a/classes/models/FrmEmail.php b/classes/models/FrmEmail.php index a76107e10b..a51c1d9421 100644 --- a/classes/models/FrmEmail.php +++ b/classes/models/FrmEmail.php @@ -662,7 +662,6 @@ private function prepare_email_setting( $value, $user_id_args ) { */ private function explode_emails( $emails ) { $emails = ! empty( $emails ) ? preg_split( '/(,|;)/', $emails ) : ''; - return is_array( $emails ) ? array_map( 'trim', $emails ) : trim( $emails ); } diff --git a/classes/models/FrmEntry.php b/classes/models/FrmEntry.php index daddd9a4f8..85db11037a 100644 --- a/classes/models/FrmEntry.php +++ b/classes/models/FrmEntry.php @@ -1261,7 +1261,6 @@ public static function update_entry_from_xml( $id, $values ) { */ public static function get_id_by_key( $key ) { $entry_id = FrmDb::get_var( 'frm_items', array( 'item_key' => sanitize_title( $key ) ) ); - return (int) $entry_id; } diff --git a/classes/models/FrmEntryFormatter.php b/classes/models/FrmEntryFormatter.php index 69b18f96cb..c0c318e60b 100644 --- a/classes/models/FrmEntryFormatter.php +++ b/classes/models/FrmEntryFormatter.php @@ -944,7 +944,6 @@ protected function prepare_display_value_for_html_table( $display_value, $field_ */ protected function prepare_display_value_for_plain_text_content( $display_value ) { $display_value = $this->flatten_array( $display_value ); - return $this->strip_html( $display_value ); } diff --git a/classes/models/FrmEntryValidate.php b/classes/models/FrmEntryValidate.php index fda938daae..9b183823f0 100644 --- a/classes/models/FrmEntryValidate.php +++ b/classes/models/FrmEntryValidate.php @@ -617,7 +617,6 @@ private static function is_honeypot_spam( $values ) { */ private static function is_spam_bot() { $ip = FrmAppHelper::get_ip_address(); - return empty( $ip ); } @@ -628,7 +627,6 @@ private static function is_spam_bot() { */ private static function is_akismet_spam( $values ) { global $wpcom_api_key; - return is_callable( 'Akismet::http_post' ) && ( get_option( 'wordpress_api_key' ) || $wpcom_api_key ) && self::akismet( $values ); } @@ -639,7 +637,6 @@ private static function is_akismet_spam( $values ) { */ private static function is_akismet_enabled_for_user( $form_id ) { $form = FrmForm::getOne( $form_id ); - return ! empty( $form->options['akismet'] ) && ( $form->options['akismet'] !== 'logged' || ! is_user_logged_in() ); } diff --git a/classes/models/FrmField.php b/classes/models/FrmField.php index 4d98ecf147..59bb72229f 100644 --- a/classes/models/FrmField.php +++ b/classes/models/FrmField.php @@ -1517,7 +1517,6 @@ public static function get_option_in_object( $field, $option ) { */ public static function is_repeating_field( $field ) { $is_repeating_field = is_array( $field ) ? 'divider' === $field['type'] : 'divider' === $field->type; - return $is_repeating_field && self::is_option_true( $field, 'repeat' ); } @@ -1528,7 +1527,6 @@ public static function is_repeating_field( $field ) { */ public static function get_id_by_key( $key ) { $id = FrmDb::get_var( 'frm_fields', array( 'field_key' => sanitize_title( $key ) ) ); - return (int) $id; } @@ -1548,7 +1546,6 @@ public static function get_key_by_id( $id ) { */ public static function is_image( $field ) { $type = self::get_field_type( $field ); - return ( $type === 'url' && self::get_option( $field, 'show_image' ) ); } @@ -1619,7 +1616,6 @@ public static function is_field_type( $field, $is_type ) { */ public static function is_combo_field( $field ) { $field_type_obj = FrmFieldFactory::get_field_factory( $field ); - return ! empty( $field_type_obj->is_combo_field ); } } diff --git a/classes/models/FrmFieldFormHtml.php b/classes/models/FrmFieldFormHtml.php index 2e8f4e32d4..db23269a93 100644 --- a/classes/models/FrmFieldFormHtml.php +++ b/classes/models/FrmFieldFormHtml.php @@ -445,7 +445,6 @@ private function replace_shortcodes_with_atts() { */ private function replace_input_shortcode( $shortcode_atts ) { $shortcode_atts = $this->prepare_input_shortcode_atts( $shortcode_atts ); - return $this->field_obj->include_front_field_input( $this->pass_args, $shortcode_atts ); } diff --git a/classes/models/FrmForm.php b/classes/models/FrmForm.php index 57cbc9f9c9..ff86bfc8d5 100644 --- a/classes/models/FrmForm.php +++ b/classes/models/FrmForm.php @@ -1174,7 +1174,6 @@ public static function get_admin_params( $form = null ) { */ public static function get_current_form_id( $default_form = 'none' ) { $form = 'first' === $default_form ? self::get_current_form() : self::maybe_get_current_form(); - return $form ? $form->id : 0; } @@ -1291,7 +1290,6 @@ public static function &is_visible_to_user( $form ) { */ public static function show_submit( $form ) { $show = ( ! $form->is_template && $form->status === 'published' && ! FrmAppHelper::is_admin() ); - return apply_filters( 'frm_show_submit_button', $show, $form ); } diff --git a/classes/models/FrmFormAction.php b/classes/models/FrmFormAction.php index ae1209eaf9..3772271039 100644 --- a/classes/models/FrmFormAction.php +++ b/classes/models/FrmFormAction.php @@ -94,7 +94,6 @@ public function update( $new_instance, $old_instance ) { */ public function form( $instance, $args = array() ) { echo '

' . esc_html__( 'There are no options for this action.', 'formidable' ) . '

'; - return 'noform'; } @@ -562,7 +561,6 @@ protected function maybe_update_status( $new_instance, $old_instance ) { */ public function save_settings( $settings ) { self::clear_cache(); - return FrmDb::save_settings( $settings, 'frm_actions' ); } diff --git a/classes/models/FrmPersonalData.php b/classes/models/FrmPersonalData.php index 83c92715fa..eb58aa13d8 100644 --- a/classes/models/FrmPersonalData.php +++ b/classes/models/FrmPersonalData.php @@ -166,7 +166,6 @@ private function get_user_entries( $email ) { */ private function get_current_page() { $start = ( $this->page - 1 ) * $this->limit; - return FrmDb::esc_limit( $start . ',' . $this->limit ); } diff --git a/classes/models/fields/FrmFieldTextarea.php b/classes/models/fields/FrmFieldTextarea.php index 84ab644e4a..d735a4eec6 100644 --- a/classes/models/fields/FrmFieldTextarea.php +++ b/classes/models/fields/FrmFieldTextarea.php @@ -74,7 +74,6 @@ public function show_on_form_builder( $name = '' ) { protected function prepare_display_value( $value, $atts ) { FrmFieldsHelper::run_wpautop( $atts, $value ); - return $value; } diff --git a/classes/models/fields/FrmFieldType.php b/classes/models/fields/FrmFieldType.php index 1c20d993d3..1cc0934615 100644 --- a/classes/models/fields/FrmFieldType.php +++ b/classes/models/fields/FrmFieldType.php @@ -371,7 +371,6 @@ protected function builder_text_field( $name = '' ) { */ protected function html_name( $name = '' ) { $prefix = empty( $name ) ? 'item_meta' : $name; - return $prefix . '[' . $this->get_field_column( 'id' ) . ']'; } @@ -475,7 +474,6 @@ public function translatable_strings() { */ public function form_builder_classes( $display_type ) { $classes = 'form-field edit_form_item frm_field_box frm_top_container frm_not_divider edit_field_type_' . $display_type; - return $this->alter_builder_classes( $classes ); } @@ -934,7 +932,6 @@ protected function extra_field_opts() { */ public function prepare_front_field( $values, $atts ) { $values['value'] = $this->prepare_field_value( $values['value'], $atts ); - return $values; } diff --git a/classes/models/fields/FrmFieldUserID.php b/classes/models/fields/FrmFieldUserID.php index 594726bc9d..d6361aaa99 100644 --- a/classes/models/fields/FrmFieldUserID.php +++ b/classes/models/fields/FrmFieldUserID.php @@ -97,7 +97,6 @@ public function validate( $args ) { */ protected function prepare_display_value( $value, $atts ) { $user_info = $this->prepare_user_info_attribute( $atts ); - return FrmFieldsHelper::get_user_display_name( $value, $user_info, $atts ); } diff --git a/phpcs-sniffs/Formidable/Sniffs/WhiteSpace/ShortFunctionBlankLineSniff.php b/phpcs-sniffs/Formidable/Sniffs/WhiteSpace/ShortFunctionBlankLineSniff.php new file mode 100644 index 0000000000..52973a25cd --- /dev/null +++ b/phpcs-sniffs/Formidable/Sniffs/WhiteSpace/ShortFunctionBlankLineSniff.php @@ -0,0 +1,139 @@ +getTokens(); + + // Make sure this function has a body. + if ( ! isset( $tokens[ $stackPtr ]['scope_opener'] ) || ! isset( $tokens[ $stackPtr ]['scope_closer'] ) ) { + return; + } + + $openBrace = $tokens[ $stackPtr ]['scope_opener']; + $closeBrace = $tokens[ $stackPtr ]['scope_closer']; + + // Get the line numbers. + $openLine = $tokens[ $openBrace ]['line']; + $closeLine = $tokens[ $closeBrace ]['line']; + + // Calculate the number of lines in the function body. + // For a 3-line function with a blank line: + // Line 1: open brace (openLine) + // Line 2: first statement + // Line 3: blank + // Line 4: second statement (return) + // Line 5: close brace (closeLine) + // So closeLine - openLine = 4 + $totalLines = $closeLine - $openLine; + + if ( $totalLines !== 4 ) { + return; + } + + // Count the number of statements (semicolons) in the function. + $statementCount = 0; + $semicolons = array(); + + for ( $i = $openBrace + 1; $i < $closeBrace; $i++ ) { + if ( $tokens[ $i ]['code'] === T_SEMICOLON ) { + ++$statementCount; + $semicolons[] = $i; + } + } + + // We only care about functions with exactly 2 statements. + if ( $statementCount !== 2 ) { + return; + } + + // Check if there's a blank line between the two statements. + $firstSemicolon = $semicolons[0]; + $secondStatement = $phpcsFile->findNext( T_WHITESPACE, $firstSemicolon + 1, $closeBrace, true ); + + if ( false === $secondStatement ) { + return; + } + + $firstLine = $tokens[ $firstSemicolon ]['line']; + $secondLine = $tokens[ $secondStatement ]['line']; + + // If there's exactly one blank line between them (2 line difference). + if ( $secondLine - $firstLine !== 2 ) { + return; + } + + $fix = $phpcsFile->addFixableError( + 'Unnecessary blank line in short function with only 2 statements. Remove the blank line.', + $secondStatement, + 'BlankLineInShortFunction' + ); + + if ( true === $fix ) { + $phpcsFile->fixer->beginChangeset(); + + // Get the indentation from the token before the second statement. + $indent = ''; + + if ( $tokens[ $secondStatement - 1 ]['code'] === T_WHITESPACE ) { + $wsContent = $tokens[ $secondStatement - 1 ]['content']; + $lastNewline = strrpos( $wsContent, "\n" ); + + if ( false !== $lastNewline ) { + $indent = substr( $wsContent, $lastNewline + 1 ); + } else { + $indent = $wsContent; + } + } + + // Replace all whitespace tokens between semicolon and next statement. + $first = true; + + for ( $i = $firstSemicolon + 1; $i < $secondStatement; $i++ ) { + if ( $tokens[ $i ]['code'] === T_WHITESPACE ) { + if ( $first ) { + $phpcsFile->fixer->replaceToken( $i, "\n" . $indent ); + $first = false; + } else { + $phpcsFile->fixer->replaceToken( $i, '' ); + } + } + } + + $phpcsFile->fixer->endChangeset(); + } + } +} diff --git a/phpcs.xml b/phpcs.xml index caa289b488..d61a6d12e5 100644 --- a/phpcs.xml +++ b/phpcs.xml @@ -288,4 +288,5 @@ + diff --git a/tests/phpunit/entries/test_FrmShowEntryShortcode.php b/tests/phpunit/entries/test_FrmShowEntryShortcode.php index 3370e4d234..d30d6c1222 100644 --- a/tests/phpunit/entries/test_FrmShowEntryShortcode.php +++ b/tests/phpunit/entries/test_FrmShowEntryShortcode.php @@ -938,7 +938,6 @@ protected function user_info_plain_text_rows( $atts ) { protected function get_field_html_value( $entry, $field, $atts ) { $field_value = $this->get_field_value( $entry, $field, $atts ); - return str_replace( array( "\r\n", "\n" ), '
', $field_value ); } diff --git a/tests/phpunit/fields/test_FrmFieldValidate.php b/tests/phpunit/fields/test_FrmFieldValidate.php index 64d543a097..8677811952 100644 --- a/tests/phpunit/fields/test_FrmFieldValidate.php +++ b/tests/phpunit/fields/test_FrmFieldValidate.php @@ -9,7 +9,6 @@ class test_FrmFieldValidate extends FrmUnitTest { public function setUp(): void { parent::setUp(); - $this->create_validation_form(); } diff --git a/tests/phpunit/forms/test_FrmFormsController.php b/tests/phpunit/forms/test_FrmFormsController.php index 67f6163344..6ca14b0e1d 100644 --- a/tests/phpunit/forms/test_FrmFormsController.php +++ b/tests/phpunit/forms/test_FrmFormsController.php @@ -109,7 +109,6 @@ private function _setup_post_values( $form_id ) { */ private function _check_doing_ajax() { $doing_ajax = defined( 'DOING_AJAX' ); - $this->assertFalse( $doing_ajax, 'DOING_AJAX must be false for this test to work. Maybe run this test individually to make sure DOING_AJAX is false.' ); }