From 40fc19024f790b30b3d48bf61fd9ccf683c024d6 Mon Sep 17 00:00:00 2001 From: Sergey Biryukov Date: Fri, 20 May 2022 17:38:14 +0000 Subject: [PATCH] Code Modernization: Replace `phpversion()` function calls with `PHP_VERSION` constant. `phpversion()` return value and `PHP_VERSION` constant value are identical, but the latter is several times faster because it is a direct constant value lookup compared to a function call. Props ayeshrajans, jrf, mukesh27, costdev, hellofromTonya, SergeyBiryukov. Fixes #55680. Built from https://develop.svn.wordpress.org/trunk@53426 git-svn-id: http://core.svn.wordpress.org/trunk@53015 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- .../includes/class-plugin-installer-skin.php | 2 +- wp-admin/includes/class-plugin-upgrader.php | 2 +- .../includes/class-theme-installer-skin.php | 2 +- wp-admin/includes/class-theme-upgrader.php | 2 +- .../includes/class-wp-automatic-updater.php | 4 +-- wp-admin/includes/class-wp-debug-data.php | 25 ++++++++----------- wp-admin/includes/file.php | 6 ++--- wp-admin/includes/misc.php | 2 +- wp-admin/includes/plugin.php | 4 +-- wp-admin/includes/update-core.php | 2 +- wp-admin/install.php | 2 +- wp-admin/update-core.php | 2 +- wp-admin/upgrade.php | 2 +- wp-cron.php | 2 +- wp-includes/functions.php | 2 +- wp-includes/load.php | 2 +- wp-includes/update.php | 2 +- wp-includes/version.php | 2 +- 18 files changed, 31 insertions(+), 36 deletions(-) diff --git a/wp-admin/includes/class-plugin-installer-skin.php b/wp-admin/includes/class-plugin-installer-skin.php index e36b2d2931..8a1ee5609a 100644 --- a/wp-admin/includes/class-plugin-installer-skin.php +++ b/wp-admin/includes/class-plugin-installer-skin.php @@ -266,7 +266,7 @@ class Plugin_Installer_Skin extends WP_Upgrader_Skin { $error = sprintf( /* translators: 1: Current PHP version, 2: Version required by the uploaded plugin. */ __( 'The PHP version on your server is %1$s, however the uploaded plugin requires %2$s.' ), - phpversion(), + PHP_VERSION, $requires_php ); diff --git a/wp-admin/includes/class-plugin-upgrader.php b/wp-admin/includes/class-plugin-upgrader.php index a8ccf7cd78..812a5691a8 100644 --- a/wp-admin/includes/class-plugin-upgrader.php +++ b/wp-admin/includes/class-plugin-upgrader.php @@ -447,7 +447,7 @@ class Plugin_Upgrader extends WP_Upgrader { $error = sprintf( /* translators: 1: Current PHP version, 2: Version required by the uploaded plugin. */ __( 'The PHP version on your server is %1$s, however the uploaded plugin requires %2$s.' ), - phpversion(), + PHP_VERSION, $requires_php ); diff --git a/wp-admin/includes/class-theme-installer-skin.php b/wp-admin/includes/class-theme-installer-skin.php index cfbc8a6ecb..acdb1de122 100644 --- a/wp-admin/includes/class-theme-installer-skin.php +++ b/wp-admin/includes/class-theme-installer-skin.php @@ -301,7 +301,7 @@ class Theme_Installer_Skin extends WP_Upgrader_Skin { $error = sprintf( /* translators: 1: Current PHP version, 2: Version required by the uploaded theme. */ __( 'The PHP version on your server is %1$s, however the uploaded theme requires %2$s.' ), - phpversion(), + PHP_VERSION, $requires_php ); diff --git a/wp-admin/includes/class-theme-upgrader.php b/wp-admin/includes/class-theme-upgrader.php index 4e874cd636..9907c44feb 100644 --- a/wp-admin/includes/class-theme-upgrader.php +++ b/wp-admin/includes/class-theme-upgrader.php @@ -599,7 +599,7 @@ class Theme_Upgrader extends WP_Upgrader { $error = sprintf( /* translators: 1: Current PHP version, 2: Version required by the uploaded theme. */ __( 'The PHP version on your server is %1$s, however the uploaded theme requires %2$s.' ), - phpversion(), + PHP_VERSION, $requires_php ); diff --git a/wp-admin/includes/class-wp-automatic-updater.php b/wp-admin/includes/class-wp-automatic-updater.php index ed384da57f..c8227c3fc3 100644 --- a/wp-admin/includes/class-wp-automatic-updater.php +++ b/wp-admin/includes/class-wp-automatic-updater.php @@ -222,7 +222,7 @@ class WP_Automatic_Updater { if ( 'core' === $type ) { global $wpdb; - $php_compat = version_compare( phpversion(), $item->php_version, '>=' ); + $php_compat = version_compare( PHP_VERSION, $item->php_version, '>=' ); if ( file_exists( WP_CONTENT_DIR . '/db.php' ) && empty( $wpdb->is_mysql ) ) { $mysql_compat = true; } else { @@ -236,7 +236,7 @@ class WP_Automatic_Updater { // If updating a plugin or theme, ensure the minimum PHP version requirements are satisfied. if ( in_array( $type, array( 'plugin', 'theme' ), true ) ) { - if ( ! empty( $item->requires_php ) && version_compare( phpversion(), $item->requires_php, '<' ) ) { + if ( ! empty( $item->requires_php ) && version_compare( PHP_VERSION, $item->requires_php, '<' ) ) { return false; } } diff --git a/wp-admin/includes/class-wp-debug-data.php b/wp-admin/includes/class-wp-debug-data.php index 3d4e664ed7..7e301f43f4 100644 --- a/wp-admin/includes/class-wp-debug-data.php +++ b/wp-admin/includes/class-wp-debug-data.php @@ -677,23 +677,18 @@ class WP_Debug_Data { $server_architecture = 'unknown'; } - if ( function_exists( 'phpversion' ) ) { - $php_version_debug = phpversion(); - // Whether PHP supports 64-bit. - $php64bit = ( PHP_INT_SIZE * 8 === 64 ); + $php_version_debug = PHP_VERSION; + // Whether PHP supports 64-bit. + $php64bit = ( PHP_INT_SIZE * 8 === 64 ); - $php_version = sprintf( - '%s %s', - $php_version_debug, - ( $php64bit ? __( '(Supports 64bit values)' ) : __( '(Does not support 64bit values)' ) ) - ); + $php_version = sprintf( + '%s %s', + $php_version_debug, + ( $php64bit ? __( '(Supports 64bit values)' ) : __( '(Does not support 64bit values)' ) ) + ); - if ( $php64bit ) { - $php_version_debug .= ' 64bit'; - } - } else { - $php_version = __( 'Unable to determine PHP version' ); - $php_version_debug = 'unknown'; + if ( $php64bit ) { + $php_version_debug .= ' 64bit'; } if ( function_exists( 'php_sapi_name' ) ) { diff --git a/wp-admin/includes/file.php b/wp-admin/includes/file.php index a8975356c0..a19871aa05 100644 --- a/wp-admin/includes/file.php +++ b/wp-admin/includes/file.php @@ -1385,7 +1385,7 @@ function verify_file_signature( $filename, $signatures, $filename_for_errors = f '' . esc_html( $filename_for_errors ) . '' ), array( - 'php' => phpversion(), + 'php' => PHP_VERSION, 'sodium' => defined( 'SODIUM_LIBRARY_VERSION' ) ? SODIUM_LIBRARY_VERSION : ( defined( 'ParagonIE_Sodium_Compat::VERSION_STRING' ) ? ParagonIE_Sodium_Compat::VERSION_STRING : false ), ) ); @@ -1420,7 +1420,7 @@ function verify_file_signature( $filename, $signatures, $filename_for_errors = f '' . esc_html( $filename_for_errors ) . '' ), array( - 'php' => phpversion(), + 'php' => PHP_VERSION, 'sodium' => defined( 'SODIUM_LIBRARY_VERSION' ) ? SODIUM_LIBRARY_VERSION : ( defined( 'ParagonIE_Sodium_Compat::VERSION_STRING' ) ? ParagonIE_Sodium_Compat::VERSION_STRING : false ), 'polyfill_is_fast' => false, 'max_execution_time' => ini_get( 'max_execution_time' ), @@ -1493,7 +1493,7 @@ function verify_file_signature( $filename, $signatures, $filename_for_errors = f 'hash' => bin2hex( $file_hash ), 'skipped_key' => $skipped_key, 'skipped_sig' => $skipped_signature, - 'php' => phpversion(), + 'php' => PHP_VERSION, 'sodium' => defined( 'SODIUM_LIBRARY_VERSION' ) ? SODIUM_LIBRARY_VERSION : ( defined( 'ParagonIE_Sodium_Compat::VERSION_STRING' ) ? ParagonIE_Sodium_Compat::VERSION_STRING : false ), ) ); diff --git a/wp-admin/includes/misc.php b/wp-admin/includes/misc.php index 20aad2464a..3cb8efd7ec 100644 --- a/wp-admin/includes/misc.php +++ b/wp-admin/includes/misc.php @@ -1524,7 +1524,7 @@ function _wp_privacy_settings_filter_draft_page_titles( $title, $page ) { * @return array|false Array of PHP version data. False on failure. */ function wp_check_php_version() { - $version = phpversion(); + $version = PHP_VERSION; $key = md5( $version ); $response = get_site_transient( 'php_check_' . $key ); diff --git a/wp-admin/includes/plugin.php b/wp-admin/includes/plugin.php index 6f47c8b6c7..7834abe6f2 100644 --- a/wp-admin/includes/plugin.php +++ b/wp-admin/includes/plugin.php @@ -1150,7 +1150,7 @@ function validate_plugin_requirements( $plugin ) { /* translators: 1: Current WordPress version, 2: Current PHP version, 3: Plugin name, 4: Required WordPress version, 5: Required PHP version. */ _x( 'Error: Current versions of WordPress (%1$s) and PHP (%2$s) do not meet minimum requirements for %3$s. The plugin requires WordPress %4$s and PHP %5$s.', 'plugin' ), get_bloginfo( 'version' ), - phpversion(), + PHP_VERSION, $plugin_headers['Name'], $requirements['requires'], $requirements['requires_php'] @@ -1162,7 +1162,7 @@ function validate_plugin_requirements( $plugin ) { '

' . sprintf( /* translators: 1: Current PHP version, 2: Plugin name, 3: Required PHP version. */ _x( 'Error: Current PHP version (%1$s) does not meet minimum requirements for %2$s. The plugin requires PHP %3$s.', 'plugin' ), - phpversion(), + PHP_VERSION, $plugin_headers['Name'], $requirements['requires_php'] ) . $php_update_message . '

' diff --git a/wp-admin/includes/update-core.php b/wp-admin/includes/update-core.php index 5d2a2e2127..8f26609d1e 100644 --- a/wp-admin/includes/update-core.php +++ b/wp-admin/includes/update-core.php @@ -1012,7 +1012,7 @@ function update_core( $from, $to ) { require WP_CONTENT_DIR . '/upgrade/version-current.php'; $wp_filesystem->delete( $versions_file ); - $php_version = phpversion(); + $php_version = PHP_VERSION; $mysql_version = $wpdb->db_version(); $old_wp_version = $GLOBALS['wp_version']; // The version of WordPress we're updating from. $development_build = ( false !== strpos( $old_wp_version . $wp_version, '-' ) ); // A dash in the version indicates a development release. diff --git a/wp-admin/install.php b/wp-admin/install.php index 2fb99cdbde..b7217a05d3 100644 --- a/wp-admin/install.php +++ b/wp-admin/install.php @@ -228,7 +228,7 @@ if ( is_blog_installed() ) { */ global $wp_version, $required_php_version, $required_mysql_version; -$php_version = phpversion(); +$php_version = PHP_VERSION; $mysql_version = $wpdb->db_version(); $php_compat = version_compare( $php_version, $required_php_version, '>=' ); $mysql_compat = version_compare( $mysql_version, $required_mysql_version, '>=' ) || file_exists( WP_CONTENT_DIR . '/db.php' ); diff --git a/wp-admin/update-core.php b/wp-admin/update-core.php index a753cb6fca..1c204d7fcc 100644 --- a/wp-admin/update-core.php +++ b/wp-admin/update-core.php @@ -59,7 +59,7 @@ function list_core_update( $update ) { $message = ''; $form_action = 'update-core.php?action=do-core-upgrade'; - $php_version = phpversion(); + $php_version = PHP_VERSION; $mysql_version = $wpdb->db_version(); $show_buttons = true; diff --git a/wp-admin/upgrade.php b/wp-admin/upgrade.php index 716b8cdc33..66ee42729d 100644 --- a/wp-admin/upgrade.php +++ b/wp-admin/upgrade.php @@ -44,7 +44,7 @@ global $wp_version, $required_php_version, $required_mysql_version; $step = (int) $step; -$php_version = phpversion(); +$php_version = PHP_VERSION; $mysql_version = $wpdb->db_version(); $php_compat = version_compare( $php_version, $required_php_version, '>=' ); if ( file_exists( WP_CONTENT_DIR . '/db.php' ) && empty( $wpdb->is_mysql ) ) { diff --git a/wp-cron.php b/wp-cron.php index 98bb1a4b28..32f8d3ead6 100644 --- a/wp-cron.php +++ b/wp-cron.php @@ -19,7 +19,7 @@ ignore_user_abort( true ); /* Don't make the request block till we finish, if possible. */ -if ( function_exists( 'fastcgi_finish_request' ) && version_compare( phpversion(), '7.0.16', '>=' ) ) { +if ( PHP_VERSION_ID >= 70016 && function_exists( 'fastcgi_finish_request' ) ) { if ( ! headers_sent() ) { header( 'Expires: Wed, 11 Jan 1984 05:00:00 GMT' ); header( 'Cache-Control: no-cache, must-revalidate, max-age=0' ); diff --git a/wp-includes/functions.php b/wp-includes/functions.php index b4ea6fbce0..b73e97a932 100644 --- a/wp-includes/functions.php +++ b/wp-includes/functions.php @@ -8422,7 +8422,7 @@ function is_wp_version_compatible( $required ) { * @return bool True if required version is compatible or empty, false if not. */ function is_php_version_compatible( $required ) { - return empty( $required ) || version_compare( phpversion(), $required, '>=' ); + return empty( $required ) || version_compare( PHP_VERSION, $required, '>=' ); } /** diff --git a/wp-includes/load.php b/wp-includes/load.php index ae5ada388d..1b8c325256 100644 --- a/wp-includes/load.php +++ b/wp-includes/load.php @@ -143,7 +143,7 @@ function wp_populate_basic_auth_from_authorization_header() { */ function wp_check_php_mysql_versions() { global $required_php_version, $wp_version; - $php_version = phpversion(); + $php_version = PHP_VERSION; if ( version_compare( $required_php_version, $php_version, '>' ) ) { $protocol = wp_get_server_protocol(); diff --git a/wp-includes/update.php b/wp-includes/update.php index a18a81e477..1c9a7cbeb6 100644 --- a/wp-includes/update.php +++ b/wp-includes/update.php @@ -32,7 +32,7 @@ function wp_version_check( $extra_stats = array(), $force_check = false ) { // Include an unmodified $wp_version. require ABSPATH . WPINC . '/version.php'; - $php_version = phpversion(); + $php_version = PHP_VERSION; $current = get_site_transient( 'update_core' ); $translations = wp_get_installed_translations( 'core' ); diff --git a/wp-includes/version.php b/wp-includes/version.php index 1667cc0608..9b4f034a44 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -16,7 +16,7 @@ * * @global string $wp_version */ -$wp_version = '6.1-alpha-53421'; +$wp_version = '6.1-alpha-53426'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.