From 0008d8df0605c9eccf9c4b9015d3194cae4e36d2 Mon Sep 17 00:00:00 2001 From: Sergey Biryukov Date: Sun, 9 Apr 2023 11:57:22 +0000 Subject: [PATCH] Coding Standards: Replace `include_once` with `require_once` for required files. Per [https://developer.wordpress.org/coding-standards/wordpress-coding-standards/php/#writing-include-require-statements WordPress PHP coding standards], it is ''strongly recommended'' to use `require[_once]` for unconditional includes. When using `include[_once]`, PHP will throw a warning when the file is not found but will continue execution, which will almost certainly lead to other errors/warnings/notices being thrown if your application depends on the file loaded, potentially leading to security leaks. For that reason, `require[_once]` is generally the better choice as it will throw a `Fatal Error` if the file cannot be found. Follow-up to [1674], [1812], [1964], [6779], [8540], [10521], [11005], [11911], [16065], [16149], [25421], [25466], [25823], [37714], [42981], [45448], [47198], [54276], [55633]. Props kausaralm, SergeyBiryukov. See #57839. Built from https://develop.svn.wordpress.org/trunk@55641 git-svn-id: http://core.svn.wordpress.org/trunk@55153 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-admin/includes/ajax-actions.php | 10 +++++----- wp-admin/includes/class-wp-filesystem-ftpsockets.php | 2 +- .../includes/class-wp-plugin-install-list-table.php | 2 +- wp-admin/includes/upgrade.php | 2 +- wp-admin/privacy-policy-guide.php | 2 +- wp-admin/update.php | 4 ++-- wp-includes/blocks.php | 2 +- wp-includes/comment.php | 8 ++++---- wp-includes/cron.php | 2 +- wp-includes/functions.php | 2 +- wp-includes/update.php | 2 +- wp-includes/version.php | 2 +- 12 files changed, 20 insertions(+), 20 deletions(-) diff --git a/wp-admin/includes/ajax-actions.php b/wp-admin/includes/ajax-actions.php index 48e69fe0ac15..2ed1d2e0ae8e 100644 --- a/wp-admin/includes/ajax-actions.php +++ b/wp-admin/includes/ajax-actions.php @@ -245,7 +245,7 @@ function wp_ajax_imgedit_preview() { check_ajax_referer( "image_editor-$post_id" ); - include_once ABSPATH . 'wp-admin/includes/image-edit.php'; + require_once ABSPATH . 'wp-admin/includes/image-edit.php'; if ( ! stream_preview_image( $post_id ) ) { wp_die( -1 ); @@ -2649,7 +2649,7 @@ function wp_ajax_image_editor() { } check_ajax_referer( "image_editor-$attachment_id" ); - include_once ABSPATH . 'wp-admin/includes/image-edit.php'; + require_once ABSPATH . 'wp-admin/includes/image-edit.php'; $msg = false; @@ -4157,7 +4157,7 @@ function wp_ajax_install_theme() { } require_once ABSPATH . 'wp-admin/includes/class-wp-upgrader.php'; - include_once ABSPATH . 'wp-admin/includes/theme.php'; + require_once ABSPATH . 'wp-admin/includes/theme.php'; $api = themes_api( 'theme_information', @@ -4402,7 +4402,7 @@ function wp_ajax_delete_theme() { wp_send_json_error( $status ); } - include_once ABSPATH . 'wp-admin/includes/theme.php'; + require_once ABSPATH . 'wp-admin/includes/theme.php'; $result = delete_theme( $stylesheet ); @@ -4450,7 +4450,7 @@ function wp_ajax_install_plugin() { } require_once ABSPATH . 'wp-admin/includes/class-wp-upgrader.php'; - include_once ABSPATH . 'wp-admin/includes/plugin-install.php'; + require_once ABSPATH . 'wp-admin/includes/plugin-install.php'; $api = plugins_api( 'plugin_information', diff --git a/wp-admin/includes/class-wp-filesystem-ftpsockets.php b/wp-admin/includes/class-wp-filesystem-ftpsockets.php index 1e213ea12347..da578d0f2ec6 100644 --- a/wp-admin/includes/class-wp-filesystem-ftpsockets.php +++ b/wp-admin/includes/class-wp-filesystem-ftpsockets.php @@ -33,7 +33,7 @@ public function __construct( $opt = '' ) { $this->errors = new WP_Error(); // Check if possible to use ftp functions. - if ( ! include_once ABSPATH . 'wp-admin/includes/class-ftp.php' ) { + if ( ! require_once ABSPATH . 'wp-admin/includes/class-ftp.php' ) { return; } diff --git a/wp-admin/includes/class-wp-plugin-install-list-table.php b/wp-admin/includes/class-wp-plugin-install-list-table.php index e6a709e4d016..04013393eeee 100644 --- a/wp-admin/includes/class-wp-plugin-install-list-table.php +++ b/wp-admin/includes/class-wp-plugin-install-list-table.php @@ -88,7 +88,7 @@ protected function get_installed_plugin_slugs() { * @global string $term */ public function prepare_items() { - include_once ABSPATH . 'wp-admin/includes/plugin-install.php'; + require_once ABSPATH . 'wp-admin/includes/plugin-install.php'; global $tabs, $tab, $paged, $type, $term; diff --git a/wp-admin/includes/upgrade.php b/wp-admin/includes/upgrade.php index 5bfc154f251f..46f6286cada2 100644 --- a/wp-admin/includes/upgrade.php +++ b/wp-admin/includes/upgrade.php @@ -351,7 +351,7 @@ function wp_install_defaults( $user_id ) { $privacy_policy_content = get_site_option( 'default_privacy_policy_content' ); } else { if ( ! class_exists( 'WP_Privacy_Policy_Content' ) ) { - include_once ABSPATH . 'wp-admin/includes/class-wp-privacy-policy-content.php'; + require_once ABSPATH . 'wp-admin/includes/class-wp-privacy-policy-content.php'; } $privacy_policy_content = WP_Privacy_Policy_Content::get_default_content(); diff --git a/wp-admin/privacy-policy-guide.php b/wp-admin/privacy-policy-guide.php index 7f649f0887ab..7e92a4dea6a8 100644 --- a/wp-admin/privacy-policy-guide.php +++ b/wp-admin/privacy-policy-guide.php @@ -14,7 +14,7 @@ } if ( ! class_exists( 'WP_Privacy_Policy_Content' ) ) { - include_once ABSPATH . 'wp-admin/includes/class-wp-privacy-policy-content.php'; + require_once ABSPATH . 'wp-admin/includes/class-wp-privacy-policy-content.php'; } // Used in the HTML title tag. diff --git a/wp-admin/update.php b/wp-admin/update.php index a4a2abf8dbf2..29480c2840a5 100644 --- a/wp-admin/update.php +++ b/wp-admin/update.php @@ -107,7 +107,7 @@ wp_die( __( 'Sorry, you are not allowed to install plugins on this site.' ) ); } - include_once ABSPATH . 'wp-admin/includes/plugin-install.php'; // For plugins_api(). + require_once ABSPATH . 'wp-admin/includes/plugin-install.php'; // For plugins_api(). check_admin_referer( 'install-plugin_' . $plugin ); $api = plugins_api( @@ -258,7 +258,7 @@ wp_die( __( 'Sorry, you are not allowed to install themes on this site.' ) ); } - include_once ABSPATH . 'wp-admin/includes/class-wp-upgrader.php'; // For themes_api(). + require_once ABSPATH . 'wp-admin/includes/class-wp-upgrader.php'; // For themes_api(). check_admin_referer( 'install-theme_' . $theme ); $api = themes_api( diff --git a/wp-includes/blocks.php b/wp-includes/blocks.php index 9dcd1932147f..8a20f29e3bd1 100644 --- a/wp-includes/blocks.php +++ b/wp-includes/blocks.php @@ -318,7 +318,7 @@ function register_block_type_from_metadata( $file_or_folder, $args = array() ) { */ static $core_blocks_meta; if ( ! $core_blocks_meta ) { - $core_blocks_meta = include_once ABSPATH . WPINC . '/blocks/blocks-json.php'; + $core_blocks_meta = require_once ABSPATH . WPINC . '/blocks/blocks-json.php'; } $metadata_file = ( ! str_ends_with( $file_or_folder, 'block.json' ) ) ? diff --git a/wp-includes/comment.php b/wp-includes/comment.php index 4d61114f1d4d..0ee3f2856c86 100644 --- a/wp-includes/comment.php +++ b/wp-includes/comment.php @@ -3051,8 +3051,8 @@ function generic_ping( $post_id = 0 ) { * @param int|WP_Post $post Post ID or object. */ function pingback( $content, $post ) { - include_once ABSPATH . WPINC . '/class-IXR.php'; - include_once ABSPATH . WPINC . '/class-wp-http-ixr-client.php'; + require_once ABSPATH . WPINC . '/class-IXR.php'; + require_once ABSPATH . WPINC . '/class-wp-http-ixr-client.php'; // Original code by Mort (http://mort.mine.nu:8080). $post_links = array(); @@ -3218,8 +3218,8 @@ function trackback( $trackback_url, $title, $excerpt, $ID ) { * @param string $path Path to send the ping. */ function weblog_ping( $server = '', $path = '' ) { - include_once ABSPATH . WPINC . '/class-IXR.php'; - include_once ABSPATH . WPINC . '/class-wp-http-ixr-client.php'; + require_once ABSPATH . WPINC . '/class-IXR.php'; + require_once ABSPATH . WPINC . '/class-wp-http-ixr-client.php'; // Using a timeout of 3 seconds should be enough to cover slow servers. $client = new WP_HTTP_IXR_Client( $server, ( ( ! strlen( trim( $path ) ) || ( '/' === $path ) ) ? false : $path ) ); diff --git a/wp-includes/cron.php b/wp-includes/cron.php index 8f716fe90e93..663f819ab092 100644 --- a/wp-includes/cron.php +++ b/wp-includes/cron.php @@ -883,7 +883,7 @@ function spawn_cron( $gmt_time = 0 ) { wp_ob_end_flush_all(); flush(); - include_once ABSPATH . 'wp-cron.php'; + require_once ABSPATH . 'wp-cron.php'; return true; } diff --git a/wp-includes/functions.php b/wp-includes/functions.php index 1cd71b3f7577..2af752677d49 100644 --- a/wp-includes/functions.php +++ b/wp-includes/functions.php @@ -882,7 +882,7 @@ function do_enclose( $content, $post ) { global $wpdb; // @todo Tidy this code and make the debug code optional. - include_once ABSPATH . WPINC . '/class-IXR.php'; + require_once ABSPATH . WPINC . '/class-IXR.php'; $post = get_post( $post ); if ( ! $post ) { diff --git a/wp-includes/update.php b/wp-includes/update.php index 5136912037e7..c640e816feab 100644 --- a/wp-includes/update.php +++ b/wp-includes/update.php @@ -843,7 +843,7 @@ function wp_update_themes( $extra_stats = array() ) { * @since 3.7.0 */ function wp_maybe_auto_update() { - include_once ABSPATH . 'wp-admin/includes/admin.php'; + require_once ABSPATH . 'wp-admin/includes/admin.php'; require_once ABSPATH . 'wp-admin/includes/class-wp-upgrader.php'; $upgrader = new WP_Automatic_Updater(); diff --git a/wp-includes/version.php b/wp-includes/version.php index 5167c4eed1cb..bd69b0e0741b 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -16,7 +16,7 @@ * * @global string $wp_version */ -$wp_version = '6.3-alpha-55637'; +$wp_version = '6.3-alpha-55641'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.