From d790be16dc0d167508c5e791e423b1f544a7e8f3 Mon Sep 17 00:00:00 2001 From: Sergey Biryukov Date: Fri, 8 Sep 2023 09:30:38 +0000 Subject: [PATCH] Coding Standards: Remove superfluous blank lines at the end of various classes. Note: This is enforced by WPCS 3.0.0. Follow-up to [56536]. Props jrf. See #59161, #58831. git-svn-id: https://develop.svn.wordpress.org/trunk@56547 602fd350-edb4-49c9-b593-d223f7449a82 --- src/wp-admin/includes/class-theme-upgrader.php | 1 - src/wp-admin/includes/class-walker-nav-menu-checklist.php | 1 - src/wp-admin/includes/class-walker-nav-menu-edit.php | 1 - src/wp-admin/includes/class-wp-filesystem-base.php | 1 - .../class-wp-privacy-data-removal-requests-list-table.php | 1 - src/wp-admin/includes/class-wp-site-health.php | 1 - src/wp-admin/includes/class-wp-users-list-table.php | 1 - .../twentynineteen/classes/class-twentynineteen-svg-icons.php | 1 - .../twentytwenty/classes/class-twentytwenty-customize.php | 1 - .../twentytwenty/classes/class-twentytwenty-script-loader.php | 1 - .../classes/class-twentytwenty-separator-control.php | 1 - .../twentytwenty/classes/class-twentytwenty-svg-icons.php | 1 - .../classes/class-twenty-twenty-one-dark-mode.php | 1 - .../classes/class-twenty-twenty-one-svg-icons.php | 1 - src/wp-includes/class-walker-category.php | 1 - src/wp-includes/class-walker-page.php | 1 - src/wp-includes/class-wp-block-list.php | 1 - src/wp-includes/class-wp-block.php | 1 - src/wp-includes/class-wp-customize-control.php | 1 - src/wp-includes/class-wp-dependencies.php | 1 - src/wp-includes/class-wp-hook.php | 1 - src/wp-includes/class-wp-http.php | 1 - src/wp-includes/class-wp-image-editor-imagick.php | 1 - src/wp-includes/class-wp-role.php | 1 - src/wp-includes/class-wp-text-diff-renderer-inline.php | 1 - src/wp-includes/class-wp-theme-json-data.php | 1 - src/wp-includes/class-wp-walker.php | 1 - .../customize/class-wp-customize-cropped-image-control.php | 1 - src/wp-includes/pomo/streams.php | 1 - .../rest-api/endpoints/class-wp-rest-attachments-controller.php | 1 - .../rest-api/endpoints/class-wp-rest-block-types-controller.php | 1 - .../rest-api/endpoints/class-wp-rest-blocks-controller.php | 1 - .../endpoints/class-wp-rest-post-statuses-controller.php | 1 - .../rest-api/search/class-wp-rest-post-search-handler.php | 1 - src/wp-includes/widgets/class-wp-widget-categories.php | 1 - src/wp-includes/widgets/class-wp-widget-pages.php | 1 - src/wp-includes/widgets/class-wp-widget-search.php | 1 - tests/phpunit/includes/bootstrap.php | 1 - .../includes/factory/class-wp-unittest-factory-for-thing.php | 1 - tests/phpunit/includes/mock-fs.php | 1 - tests/phpunit/includes/phpunit6/compat.php | 1 - tests/phpunit/includes/testcase-xmlrpc.php | 1 - tests/phpunit/tests/admin/includesTemplate.php | 1 - tests/phpunit/tests/admin/wpCommentsListTable.php | 1 - tests/phpunit/tests/admin/wpPostCommentsListTable.php | 1 - tests/phpunit/tests/admin/wpPostsListTable.php | 1 - tests/phpunit/tests/attachment/slashes.php | 1 - tests/phpunit/tests/avatar.php | 1 - tests/phpunit/tests/blocks/context.php | 1 - tests/phpunit/tests/blocks/render.php | 1 - tests/phpunit/tests/blocks/serialize.php | 1 - tests/phpunit/tests/blocks/wpBlockList.php | 1 - tests/phpunit/tests/canonical/https.php | 1 - tests/phpunit/tests/canonical/paged.php | 1 - tests/phpunit/tests/canonical/robots.php | 1 - tests/phpunit/tests/comment/commentTime.php | 1 - tests/phpunit/tests/comment/getCommentReplyLink.php | 1 - tests/phpunit/tests/comment/isAvatarCommentType.php | 1 - tests/phpunit/tests/comment/slashes.php | 1 - tests/phpunit/tests/comment/template.php | 1 - tests/phpunit/tests/cron.php | 1 - tests/phpunit/tests/customize/manager.php | 1 - tests/phpunit/tests/customize/panel.php | 1 - tests/phpunit/tests/customize/section.php | 1 - tests/phpunit/tests/dependencies/wpSanitizeScriptAttributes.php | 1 - tests/phpunit/tests/editor/navigation-fallback.php | 1 - tests/phpunit/tests/filesystem/copyDir.php | 1 - tests/phpunit/tests/filesystem/findFolder.php | 1 - tests/phpunit/tests/filesystem/moveDir.php | 1 - tests/phpunit/tests/formatting/escUrl.php | 1 - tests/phpunit/tests/formatting/makeClickable.php | 1 - tests/phpunit/tests/formatting/mapDeep.php | 1 - tests/phpunit/tests/formatting/urlencodeDeep.php | 1 - tests/phpunit/tests/formatting/wpMakeLinkRelative.php | 1 - tests/phpunit/tests/formatting/wpSlash.php | 1 - tests/phpunit/tests/formatting/wpTargetedLinkRel.php | 1 - tests/phpunit/tests/functions.php | 1 - tests/phpunit/tests/functions/addMagicQuotes.php | 1 - tests/phpunit/tests/functions/anonymization.php | 1 - tests/phpunit/tests/functions/canonicalCharset.php | 1 - tests/phpunit/tests/functions/doEnclose.php | 1 - tests/phpunit/tests/functions/isNewDay.php | 1 - tests/phpunit/tests/functions/wp.php | 1 - tests/phpunit/tests/functions/wpFuzzyNumberMatch.php | 1 - tests/phpunit/tests/functions/wpListUtil.php | 1 - tests/phpunit/tests/general/wpPreloadResources.php | 1 - tests/phpunit/tests/hooks/applyFilters.php | 1 - tests/phpunit/tests/http/base.php | 2 -- tests/phpunit/tests/image/dimensions.php | 1 - tests/phpunit/tests/image/editor.php | 1 - tests/phpunit/tests/image/resizeGd.php | 1 - tests/phpunit/tests/image/size.php | 1 - tests/phpunit/tests/link/getNextCommentsLink.php | 1 - tests/phpunit/tests/link/getPostPermalink.php | 1 - tests/phpunit/tests/link/getPreviewPostLink.php | 1 - tests/phpunit/tests/link/getPreviousCommentsLink.php | 1 - tests/phpunit/tests/link/getThePostsNavigation.php | 1 - tests/phpunit/tests/link/themeFile.php | 1 - tests/phpunit/tests/meta/isProtectedMeta.php | 1 - tests/phpunit/tests/meta/updateMetadata.php | 1 - tests/phpunit/tests/multisite/getIdFromBlogname.php | 1 - tests/phpunit/tests/multisite/getSite.php | 1 - tests/phpunit/tests/multisite/updateBlogDetails.php | 1 - tests/phpunit/tests/option/sanitizeOption.php | 1 - tests/phpunit/tests/option/themeMods.php | 1 - tests/phpunit/tests/post/getBodyClass.php | 1 - tests/phpunit/tests/post/getPageByTitle.php | 1 - .../privacy/wpPrivacySendRequestConfirmationNotification.php | 1 - tests/phpunit/tests/query/conditionals.php | 1 - tests/phpunit/tests/query/searchColumns.php | 1 - tests/phpunit/tests/query/vars.php | 1 - tests/phpunit/tests/rest-api/rest-pages-controller.php | 1 - tests/phpunit/tests/rest-api/rest-post-statuses-controller.php | 1 - tests/phpunit/tests/rest-api/rest-post-types-controller.php | 1 - tests/phpunit/tests/rest-api/rest-request-validation.php | 1 - tests/phpunit/tests/rest-api/rest-search-controller.php | 1 - tests/phpunit/tests/rest-api/rest-taxonomies-controller.php | 1 - tests/phpunit/tests/rest-api/rest-test-controller.php | 1 - tests/phpunit/tests/rewrite/addRewriteEndpoint.php | 1 - tests/phpunit/tests/template.php | 1 - tests/phpunit/tests/term/wpUpdateTerm.php | 1 - tests/phpunit/tests/theme/wpThemeJson.php | 1 - tests/phpunit/tests/upload.php | 1 - tests/phpunit/tests/user/countUsers.php | 1 - tests/phpunit/tests/user/multisite.php | 1 - tests/phpunit/tests/user/passwordHash.php | 1 - tests/phpunit/tests/user/slashes.php | 1 - tests/phpunit/tests/user/wpGetUsersWithNoRole.php | 1 - tests/phpunit/tests/user/wpRegisterPersistedPreferencesMeta.php | 1 - tests/phpunit/tests/walker.php | 2 -- tests/phpunit/tests/widgets/wpWidgetCustomHtml.php | 1 - tests/phpunit/tests/xmlrpc/message.php | 1 - tests/phpunit/tests/xmlrpc/wp/getPages.php | 1 - tests/phpunit/tests/xmlrpc/wp/getPosts.php | 1 - tests/phpunit/tests/xmlrpc/wp/getRevisions.php | 1 - tests/phpunit/tests/xmlrpc/wp/newPost.php | 1 - 136 files changed, 138 deletions(-) diff --git a/src/wp-admin/includes/class-theme-upgrader.php b/src/wp-admin/includes/class-theme-upgrader.php index 6bb9ba784a2c5..688f8d612de64 100644 --- a/src/wp-admin/includes/class-theme-upgrader.php +++ b/src/wp-admin/includes/class-theme-upgrader.php @@ -768,5 +768,4 @@ public function theme_info( $theme = null ) { return $theme; } - } diff --git a/src/wp-admin/includes/class-walker-nav-menu-checklist.php b/src/wp-admin/includes/class-walker-nav-menu-checklist.php index 939d08b4201d1..6fc5c4169048d 100644 --- a/src/wp-admin/includes/class-walker-nav-menu-checklist.php +++ b/src/wp-admin/includes/class-walker-nav-menu-checklist.php @@ -123,5 +123,4 @@ public function start_el( &$output, $data_object, $depth = 0, $args = null, $cur $output .= ''; $output .= ''; } - } diff --git a/src/wp-admin/includes/class-walker-nav-menu-edit.php b/src/wp-admin/includes/class-walker-nav-menu-edit.php index cb585c9b18f82..5869247d6491d 100644 --- a/src/wp-admin/includes/class-walker-nav-menu-edit.php +++ b/src/wp-admin/includes/class-walker-nav-menu-edit.php @@ -319,5 +319,4 @@ public function start_el( &$output, $data_object, $depth = 0, $args = null, $cur ', ); - } diff --git a/src/wp-content/themes/twentytwenty/classes/class-twentytwenty-customize.php b/src/wp-content/themes/twentytwenty/classes/class-twentytwenty-customize.php index d4b21ece58641..dedcb3788243b 100644 --- a/src/wp-content/themes/twentytwenty/classes/class-twentytwenty-customize.php +++ b/src/wp-content/themes/twentytwenty/classes/class-twentytwenty-customize.php @@ -463,7 +463,6 @@ public static function sanitize_select( $input, $setting ) { public static function sanitize_checkbox( $checked ) { return ( ( isset( $checked ) && true === $checked ) ? true : false ); } - } // Setup the Theme Customizer settings and controls. diff --git a/src/wp-content/themes/twentytwenty/classes/class-twentytwenty-script-loader.php b/src/wp-content/themes/twentytwenty/classes/class-twentytwenty-script-loader.php index 03274204711d6..f57811614b15e 100644 --- a/src/wp-content/themes/twentytwenty/classes/class-twentytwenty-script-loader.php +++ b/src/wp-content/themes/twentytwenty/classes/class-twentytwenty-script-loader.php @@ -46,6 +46,5 @@ public function filter_script_loader_tag( $tag, $handle ) { } return $tag; } - } } diff --git a/src/wp-content/themes/twentytwenty/classes/class-twentytwenty-separator-control.php b/src/wp-content/themes/twentytwenty/classes/class-twentytwenty-separator-control.php index 270d8e598ef91..6e988aa12430d 100644 --- a/src/wp-content/themes/twentytwenty/classes/class-twentytwenty-separator-control.php +++ b/src/wp-content/themes/twentytwenty/classes/class-twentytwenty-separator-control.php @@ -24,7 +24,6 @@ class TwentyTwenty_Separator_Control extends WP_Customize_Control { public function render_content() { echo '
'; } - } } } diff --git a/src/wp-content/themes/twentytwenty/classes/class-twentytwenty-svg-icons.php b/src/wp-content/themes/twentytwenty/classes/class-twentytwenty-svg-icons.php index 0e576f0af6651..6f28dd7dbc728 100644 --- a/src/wp-content/themes/twentytwenty/classes/class-twentytwenty-svg-icons.php +++ b/src/wp-content/themes/twentytwenty/classes/class-twentytwenty-svg-icons.php @@ -335,6 +335,5 @@ public static function get_social_link_svg( $uri ) { 'youtube' => '', ); - } } diff --git a/src/wp-content/themes/twentytwentyone/classes/class-twenty-twenty-one-dark-mode.php b/src/wp-content/themes/twentytwentyone/classes/class-twenty-twenty-one-dark-mode.php index 27c50cf530163..611ce3756f195 100644 --- a/src/wp-content/themes/twentytwentyone/classes/class-twenty-twenty-one-dark-mode.php +++ b/src/wp-content/themes/twentytwentyone/classes/class-twenty-twenty-one-dark-mode.php @@ -384,5 +384,4 @@ public function add_privacy_policy_content() { . __( 'This website uses LocalStorage to save the setting when Dark Mode support is turned on or off.
LocalStorage is necessary for the setting to work and is only used when a user clicks on the Dark Mode button.
No data is saved in the database or transferred.', 'twentytwentyone' ); wp_add_privacy_policy_content( __( 'Twenty Twenty-One', 'twentytwentyone' ), wp_kses_post( wpautop( $content, false ) ) ); } - } diff --git a/src/wp-content/themes/twentytwentyone/classes/class-twenty-twenty-one-svg-icons.php b/src/wp-content/themes/twentytwentyone/classes/class-twenty-twenty-one-svg-icons.php index d88aabc0944ac..398ef82bbd7c8 100644 --- a/src/wp-content/themes/twentytwentyone/classes/class-twenty-twenty-one-svg-icons.php +++ b/src/wp-content/themes/twentytwentyone/classes/class-twenty-twenty-one-svg-icons.php @@ -249,5 +249,4 @@ public static function get_social_link_svg( $uri, $size ) { } return null; } - } diff --git a/src/wp-includes/class-walker-category.php b/src/wp-includes/class-walker-category.php index 36f631c1b24fe..24ae740030bdf 100644 --- a/src/wp-includes/class-walker-category.php +++ b/src/wp-includes/class-walker-category.php @@ -275,5 +275,4 @@ public function end_el( &$output, $data_object, $depth = 0, $args = array() ) { $output .= "\n"; } - } diff --git a/src/wp-includes/class-walker-page.php b/src/wp-includes/class-walker-page.php index 3ee5bbda61301..e26c21d0cbc93 100644 --- a/src/wp-includes/class-walker-page.php +++ b/src/wp-includes/class-walker-page.php @@ -241,5 +241,4 @@ public function end_el( &$output, $data_object, $depth = 0, $args = array() ) { } $output .= "{$n}"; } - } diff --git a/src/wp-includes/class-wp-block-list.php b/src/wp-includes/class-wp-block-list.php index 9b7caaf01f7e1..2505920755340 100644 --- a/src/wp-includes/class-wp-block-list.php +++ b/src/wp-includes/class-wp-block-list.php @@ -210,5 +210,4 @@ public function valid() { public function count() { return count( $this->blocks ); } - } diff --git a/src/wp-includes/class-wp-block.php b/src/wp-includes/class-wp-block.php index 890ae5e559353..cdbc678f13d56 100644 --- a/src/wp-includes/class-wp-block.php +++ b/src/wp-includes/class-wp-block.php @@ -309,5 +309,4 @@ public function render( $options = array() ) { return $block_content; } - } diff --git a/src/wp-includes/class-wp-customize-control.php b/src/wp-includes/class-wp-customize-control.php index ab4d2523a0eb7..30e8c2c63914b 100644 --- a/src/wp-includes/class-wp-customize-control.php +++ b/src/wp-includes/class-wp-customize-control.php @@ -701,7 +701,6 @@ final public function print_template() { * @since 4.1.0 */ protected function content_template() {} - } /** diff --git a/src/wp-includes/class-wp-dependencies.php b/src/wp-includes/class-wp-dependencies.php index 0bc42bb282b77..e2bbf4ff98bb7 100644 --- a/src/wp-includes/class-wp-dependencies.php +++ b/src/wp-includes/class-wp-dependencies.php @@ -490,5 +490,4 @@ public function set_group( $handle, $recursion, $group ) { return true; } - } diff --git a/src/wp-includes/class-wp-hook.php b/src/wp-includes/class-wp-hook.php index 795aec4fe1ee8..8a6cdfd09f758 100644 --- a/src/wp-includes/class-wp-hook.php +++ b/src/wp-includes/class-wp-hook.php @@ -564,5 +564,4 @@ public function valid() { public function rewind() { reset( $this->callbacks ); } - } diff --git a/src/wp-includes/class-wp-http.php b/src/wp-includes/class-wp-http.php index 546ba96c1cdfb..bc411179d3261 100644 --- a/src/wp-includes/class-wp-http.php +++ b/src/wp-includes/class-wp-http.php @@ -1102,5 +1102,4 @@ public static function is_ip_address( $maybe_ip ) { return false; } - } diff --git a/src/wp-includes/class-wp-image-editor-imagick.php b/src/wp-includes/class-wp-image-editor-imagick.php index 7229c903b40a0..03fe0bca6975f 100644 --- a/src/wp-includes/class-wp-image-editor-imagick.php +++ b/src/wp-includes/class-wp-image-editor-imagick.php @@ -1043,5 +1043,4 @@ protected function pdf_load_source() { return true; } - } diff --git a/src/wp-includes/class-wp-role.php b/src/wp-includes/class-wp-role.php index 6f25c3cb0342a..b9884f206529c 100644 --- a/src/wp-includes/class-wp-role.php +++ b/src/wp-includes/class-wp-role.php @@ -100,5 +100,4 @@ public function has_cap( $cap ) { return false; } } - } diff --git a/src/wp-includes/class-wp-text-diff-renderer-inline.php b/src/wp-includes/class-wp-text-diff-renderer-inline.php index 19a00d83c7eaa..f3e4f6b7b0394 100644 --- a/src/wp-includes/class-wp-text-diff-renderer-inline.php +++ b/src/wp-includes/class-wp-text-diff-renderer-inline.php @@ -30,5 +30,4 @@ public function _splitOnWords( $string, $newlineEscape = "\n" ) { // phpcs:ignor $words = str_replace( "\n", $newlineEscape, $words ); return $words; } - } diff --git a/src/wp-includes/class-wp-theme-json-data.php b/src/wp-includes/class-wp-theme-json-data.php index 9ffa2f358570e..6aa8a3971c62d 100644 --- a/src/wp-includes/class-wp-theme-json-data.php +++ b/src/wp-includes/class-wp-theme-json-data.php @@ -69,5 +69,4 @@ public function update_with( $new_data ) { public function get_data() { return $this->theme_json->get_raw_data(); } - } diff --git a/src/wp-includes/class-wp-walker.php b/src/wp-includes/class-wp-walker.php index f7f4715ed1250..28cecfe79ec46 100644 --- a/src/wp-includes/class-wp-walker.php +++ b/src/wp-includes/class-wp-walker.php @@ -446,5 +446,4 @@ public function unset_children( $element, &$children_elements ) { unset( $children_elements[ $id ] ); } - } diff --git a/src/wp-includes/customize/class-wp-customize-cropped-image-control.php b/src/wp-includes/customize/class-wp-customize-cropped-image-control.php index c8a55f401c0b4..5f0debba2984a 100644 --- a/src/wp-includes/customize/class-wp-customize-cropped-image-control.php +++ b/src/wp-includes/customize/class-wp-customize-cropped-image-control.php @@ -82,5 +82,4 @@ public function to_json() { $this->json['flex_width'] = absint( $this->flex_width ); $this->json['flex_height'] = absint( $this->flex_height ); } - } diff --git a/src/wp-includes/pomo/streams.php b/src/wp-includes/pomo/streams.php index 8fa5fc61561ba..af76c5c5b3600 100644 --- a/src/wp-includes/pomo/streams.php +++ b/src/wp-includes/pomo/streams.php @@ -299,7 +299,6 @@ public function length() { public function read_all() { return $this->substr( $this->_str, $this->_pos, $this->strlen( $this->_str ) ); } - } endif; diff --git a/src/wp-includes/rest-api/endpoints/class-wp-rest-attachments-controller.php b/src/wp-includes/rest-api/endpoints/class-wp-rest-attachments-controller.php index 138440e8c24e5..bbb02c8765eab 100644 --- a/src/wp-includes/rest-api/endpoints/class-wp-rest-attachments-controller.php +++ b/src/wp-includes/rest-api/endpoints/class-wp-rest-attachments-controller.php @@ -1451,5 +1451,4 @@ protected function get_edit_media_item_args() { ), ); } - } diff --git a/src/wp-includes/rest-api/endpoints/class-wp-rest-block-types-controller.php b/src/wp-includes/rest-api/endpoints/class-wp-rest-block-types-controller.php index 26bd0e05449e6..fe86ff669d0bf 100644 --- a/src/wp-includes/rest-api/endpoints/class-wp-rest-block-types-controller.php +++ b/src/wp-includes/rest-api/endpoints/class-wp-rest-block-types-controller.php @@ -767,5 +767,4 @@ public function get_collection_params() { ), ); } - } diff --git a/src/wp-includes/rest-api/endpoints/class-wp-rest-blocks-controller.php b/src/wp-includes/rest-api/endpoints/class-wp-rest-blocks-controller.php index a270e0ff4829d..305647451b02c 100644 --- a/src/wp-includes/rest-api/endpoints/class-wp-rest-blocks-controller.php +++ b/src/wp-includes/rest-api/endpoints/class-wp-rest-blocks-controller.php @@ -97,5 +97,4 @@ public function get_item_schema() { return $this->add_additional_fields_schema( $this->schema ); } - } diff --git a/src/wp-includes/rest-api/endpoints/class-wp-rest-post-statuses-controller.php b/src/wp-includes/rest-api/endpoints/class-wp-rest-post-statuses-controller.php index 4801d7943d576..93e466191d3ce 100644 --- a/src/wp-includes/rest-api/endpoints/class-wp-rest-post-statuses-controller.php +++ b/src/wp-includes/rest-api/endpoints/class-wp-rest-post-statuses-controller.php @@ -369,5 +369,4 @@ public function get_collection_params() { 'context' => $this->get_context_param( array( 'default' => 'view' ) ), ); } - } diff --git a/src/wp-includes/rest-api/search/class-wp-rest-post-search-handler.php b/src/wp-includes/rest-api/search/class-wp-rest-post-search-handler.php index 5809245acf00e..fb85fce2e2cca 100644 --- a/src/wp-includes/rest-api/search/class-wp-rest-post-search-handler.php +++ b/src/wp-includes/rest-api/search/class-wp-rest-post-search-handler.php @@ -202,5 +202,4 @@ protected function detect_rest_item_route( $post ) { return rest_get_route_for_post( $post ); } - } diff --git a/src/wp-includes/widgets/class-wp-widget-categories.php b/src/wp-includes/widgets/class-wp-widget-categories.php index 5961fb19ecad9..3c009709ba9f5 100644 --- a/src/wp-includes/widgets/class-wp-widget-categories.php +++ b/src/wp-includes/widgets/class-wp-widget-categories.php @@ -203,5 +203,4 @@ public function form( $instance ) {

assertSame( $expected, $this->table->get_views() ); } - } diff --git a/tests/phpunit/tests/admin/wpPostCommentsListTable.php b/tests/phpunit/tests/admin/wpPostCommentsListTable.php index 126126327f0e8..f69657dd873a5 100644 --- a/tests/phpunit/tests/admin/wpPostCommentsListTable.php +++ b/tests/phpunit/tests/admin/wpPostCommentsListTable.php @@ -35,5 +35,4 @@ public function test_get_views_should_return_views_by_default() { ); $this->assertSame( $expected, $this->table->get_views() ); } - } diff --git a/tests/phpunit/tests/admin/wpPostsListTable.php b/tests/phpunit/tests/admin/wpPostsListTable.php index 4b2dfe6e0a6a8..9d2482a034af7 100644 --- a/tests/phpunit/tests/admin/wpPostsListTable.php +++ b/tests/phpunit/tests/admin/wpPostsListTable.php @@ -330,5 +330,4 @@ public function test_get_views_should_return_views_by_default() { $this->assertSame( $expected, $actual ); } - } diff --git a/tests/phpunit/tests/attachment/slashes.php b/tests/phpunit/tests/attachment/slashes.php index b6c009957ce6e..3fb0e58db6728 100644 --- a/tests/phpunit/tests/attachment/slashes.php +++ b/tests/phpunit/tests/attachment/slashes.php @@ -68,5 +68,4 @@ public function test_wp_insert_attachment() { $this->assertSame( wp_unslash( self::SLASH_4 ), $post->post_content_filtered ); $this->assertSame( wp_unslash( self::SLASH_6 ), $post->post_excerpt ); } - } diff --git a/tests/phpunit/tests/avatar.php b/tests/phpunit/tests/avatar.php index 026809b4a1b56..32ff9ac648f8d 100644 --- a/tests/phpunit/tests/avatar.php +++ b/tests/phpunit/tests/avatar.php @@ -279,5 +279,4 @@ public function test_get_avatar_data_should_return_invalid_url_when_input_not_av $this->assertFalse( is_avatar_comment_type( $comment_type ) ); $this->assertFalse( $actual_data['url'] ); } - } diff --git a/tests/phpunit/tests/blocks/context.php b/tests/phpunit/tests/blocks/context.php index 76603b7b37a2a..68ead5d398f2f 100644 --- a/tests/phpunit/tests/blocks/context.php +++ b/tests/phpunit/tests/blocks/context.php @@ -205,5 +205,4 @@ public function test_default_context_is_filterable() { $this->assertSame( array( 'example' => 'ok' ), $provided_context[0] ); } - } diff --git a/tests/phpunit/tests/blocks/render.php b/tests/phpunit/tests/blocks/render.php index 56905956df7bb..632298186eaa0 100644 --- a/tests/phpunit/tests/blocks/render.php +++ b/tests/phpunit/tests/blocks/render.php @@ -521,5 +521,4 @@ public function render_test_block_wp_query() { return $content; } - } diff --git a/tests/phpunit/tests/blocks/serialize.php b/tests/phpunit/tests/blocks/serialize.php index d8e12f0511ac6..4437c8ca852c3 100644 --- a/tests/phpunit/tests/blocks/serialize.php +++ b/tests/phpunit/tests/blocks/serialize.php @@ -54,5 +54,4 @@ public function test_serialized_block_name() { $this->assertSame( 'example', strip_core_block_namespace( 'core/example' ) ); $this->assertSame( 'plugin/example', strip_core_block_namespace( 'plugin/example' ) ); } - } diff --git a/tests/phpunit/tests/blocks/wpBlockList.php b/tests/phpunit/tests/blocks/wpBlockList.php index 6dd2979e7087b..2194bc5a98733 100644 --- a/tests/phpunit/tests/blocks/wpBlockList.php +++ b/tests/phpunit/tests/blocks/wpBlockList.php @@ -102,5 +102,4 @@ public function test_countable() { $this->assertCount( 1, $blocks ); } - } diff --git a/tests/phpunit/tests/canonical/https.php b/tests/phpunit/tests/canonical/https.php index fe6eeaed5edff..4b02f087651f2 100644 --- a/tests/phpunit/tests/canonical/https.php +++ b/tests/phpunit/tests/canonical/https.php @@ -65,5 +65,4 @@ public function test_https_request_with_https_home() { remove_filter( 'home_url', array( $this, 'set_https' ) ); } - } diff --git a/tests/phpunit/tests/canonical/paged.php b/tests/phpunit/tests/canonical/paged.php index 62786b28f9de9..d2440ef18bf48 100644 --- a/tests/phpunit/tests/canonical/paged.php +++ b/tests/phpunit/tests/canonical/paged.php @@ -26,5 +26,4 @@ public function test_redirect_canonical_with_nextpage_pagination() { // Non-existing page should redirect to the permalink. $this->assertCanonical( $link . '4/', $link ); } - } diff --git a/tests/phpunit/tests/canonical/robots.php b/tests/phpunit/tests/canonical/robots.php index c7851a062ee19..f8034a8a10022 100644 --- a/tests/phpunit/tests/canonical/robots.php +++ b/tests/phpunit/tests/canonical/robots.php @@ -12,5 +12,4 @@ public function test_remove_trailing_slashes_for_robots_requests() { $this->assertCanonical( '/robots.txt', '/robots.txt' ); $this->assertCanonical( '/robots.txt/', '/robots.txt' ); } - } diff --git a/tests/phpunit/tests/comment/commentTime.php b/tests/phpunit/tests/comment/commentTime.php index fd9e8fe6e09c2..a155ec158c203 100644 --- a/tests/phpunit/tests/comment/commentTime.php +++ b/tests/phpunit/tests/comment/commentTime.php @@ -126,5 +126,4 @@ public function test_should_output_an_empty_string_when_global_comment_is_not_se $this->assertSame( '', $actual ); } - } diff --git a/tests/phpunit/tests/comment/getCommentReplyLink.php b/tests/phpunit/tests/comment/getCommentReplyLink.php index 0377a5c0f544c..7bb4e91551d5d 100644 --- a/tests/phpunit/tests/comment/getCommentReplyLink.php +++ b/tests/phpunit/tests/comment/getCommentReplyLink.php @@ -87,5 +87,4 @@ public function test_should_return_null_when_depth_less_than_max_depth_and_comme $this->assertNull( $actual ); } - } diff --git a/tests/phpunit/tests/comment/isAvatarCommentType.php b/tests/phpunit/tests/comment/isAvatarCommentType.php index f45caae93b2d6..aa91a6d6fe806 100644 --- a/tests/phpunit/tests/comment/isAvatarCommentType.php +++ b/tests/phpunit/tests/comment/isAvatarCommentType.php @@ -72,5 +72,4 @@ public function _filter_avatar_comment_types( $types ) { $types[] = 'review'; return $types; } - } diff --git a/tests/phpunit/tests/comment/slashes.php b/tests/phpunit/tests/comment/slashes.php index e58776d8f8b38..65c87ad2305d3 100644 --- a/tests/phpunit/tests/comment/slashes.php +++ b/tests/phpunit/tests/comment/slashes.php @@ -194,5 +194,4 @@ public function test_wp_update_comment() { $this->assertSame( wp_unslash( self::SLASH_2 ), $comment->comment_author ); $this->assertSame( wp_unslash( self::SLASH_4 ), $comment->comment_content ); } - } diff --git a/tests/phpunit/tests/comment/template.php b/tests/phpunit/tests/comment/template.php index 0632a22863279..4e9f82c5810a2 100644 --- a/tests/phpunit/tests/comment/template.php +++ b/tests/phpunit/tests/comment/template.php @@ -199,5 +199,4 @@ public function data_get_comments_number_text_declension() { ), ); } - } diff --git a/tests/phpunit/tests/cron.php b/tests/phpunit/tests/cron.php index e5ecee093b1b6..e2799b8fe3032 100644 --- a/tests/phpunit/tests/cron.php +++ b/tests/phpunit/tests/cron.php @@ -1283,5 +1283,4 @@ static function() { $this->assertWPError( $unscheduled ); $this->assertSame( 'could_not_set', $unscheduled->get_error_code() ); } - } diff --git a/tests/phpunit/tests/customize/manager.php b/tests/phpunit/tests/customize/manager.php index d42133a1ba481..4a64db964d8ee 100644 --- a/tests/phpunit/tests/customize/manager.php +++ b/tests/phpunit/tests/customize/manager.php @@ -3669,5 +3669,4 @@ public function validate( $value ) { } return true; } - } diff --git a/tests/phpunit/tests/customize/panel.php b/tests/phpunit/tests/customize/panel.php index ab7859499e57c..40f198675a03a 100644 --- a/tests/phpunit/tests/customize/panel.php +++ b/tests/phpunit/tests/customize/panel.php @@ -237,5 +237,4 @@ protected function content_template() { posts ? $navs_in_db->posts : array(); } - } diff --git a/tests/phpunit/tests/filesystem/copyDir.php b/tests/phpunit/tests/filesystem/copyDir.php index 7b03ab88e98d5..914e2b867c2b8 100644 --- a/tests/phpunit/tests/filesystem/copyDir.php +++ b/tests/phpunit/tests/filesystem/copyDir.php @@ -79,5 +79,4 @@ public function test_should_create_destination_it_if_does_not_exist() { $this->assertDirectoryExists( $to . 'subfolder1/', 'The destination subfolder was not created.' ); $this->assertFileExists( $to . 'subfolder1/file2.txt', 'The destination subfolder file was not created.' ); } - } diff --git a/tests/phpunit/tests/filesystem/findFolder.php b/tests/phpunit/tests/filesystem/findFolder.php index 3db6107585787..5eda573275c3c 100644 --- a/tests/phpunit/tests/filesystem/findFolder.php +++ b/tests/phpunit/tests/filesystem/findFolder.php @@ -113,5 +113,4 @@ public function test_multiple_tokens_in_path1() { $path = $fs->find_folder( '/var/www/example.com/sub/wp-content/plugins/' ); $this->assertSame( '/example.com/sub/wp-content/plugins/', $path ); } - } diff --git a/tests/phpunit/tests/filesystem/moveDir.php b/tests/phpunit/tests/filesystem/moveDir.php index 4cc013453d6c0..d2661fd48d10c 100644 --- a/tests/phpunit/tests/filesystem/moveDir.php +++ b/tests/phpunit/tests/filesystem/moveDir.php @@ -308,5 +308,4 @@ public function test_should_return_wp_error_when_overwriting_is_enabled_the_dest 'An unexpected error code was returned.' ); } - } diff --git a/tests/phpunit/tests/formatting/escUrl.php b/tests/phpunit/tests/formatting/escUrl.php index dd37c9ec8d1f2..faccb2846ab3c 100644 --- a/tests/phpunit/tests/formatting/escUrl.php +++ b/tests/phpunit/tests/formatting/escUrl.php @@ -276,5 +276,4 @@ public function test_ipv6_hosts() { $this->assertSame( '//[::FFFF::127.0.0.1]/?foo%5Bbar%5D=baz', esc_url( '//[::FFFF::127.0.0.1]/?foo[bar]=baz' ) ); $this->assertSame( 'http://[::FFFF::127.0.0.1]/?foo%5Bbar%5D=baz', esc_url( 'http://[::FFFF::127.0.0.1]/?foo[bar]=baz' ) ); } - } diff --git a/tests/phpunit/tests/formatting/makeClickable.php b/tests/phpunit/tests/formatting/makeClickable.php index 658689605956f..8620f1efcb15e 100644 --- a/tests/phpunit/tests/formatting/makeClickable.php +++ b/tests/phpunit/tests/formatting/makeClickable.php @@ -518,5 +518,4 @@ public function data_add_rel_ugc_in_comments() { ), ); } - } diff --git a/tests/phpunit/tests/formatting/mapDeep.php b/tests/phpunit/tests/formatting/mapDeep.php index 0b60ae99bff11..0d46ea852377f 100644 --- a/tests/phpunit/tests/formatting/mapDeep.php +++ b/tests/phpunit/tests/formatting/mapDeep.php @@ -171,5 +171,4 @@ public function test_map_deep_should_map_array_elements_passed_by_reference() { public function append_baba( $value ) { return $value . 'baba'; } - } diff --git a/tests/phpunit/tests/formatting/urlencodeDeep.php b/tests/phpunit/tests/formatting/urlencodeDeep.php index 632f4083c09bf..9436ba09afc16 100644 --- a/tests/phpunit/tests/formatting/urlencodeDeep.php +++ b/tests/phpunit/tests/formatting/urlencodeDeep.php @@ -44,5 +44,4 @@ public function test_urlencode_deep_should_encode_all_values_in_array() { $this->assertSame( $expected, urlencode_deep( $actual ) ); } - } diff --git a/tests/phpunit/tests/formatting/wpMakeLinkRelative.php b/tests/phpunit/tests/formatting/wpMakeLinkRelative.php index 0b293c9c89747..4c21381a420de 100644 --- a/tests/phpunit/tests/formatting/wpMakeLinkRelative.php +++ b/tests/phpunit/tests/formatting/wpMakeLinkRelative.php @@ -45,5 +45,4 @@ public function test_wp_make_link_relative_with_no_path() { $relative_link = wp_make_link_relative( $link ); $this->assertSame( '', $relative_link ); } - } diff --git a/tests/phpunit/tests/formatting/wpSlash.php b/tests/phpunit/tests/formatting/wpSlash.php index a1ac591c7ae02..aa0664d791b92 100644 --- a/tests/phpunit/tests/formatting/wpSlash.php +++ b/tests/phpunit/tests/formatting/wpSlash.php @@ -101,5 +101,4 @@ public function test_add_even_more_slashes() { $this->assertSame( array( 'a' => $new ), wp_slash( array( 'a' => $old ) ) ); // Keyed array. $this->assertSame( array( $new ), wp_slash( array( $old ) ) ); // Non-keyed. } - } diff --git a/tests/phpunit/tests/formatting/wpTargetedLinkRel.php b/tests/phpunit/tests/formatting/wpTargetedLinkRel.php index 75a247e212caa..365f42dddb64c 100644 --- a/tests/phpunit/tests/formatting/wpTargetedLinkRel.php +++ b/tests/phpunit/tests/formatting/wpTargetedLinkRel.php @@ -136,5 +136,4 @@ public function test_wp_targeted_link_rel_tab_separated_values_are_split() { $expected = '

Links: No rel

'; $this->assertSame( $expected, wp_targeted_link_rel( $content ) ); } - } diff --git a/tests/phpunit/tests/functions.php b/tests/phpunit/tests/functions.php index 1451117b91732..0a5703d94ba8e 100644 --- a/tests/phpunit/tests/functions.php +++ b/tests/phpunit/tests/functions.php @@ -2160,5 +2160,4 @@ public function test_wp_recursive_ksort() { ); $this->assertSameSetsWithIndex( $theme_json, $expected_theme_json ); } - } diff --git a/tests/phpunit/tests/functions/addMagicQuotes.php b/tests/phpunit/tests/functions/addMagicQuotes.php index f42b601e09816..47085efe76460 100644 --- a/tests/phpunit/tests/functions/addMagicQuotes.php +++ b/tests/phpunit/tests/functions/addMagicQuotes.php @@ -61,5 +61,4 @@ public function data_add_magic_quotes() { ), ); } - } diff --git a/tests/phpunit/tests/functions/anonymization.php b/tests/phpunit/tests/functions/anonymization.php index a7849ddf46152..7a4ff6a26be5f 100644 --- a/tests/phpunit/tests/functions/anonymization.php +++ b/tests/phpunit/tests/functions/anonymization.php @@ -320,5 +320,4 @@ public function filter_wp_privacy_anonymize_data( $anonymous, $type, $data ) { } return $anonymous; } - } diff --git a/tests/phpunit/tests/functions/canonicalCharset.php b/tests/phpunit/tests/functions/canonicalCharset.php index 973562c6a993c..4a11e9c7648bb 100644 --- a/tests/phpunit/tests/functions/canonicalCharset.php +++ b/tests/phpunit/tests/functions/canonicalCharset.php @@ -88,5 +88,4 @@ public function test_update_option_blog_charset() { update_option( 'blog_charset', $orig_blog_charset ); } - } diff --git a/tests/phpunit/tests/functions/doEnclose.php b/tests/phpunit/tests/functions/doEnclose.php index 5611878bd258b..d906ed6f610bc 100644 --- a/tests/phpunit/tests/functions/doEnclose.php +++ b/tests/phpunit/tests/functions/doEnclose.php @@ -289,5 +289,4 @@ public function mock_http_request( $response, $parsed_args, $url ) { ), ); } - } diff --git a/tests/phpunit/tests/functions/isNewDay.php b/tests/phpunit/tests/functions/isNewDay.php index f852c8908faba..b1993e09e1082 100644 --- a/tests/phpunit/tests/functions/isNewDay.php +++ b/tests/phpunit/tests/functions/isNewDay.php @@ -33,5 +33,4 @@ public function data_is_new_date() { array( '21.05.19', false, 1 ), ); } - } diff --git a/tests/phpunit/tests/functions/wp.php b/tests/phpunit/tests/functions/wp.php index 04df43b3489d5..14356a4ebc91b 100644 --- a/tests/phpunit/tests/functions/wp.php +++ b/tests/phpunit/tests/functions/wp.php @@ -16,5 +16,4 @@ public function test_wp_sets_global_vars() { $this->assertInstanceOf( 'WP_Query', $wp_query ); $this->assertInstanceOf( 'WP_Query', $wp_the_query ); } - } diff --git a/tests/phpunit/tests/functions/wpFuzzyNumberMatch.php b/tests/phpunit/tests/functions/wpFuzzyNumberMatch.php index 85034165cecdd..77a06e2bb7ffb 100644 --- a/tests/phpunit/tests/functions/wpFuzzyNumberMatch.php +++ b/tests/phpunit/tests/functions/wpFuzzyNumberMatch.php @@ -108,5 +108,4 @@ public function data_wp_fuzzy_number_match() { ), ); } - } diff --git a/tests/phpunit/tests/functions/wpListUtil.php b/tests/phpunit/tests/functions/wpListUtil.php index 752ea1382caee..dba0a127973e3 100644 --- a/tests/phpunit/tests/functions/wpListUtil.php +++ b/tests/phpunit/tests/functions/wpListUtil.php @@ -1161,5 +1161,4 @@ public function data_wp_list_util_sort_non_existent_orderby_fields() { ), ); } - } diff --git a/tests/phpunit/tests/general/wpPreloadResources.php b/tests/phpunit/tests/general/wpPreloadResources.php index fe2a4e6fa51c0..8648da8949c09 100644 --- a/tests/phpunit/tests/general/wpPreloadResources.php +++ b/tests/phpunit/tests/general/wpPreloadResources.php @@ -249,5 +249,4 @@ public function data_preload_resources() { ), ); } - } diff --git a/tests/phpunit/tests/hooks/applyFilters.php b/tests/phpunit/tests/hooks/applyFilters.php index f25bd0858243a..4c3a594aa98e0 100644 --- a/tests/phpunit/tests/hooks/applyFilters.php +++ b/tests/phpunit/tests/hooks/applyFilters.php @@ -42,5 +42,4 @@ public function test_apply_filters_with_multiple_calls() { $this->assertSame( $returned_two, $arg ); $this->assertSame( 2, $a->get_call_count() ); } - } diff --git a/tests/phpunit/tests/http/base.php b/tests/phpunit/tests/http/base.php index 00abf1655bacd..976827c4afb33 100644 --- a/tests/phpunit/tests/http/base.php +++ b/tests/phpunit/tests/http/base.php @@ -487,6 +487,4 @@ public function test_url_with_double_slashes_path() { $this->skipTestOnTimeout( $res ); $this->assertNotWPError( $res ); } - - } diff --git a/tests/phpunit/tests/image/dimensions.php b/tests/phpunit/tests/image/dimensions.php index 5820f64ae7206..a80c4ece3e646 100644 --- a/tests/phpunit/tests/image/dimensions.php +++ b/tests/phpunit/tests/image/dimensions.php @@ -181,5 +181,4 @@ public function test_crop_anchors() { // dst_x, dst_y, src_x, src_y, dst_w, dst_h, src_w, src_h. $this->assertSame( array( 0, 0, 0, 40, 400, 500, 480, 600 ), $out ); } - } diff --git a/tests/phpunit/tests/image/editor.php b/tests/phpunit/tests/image/editor.php index 6e800deb7af12..bd54b803e2897 100644 --- a/tests/phpunit/tests/image/editor.php +++ b/tests/phpunit/tests/image/editor.php @@ -363,5 +363,4 @@ public function data_wp_get_webp_info() { ), ); } - } diff --git a/tests/phpunit/tests/image/resizeGd.php b/tests/phpunit/tests/image/resizeGd.php index 40a3faebfc4b1..a990c0a126bbd 100644 --- a/tests/phpunit/tests/image/resizeGd.php +++ b/tests/phpunit/tests/image/resizeGd.php @@ -38,5 +38,4 @@ public function test_resize_bad_image() { $this->assertInstanceOf( 'WP_Error', $image ); $this->assertSame( 'invalid_image', $image->get_error_code() ); } - } diff --git a/tests/phpunit/tests/image/size.php b/tests/phpunit/tests/image/size.php index 60819b41b5500..c8c6234b23742 100644 --- a/tests/phpunit/tests/image/size.php +++ b/tests/phpunit/tests/image/size.php @@ -208,5 +208,4 @@ public function test_constrain_size_for_editor_full() { $content_width = $_content_width; } - } diff --git a/tests/phpunit/tests/link/getNextCommentsLink.php b/tests/phpunit/tests/link/getNextCommentsLink.php index 459ad9d176fde..fc18dc3f4c627 100644 --- a/tests/phpunit/tests/link/getNextCommentsLink.php +++ b/tests/phpunit/tests/link/getNextCommentsLink.php @@ -37,5 +37,4 @@ public function test_page_should_default_to_1_when_no_cpage_query_var_is_found() set_query_var( 'cpage', $cpage ); } - } diff --git a/tests/phpunit/tests/link/getPostPermalink.php b/tests/phpunit/tests/link/getPostPermalink.php index 16d1da0beacdd..fa36e8bfea7cc 100644 --- a/tests/phpunit/tests/link/getPostPermalink.php +++ b/tests/phpunit/tests/link/getPostPermalink.php @@ -14,5 +14,4 @@ public function test_get_post_permalink_should_return_string_on_success() { public function test_get_post_permalink_should_return_false_for_non_existing_post() { $this->assertFalse( get_post_permalink( -1 ) ); } - } diff --git a/tests/phpunit/tests/link/getPreviewPostLink.php b/tests/phpunit/tests/link/getPreviewPostLink.php index a689cb31f397e..ce4dcf2c4a432 100644 --- a/tests/phpunit/tests/link/getPreviewPostLink.php +++ b/tests/phpunit/tests/link/getPreviewPostLink.php @@ -83,5 +83,4 @@ public function test_get_preview_post_link_should_return_empty_string_for_non_vi $this->assertSame( '', get_preview_post_link( $post ) ); } - } diff --git a/tests/phpunit/tests/link/getPreviousCommentsLink.php b/tests/phpunit/tests/link/getPreviousCommentsLink.php index cda521a204569..596a6eaca0ed1 100644 --- a/tests/phpunit/tests/link/getPreviousCommentsLink.php +++ b/tests/phpunit/tests/link/getPreviousCommentsLink.php @@ -35,5 +35,4 @@ public function test_page_should_default_to_1_when_no_cpage_query_var_is_found() set_query_var( 'cpage', $cpage ); } - } diff --git a/tests/phpunit/tests/link/getThePostsNavigation.php b/tests/phpunit/tests/link/getThePostsNavigation.php index 83c262d911bae..d7d3846b9a1fd 100644 --- a/tests/phpunit/tests/link/getThePostsNavigation.php +++ b/tests/phpunit/tests/link/getThePostsNavigation.php @@ -104,5 +104,4 @@ public function data_get_the_posts_navigation() { ), ); } - } diff --git a/tests/phpunit/tests/link/themeFile.php b/tests/phpunit/tests/link/themeFile.php index f988dc100621f..711689c4a46a5 100644 --- a/tests/phpunit/tests/link/themeFile.php +++ b/tests/phpunit/tests/link/themeFile.php @@ -182,5 +182,4 @@ public function data_theme_files() { ), ); } - } diff --git a/tests/phpunit/tests/meta/isProtectedMeta.php b/tests/phpunit/tests/meta/isProtectedMeta.php index ba3eeed9a2bf7..3216d3a745778 100644 --- a/tests/phpunit/tests/meta/isProtectedMeta.php +++ b/tests/phpunit/tests/meta/isProtectedMeta.php @@ -51,5 +51,4 @@ public function data_is_protected_meta_false() { return $unprotected_keys; } - } diff --git a/tests/phpunit/tests/meta/updateMetadata.php b/tests/phpunit/tests/meta/updateMetadata.php index 7f5aff32cdb34..355e53f160ce6 100644 --- a/tests/phpunit/tests/meta/updateMetadata.php +++ b/tests/phpunit/tests/meta/updateMetadata.php @@ -105,5 +105,4 @@ public function test_clear_post_metadata_caches() { $found = get_metadata( 'post', $post_id, 'key', true ); $this->assertSame( 'value2', $found ); } - } diff --git a/tests/phpunit/tests/multisite/getIdFromBlogname.php b/tests/phpunit/tests/multisite/getIdFromBlogname.php index 49b4bf6f85c49..63f8ab79e7df5 100644 --- a/tests/phpunit/tests/multisite/getIdFromBlogname.php +++ b/tests/phpunit/tests/multisite/getIdFromBlogname.php @@ -136,7 +136,6 @@ public function test_get_id_from_blogname_invalid_slug() { $this->assertNull( $result ); } - } endif; diff --git a/tests/phpunit/tests/multisite/getSite.php b/tests/phpunit/tests/multisite/getSite.php index 46a5121247fd9..c87f99649caee 100644 --- a/tests/phpunit/tests/multisite/getSite.php +++ b/tests/phpunit/tests/multisite/getSite.php @@ -47,7 +47,6 @@ public function test_get_site_in_switched_state_returns_switched_site() { $this->assertSame( self::$site_ids['wordpress.org/foo/'], $site->id ); } - } endif; diff --git a/tests/phpunit/tests/multisite/updateBlogDetails.php b/tests/phpunit/tests/multisite/updateBlogDetails.php index d3249a126165d..d53c2f8c2bdec 100644 --- a/tests/phpunit/tests/multisite/updateBlogDetails.php +++ b/tests/phpunit/tests/multisite/updateBlogDetails.php @@ -127,6 +127,5 @@ public function data_single_directory_path() { array( 'multiple///dirs', '/multiple///dirs/' ), ); } - } endif; diff --git a/tests/phpunit/tests/option/sanitizeOption.php b/tests/phpunit/tests/option/sanitizeOption.php index 38fdda1a2187f..b4f8293041e3f 100644 --- a/tests/phpunit/tests/option/sanitizeOption.php +++ b/tests/phpunit/tests/option/sanitizeOption.php @@ -174,5 +174,4 @@ public function data_sanitize_option_permalink_structure() { array( new WP_Error( 'wpdb_get_table_charset_failure' ), false, false ), // @ticket 53986 ); } - } diff --git a/tests/phpunit/tests/option/themeMods.php b/tests/phpunit/tests/option/themeMods.php index b062554a2c4a8..379d7887f656c 100644 --- a/tests/phpunit/tests/option/themeMods.php +++ b/tests/phpunit/tests/option/themeMods.php @@ -129,5 +129,4 @@ public function data_theme_mod_default_value_with_percent_symbols() { ), ); } - } diff --git a/tests/phpunit/tests/post/getBodyClass.php b/tests/phpunit/tests/post/getBodyClass.php index 2872218afb805..25810e6075740 100644 --- a/tests/phpunit/tests/post/getBodyClass.php +++ b/tests/phpunit/tests/post/getBodyClass.php @@ -257,5 +257,4 @@ public function test_privacy_policy_body_class() { $this->assertContains( 'page', $class ); $this->assertContains( "page-id-{$page_id}", $class ); } - } diff --git a/tests/phpunit/tests/post/getPageByTitle.php b/tests/phpunit/tests/post/getPageByTitle.php index a85d8f42c5eeb..084453cbb0144 100644 --- a/tests/phpunit/tests/post/getPageByTitle.php +++ b/tests/phpunit/tests/post/getPageByTitle.php @@ -17,5 +17,4 @@ class Tests_Post_GetPageByTitle extends WP_UnitTestCase { public function test_get_page_by_title_should_be_deprecated() { $this->assertNull( get_page_by_title( '#57041 Page' ) ); } - } diff --git a/tests/phpunit/tests/privacy/wpPrivacySendRequestConfirmationNotification.php b/tests/phpunit/tests/privacy/wpPrivacySendRequestConfirmationNotification.php index 5374cd5701056..951039cb086d1 100644 --- a/tests/phpunit/tests/privacy/wpPrivacySendRequestConfirmationNotification.php +++ b/tests/phpunit/tests/privacy/wpPrivacySendRequestConfirmationNotification.php @@ -240,5 +240,4 @@ public function modify_email_headers( $headers ) { return $headers; } - } diff --git a/tests/phpunit/tests/query/conditionals.php b/tests/phpunit/tests/query/conditionals.php index c447c638d6986..b365a1207f828 100644 --- a/tests/phpunit/tests/query/conditionals.php +++ b/tests/phpunit/tests/query/conditionals.php @@ -1692,5 +1692,4 @@ public function data_loop_functions_do_not_trigger_a_fatal_error_if_wp_query_is_ array( 'the_comment', null ), ); } - } diff --git a/tests/phpunit/tests/query/searchColumns.php b/tests/phpunit/tests/query/searchColumns.php index 463bef810738f..9ef30c2113920 100644 --- a/tests/phpunit/tests/query/searchColumns.php +++ b/tests/phpunit/tests/query/searchColumns.php @@ -410,5 +410,4 @@ public function post_non_existing_search_column( $search_columns, $search, $wp_q $search_columns = array( 'post_non_existing_column' ); return $search_columns; } - } diff --git a/tests/phpunit/tests/query/vars.php b/tests/phpunit/tests/query/vars.php index 4b4b96561b6ac..87e7fa7bb75c6 100644 --- a/tests/phpunit/tests/query/vars.php +++ b/tests/phpunit/tests/query/vars.php @@ -80,5 +80,4 @@ public function testPublicQueryVarsAreAsExpected() { 'Care should be taken when introducing new public query vars. See https://core.trac.wordpress.org/ticket/35115' ); } - } diff --git a/tests/phpunit/tests/rest-api/rest-pages-controller.php b/tests/phpunit/tests/rest-api/rest-pages-controller.php index 9900c5a003afe..75c005b275152 100644 --- a/tests/phpunit/tests/rest-api/rest-pages-controller.php +++ b/tests/phpunit/tests/rest-api/rest-pages-controller.php @@ -787,5 +787,4 @@ protected function set_post_data( $args = array() ) { $args['type'] = 'page'; return $args; } - } diff --git a/tests/phpunit/tests/rest-api/rest-post-statuses-controller.php b/tests/phpunit/tests/rest-api/rest-post-statuses-controller.php index 366e59645947e..f6bb1d795a114 100644 --- a/tests/phpunit/tests/rest-api/rest-post-statuses-controller.php +++ b/tests/phpunit/tests/rest-api/rest-post-statuses-controller.php @@ -225,5 +225,4 @@ protected function check_post_status_object_response( $response ) { $obj = get_post_status_object( 'publish' ); $this->check_post_status_obj( $obj, $data, $response->get_links() ); } - } diff --git a/tests/phpunit/tests/rest-api/rest-post-types-controller.php b/tests/phpunit/tests/rest-api/rest-post-types-controller.php index 1c2a0b53b4ef1..d881b9c8a07dd 100644 --- a/tests/phpunit/tests/rest-api/rest-post-types-controller.php +++ b/tests/phpunit/tests/rest-api/rest-post-types-controller.php @@ -263,5 +263,4 @@ protected function check_post_type_object_response( $context, $response, $post_t $obj = get_post_type_object( $post_type ); $this->check_post_type_obj( $context, $obj, $data, $response->get_links() ); } - } diff --git a/tests/phpunit/tests/rest-api/rest-request-validation.php b/tests/phpunit/tests/rest-api/rest-request-validation.php index 4444fb6065120..3d81536099494 100644 --- a/tests/phpunit/tests/rest-api/rest-request-validation.php +++ b/tests/phpunit/tests/rest-api/rest-request-validation.php @@ -202,5 +202,4 @@ public function test_validate_less_than_max_exclusive() { $ret = rest_validate_request_arg( 9, $request, 'lessthanmax' ); $this->assertTrue( $ret ); } - } diff --git a/tests/phpunit/tests/rest-api/rest-search-controller.php b/tests/phpunit/tests/rest-api/rest-search-controller.php index 2e39d385d9965..7345d45f8632f 100644 --- a/tests/phpunit/tests/rest-api/rest-search-controller.php +++ b/tests/phpunit/tests/rest-api/rest-search-controller.php @@ -888,5 +888,4 @@ public function test_get_items_search_terms_exclude_ids() { wp_list_pluck( $response->get_data(), 'id' ) ); } - } diff --git a/tests/phpunit/tests/rest-api/rest-taxonomies-controller.php b/tests/phpunit/tests/rest-api/rest-taxonomies-controller.php index 6da465be25462..264e9cf8c2889 100644 --- a/tests/phpunit/tests/rest-api/rest-taxonomies-controller.php +++ b/tests/phpunit/tests/rest-api/rest-taxonomies-controller.php @@ -316,5 +316,4 @@ public function test_get_for_taxonomy_returns_terms_controller_if_custom_class_n get_taxonomy( 'test' )->get_rest_controller() ); } - } diff --git a/tests/phpunit/tests/rest-api/rest-test-controller.php b/tests/phpunit/tests/rest-api/rest-test-controller.php index 042f37cf8bf48..48b326407d9f2 100644 --- a/tests/phpunit/tests/rest-api/rest-test-controller.php +++ b/tests/phpunit/tests/rest-api/rest-test-controller.php @@ -180,5 +180,4 @@ public function get_item_schema() { return $this->add_additional_fields_schema( $schema ); } - } diff --git a/tests/phpunit/tests/rewrite/addRewriteEndpoint.php b/tests/phpunit/tests/rewrite/addRewriteEndpoint.php index 0c4c7a332d537..7b3ada5febe7d 100644 --- a/tests/phpunit/tests/rewrite/addRewriteEndpoint.php +++ b/tests/phpunit/tests/rewrite/addRewriteEndpoint.php @@ -108,5 +108,4 @@ public function test_page_endpoint_only_applies_on_page() { $this->assertTrue( is_404() ); $this->assertSame( '', get_query_var( 'page_endpoint' ) ); } - } diff --git a/tests/phpunit/tests/template.php b/tests/phpunit/tests/template.php index c79082dff3171..3ae0bf31b89d7 100644 --- a/tests/phpunit/tests/template.php +++ b/tests/phpunit/tests/template.php @@ -678,5 +678,4 @@ public function log_template_hierarchy( array $hierarchy ) { $this->hierarchy = array_merge( $this->hierarchy, $hierarchy ); return $hierarchy; } - } diff --git a/tests/phpunit/tests/term/wpUpdateTerm.php b/tests/phpunit/tests/term/wpUpdateTerm.php index 32d93258daea7..cbbd5780d6d1c 100644 --- a/tests/phpunit/tests/term/wpUpdateTerm.php +++ b/tests/phpunit/tests/term/wpUpdateTerm.php @@ -802,5 +802,4 @@ public function test_wp_update_term_with_null_get_term() { $this->assertWPError( $found ); $this->assertSame( 'invalid_term', $found->get_error_code() ); } - } diff --git a/tests/phpunit/tests/theme/wpThemeJson.php b/tests/phpunit/tests/theme/wpThemeJson.php index a2c6e1e9f7b2c..698880eab109b 100644 --- a/tests/phpunit/tests/theme/wpThemeJson.php +++ b/tests/phpunit/tests/theme/wpThemeJson.php @@ -4917,5 +4917,4 @@ public function test_resolve_variables() { $this->assertEquals( $small_font, $styles['blocks']['core/quote']['variations']['plain']['typography']['fontSize'], 'Block variations: font-size' ); $this->assertEquals( $secondary_color, $styles['blocks']['core/quote']['variations']['plain']['color']['background'], 'Block variations: color' ); } - } diff --git a/tests/phpunit/tests/upload.php b/tests/phpunit/tests/upload.php index 4640439313db1..46fcea7099097 100644 --- a/tests/phpunit/tests/upload.php +++ b/tests/phpunit/tests/upload.php @@ -105,5 +105,4 @@ public function test_upload_dir_empty() { $this->assertSame( $subdir, $info['subdir'] ); $this->assertFalse( $info['error'] ); } - } diff --git a/tests/phpunit/tests/user/countUsers.php b/tests/phpunit/tests/user/countUsers.php index b09cd857845f6..db31ddab75ebe 100644 --- a/tests/phpunit/tests/user/countUsers.php +++ b/tests/phpunit/tests/user/countUsers.php @@ -291,5 +291,4 @@ public function data_count_users_strategies() { ), ); } - } diff --git a/tests/phpunit/tests/user/multisite.php b/tests/phpunit/tests/user/multisite.php index e3173db43e0c5..08d08bbe75bb3 100644 --- a/tests/phpunit/tests/user/multisite.php +++ b/tests/phpunit/tests/user/multisite.php @@ -448,7 +448,6 @@ public function test_wp_roles_global_is_reset() { $wp_roles->remove_role( $role ); } - } endif; diff --git a/tests/phpunit/tests/user/passwordHash.php b/tests/phpunit/tests/user/passwordHash.php index 1179ba25b2680..db34969c71bb3 100644 --- a/tests/phpunit/tests/user/passwordHash.php +++ b/tests/phpunit/tests/user/passwordHash.php @@ -30,5 +30,4 @@ public function test_gensalt_blowfish_should_not_throw_deprecation_notice_on_php $hasher = new PasswordHash( 8, true ); $hasher->gensalt_blowfish( 'a password string' ); } - } diff --git a/tests/phpunit/tests/user/slashes.php b/tests/phpunit/tests/user/slashes.php index 40eb2b176b636..e8c414ddecbe3 100644 --- a/tests/phpunit/tests/user/slashes.php +++ b/tests/phpunit/tests/user/slashes.php @@ -230,5 +230,4 @@ public function test_wp_update_user() { $this->assertSame( wp_unslash( self::SLASH_2 ), $user->display_name ); $this->assertSame( wp_unslash( self::SLASH_4 ), $user->description ); } - } diff --git a/tests/phpunit/tests/user/wpGetUsersWithNoRole.php b/tests/phpunit/tests/user/wpGetUsersWithNoRole.php index f853e0e78b659..d5710aeddf0b9 100644 --- a/tests/phpunit/tests/user/wpGetUsersWithNoRole.php +++ b/tests/phpunit/tests/user/wpGetUsersWithNoRole.php @@ -149,5 +149,4 @@ public function test_get_users_with_no_role_matches_on_role_name_different_site( $this->assertEmpty( $users ); } - } diff --git a/tests/phpunit/tests/user/wpRegisterPersistedPreferencesMeta.php b/tests/phpunit/tests/user/wpRegisterPersistedPreferencesMeta.php index c3c4bd7a09e08..9c4725ffbfc9e 100644 --- a/tests/phpunit/tests/user/wpRegisterPersistedPreferencesMeta.php +++ b/tests/phpunit/tests/user/wpRegisterPersistedPreferencesMeta.php @@ -57,5 +57,4 @@ public function test_should_register_persisted_preferences_meta() { 'The registered metadata did not have the expected structure' ); } - } diff --git a/tests/phpunit/tests/walker.php b/tests/phpunit/tests/walker.php index e2e9e1aba23a3..31e45963bb7da 100644 --- a/tests/phpunit/tests/walker.php +++ b/tests/phpunit/tests/walker.php @@ -314,7 +314,6 @@ public function test_multiple_items_non_numeric_parent() { $this->assertSame( '
  • 2
    • ', $output ); } - } class Walker_Test extends Walker { @@ -340,5 +339,4 @@ public function start_el( &$output, $item, $depth = 0, $args = array(), $current public function end_el( &$output, $page, $depth = 0, $args = array() ) { $output .= ''; } - } diff --git a/tests/phpunit/tests/widgets/wpWidgetCustomHtml.php b/tests/phpunit/tests/widgets/wpWidgetCustomHtml.php index c7dc3c3c7da58..f1d1f45a0628a 100644 --- a/tests/phpunit/tests/widgets/wpWidgetCustomHtml.php +++ b/tests/phpunit/tests/widgets/wpWidgetCustomHtml.php @@ -353,5 +353,4 @@ public function test_render_links_without_target() { $output = get_echo( array( $widget, 'widget' ), array( $args, $instance ) ); $this->assertStringNotContainsString( 'rel="noopener"', $output ); } - } diff --git a/tests/phpunit/tests/xmlrpc/message.php b/tests/phpunit/tests/xmlrpc/message.php index ac68552902389..b316567f329b4 100644 --- a/tests/phpunit/tests/xmlrpc/message.php +++ b/tests/phpunit/tests/xmlrpc/message.php @@ -30,5 +30,4 @@ public function test_tag_open_does_not_create_dynamic_property() { $this->assertSame( 'methodResponse', $message->messageType ); // phpcs:ignore WordPress.NamingConventions.ValidVariableName.UsedPropertyNotSnakeCase $this->assertSame( array( '1' ), $message->params ); } - } diff --git a/tests/phpunit/tests/xmlrpc/wp/getPages.php b/tests/phpunit/tests/xmlrpc/wp/getPages.php index 9615c5a30d914..eb99caf5c1620 100644 --- a/tests/phpunit/tests/xmlrpc/wp/getPages.php +++ b/tests/phpunit/tests/xmlrpc/wp/getPages.php @@ -87,5 +87,4 @@ public function test_semi_capable_user() { remove_filter( 'map_meta_cap', array( $this, 'remove_editor_edit_page_cap' ), 10, 4 ); } - } diff --git a/tests/phpunit/tests/xmlrpc/wp/getPosts.php b/tests/phpunit/tests/xmlrpc/wp/getPosts.php index b019c2bb26d64..814f0c1018b83 100644 --- a/tests/phpunit/tests/xmlrpc/wp/getPosts.php +++ b/tests/phpunit/tests/xmlrpc/wp/getPosts.php @@ -167,5 +167,4 @@ public function test_search() { $this->assertNotIXRError( $results ); $this->assertCount( 1, $results ); } - } diff --git a/tests/phpunit/tests/xmlrpc/wp/getRevisions.php b/tests/phpunit/tests/xmlrpc/wp/getRevisions.php index b7a4667165c4c..893a7a06dae93 100644 --- a/tests/phpunit/tests/xmlrpc/wp/getRevisions.php +++ b/tests/phpunit/tests/xmlrpc/wp/getRevisions.php @@ -77,5 +77,4 @@ public function test_revision_count_for_auto_draft_post_creation() { $result = $this->myxmlrpcserver->wp_getRevisions( array( 1, 'editor', 'editor', $post_id ) ); $this->assertCount( 1, $result ); } - } diff --git a/tests/phpunit/tests/xmlrpc/wp/newPost.php b/tests/phpunit/tests/xmlrpc/wp/newPost.php index c9b160cf19925..91e256ff5c4a5 100644 --- a/tests/phpunit/tests/xmlrpc/wp/newPost.php +++ b/tests/phpunit/tests/xmlrpc/wp/newPost.php @@ -445,5 +445,4 @@ public function test_valid_IXR_post_date_gmt() { $this->assertStringMatchesFormat( '%d', $result ); $this->assertSame( $date_string, $fetched_post->post_date_gmt ); } - }