From 7cf273e66b0c9537d8372d4ce9e2acc60b0cf73f Mon Sep 17 00:00:00 2001 From: Mike Letellier Date: Fri, 9 Jan 2026 23:12:41 -0400 Subject: [PATCH] Update sniff to fruther improve whitespace consistency after closing brace --- classes/controllers/FrmFormsController.php | 1 + classes/controllers/FrmStylesController.php | 1 + classes/helpers/FrmDashboardHelper.php | 1 + .../Sniffs/WhiteSpace/BlankLineAfterClosingBraceSniff.php | 4 +++- 4 files changed, 6 insertions(+), 1 deletion(-) diff --git a/classes/controllers/FrmFormsController.php b/classes/controllers/FrmFormsController.php index 2279bb5498..fbc95a6b28 100644 --- a/classes/controllers/FrmFormsController.php +++ b/classes/controllers/FrmFormsController.php @@ -3570,6 +3570,7 @@ public static function landing_page_preview_option() { if ( false === $dir || ! file_exists( $dir . 'landing-page-preview-option.php' ) ) { $dir = self::get_form_views_path(); } + include $dir . 'landing-page-preview-option.php'; } diff --git a/classes/controllers/FrmStylesController.php b/classes/controllers/FrmStylesController.php index dcb3689ae4..c3843c0c54 100644 --- a/classes/controllers/FrmStylesController.php +++ b/classes/controllers/FrmStylesController.php @@ -857,6 +857,7 @@ public static function custom_css( $message = '', $extra_args = array() ) { if ( $settings ) { $textarea_params['class'] = 'hide-if-js'; } + include FrmAppHelper::plugin_path() . '/classes/views/styles/custom_css.php'; } diff --git a/classes/helpers/FrmDashboardHelper.php b/classes/helpers/FrmDashboardHelper.php index 8a698d9d81..b43d0d7f58 100644 --- a/classes/helpers/FrmDashboardHelper.php +++ b/classes/helpers/FrmDashboardHelper.php @@ -303,6 +303,7 @@ public function get_youtube_video( $classes ) { if ( null === $template['id'] ) { return; } + include FrmAppHelper::plugin_path() . '/classes/views/dashboard/templates/youtube-video.php'; } diff --git a/phpcs-sniffs/Formidable/Sniffs/WhiteSpace/BlankLineAfterClosingBraceSniff.php b/phpcs-sniffs/Formidable/Sniffs/WhiteSpace/BlankLineAfterClosingBraceSniff.php index d4f35a2177..5115ae9aa9 100644 --- a/phpcs-sniffs/Formidable/Sniffs/WhiteSpace/BlankLineAfterClosingBraceSniff.php +++ b/phpcs-sniffs/Formidable/Sniffs/WhiteSpace/BlankLineAfterClosingBraceSniff.php @@ -36,7 +36,7 @@ class BlankLineAfterClosingBraceSniff implements Sniff { * @return array */ public function register() { - return array( T_VARIABLE, T_STRING ); + return array( T_VARIABLE, T_STRING, T_INCLUDE, T_INCLUDE_ONCE, T_REQUIRE, T_REQUIRE_ONCE ); } /** @@ -101,6 +101,8 @@ public function process( File $phpcsFile, $stackPtr ) { if ( $tokens[ $nextToken ]['code'] !== T_OPEN_PARENTHESIS ) { return; } + } elseif ( in_array( $tokens[ $stackPtr ]['code'], array( T_INCLUDE, T_INCLUDE_ONCE, T_REQUIRE, T_REQUIRE_ONCE ), true ) ) { + // Include/require statements are valid statement starts, no additional check needed. } // Find the first token on the current line.