Commit 60f3d7ed11 for wordpress.org
commit 60f3d7ed114617b8970a9062287c88ea9d43dda0
Author: John Blackbourn <johnbillion@git.wordpress.org>
Date: Sun Jun 29 20:55:36 2025 +0000
Docs: Documentation and i18n string improvements relating to MySQL and server requirements.
See #63166
Built from https://develop.svn.wordpress.org/trunk@60363
git-svn-id: http://core.svn.wordpress.org/trunk@59699 1a063a9b-81f0-0310-95a4-ce76da25c4cd
diff --git a/wp-admin/install.php b/wp-admin/install.php
index 736c5138e9..13ebf730bd 100644
--- a/wp-admin/install.php
+++ b/wp-admin/install.php
@@ -233,9 +233,9 @@ if ( is_blog_installed() ) {
/**
* @global string $wp_version The WordPress version string.
- * @global string $required_php_version The required PHP version string.
+ * @global string $required_php_version The minimum required PHP version string.
* @global string[] $required_php_extensions The names of required PHP extensions.
- * @global string $required_mysql_version The required MySQL version string.
+ * @global string $required_mysql_version The minimum required MySQL version string.
* @global wpdb $wpdb WordPress database abstraction object.
*/
global $wp_version, $required_php_version, $required_php_extensions, $required_mysql_version, $wpdb;
diff --git a/wp-admin/upgrade.php b/wp-admin/upgrade.php
index ea98082704..f0c9cbbdfd 100644
--- a/wp-admin/upgrade.php
+++ b/wp-admin/upgrade.php
@@ -37,9 +37,9 @@ if ( 'upgrade_db' === $step ) {
/**
* @global string $wp_version The WordPress version string.
- * @global string $required_php_version The required PHP version string.
+ * @global string $required_php_version The minimum required PHP version string.
* @global string[] $required_php_extensions The names of required PHP extensions.
- * @global string $required_mysql_version The required MySQL version string.
+ * @global string $required_mysql_version The minimum required MySQL version string.
* @global wpdb $wpdb WordPress database abstraction object.
*/
global $wp_version, $required_php_version, $required_php_extensions, $required_mysql_version, $wpdb;
diff --git a/wp-includes/class-wpdb.php b/wp-includes/class-wpdb.php
index 47f291fcb3..1aec294317 100644
--- a/wp-includes/class-wpdb.php
+++ b/wp-includes/class-wpdb.php
@@ -43,7 +43,7 @@ define( 'ARRAY_N', 'ARRAY_N' );
* By default, WordPress uses this class to instantiate the global $wpdb object, providing
* access to the WordPress database.
*
- * It is possible to replace this class with your own by setting the $wpdb global variable
+ * It is possible to replace the global instance with your own by setting the $wpdb global variable
* in wp-content/db.php file to your class. The wpdb class will still be included, so you can
* extend it or simply use your own.
*
@@ -237,7 +237,6 @@ class wpdb {
* WordPress table prefix.
*
* You can set this to have multiple WordPress installations in a single database.
- * The second reason is for possible security precautions.
*
* @since 2.5.0
*
@@ -941,7 +940,7 @@ class wpdb {
/**
* Changes the current SQL mode, and ensures its WordPress compatibility.
*
- * If no modes are passed, it will ensure the current MySQL server modes are compatible.
+ * If no modes are passed, it will ensure the current SQL server modes are compatible.
*
* @since 3.9.0
*
@@ -1369,7 +1368,7 @@ class wpdb {
}
/**
- * Quotes an identifier for a MySQL database, e.g. table/field names.
+ * Quotes an identifier such as a table or field name.
*
* @since 6.2.0
*
@@ -1435,6 +1434,13 @@ class wpdb {
* 'foo'
* );
*
+ * $wpdb->prepare(
+ * "SELECT * FROM %i WHERE %i = %s",
+ * $table,
+ * $field,
+ * $value
+ * );
+ *
* @since 2.3.0
* @since 5.3.0 Formalized the existing and already documented `...$args` parameter
* by updating the function signature. The second parameter was changed
@@ -1957,7 +1963,7 @@ class wpdb {
$client_flags = defined( 'MYSQL_CLIENT_FLAGS' ) ? MYSQL_CLIENT_FLAGS : 0;
/*
- * Set the MySQLi error reporting off because WordPress handles its own.
+ * Switch error reporting off because WordPress handles its own.
* This is due to the default value change from `MYSQLI_REPORT_OFF`
* to `MYSQLI_REPORT_ERROR|MYSQLI_REPORT_STRICT` in PHP 8.1.
*/
@@ -2100,7 +2106,7 @@ class wpdb {
}
$host = ! empty( $matches['host'] ) ? $matches['host'] : '';
- // MySQLi port cannot be a string; must be null or an integer.
+ // Port cannot be a string; must be null or an integer.
$port = ! empty( $matches['port'] ) ? absint( $matches['port'] ) : null;
return array( $host, $port, $socket, $is_ipv6 );
@@ -2290,7 +2296,7 @@ class wpdb {
if ( $this->dbh instanceof mysqli ) {
$this->last_error = mysqli_error( $this->dbh );
} else {
- $this->last_error = __( 'Unable to retrieve the error message from MySQL' );
+ $this->last_error = __( 'Unable to retrieve the error message from the database server' );
}
if ( $this->last_error ) {
@@ -3473,7 +3479,7 @@ class wpdb {
}
/**
- * Checks if the query is accessing a collation considered safe on the current version of MySQL.
+ * Checks if the query is accessing a collation considered safe.
*
* @since 4.2.0
*
@@ -3987,11 +3993,11 @@ class wpdb {
}
/**
- * Determines whether MySQL database is at least the required minimum version.
+ * Determines whether the database server is at least the required minimum version.
*
* @since 2.5.0
*
- * @global string $required_mysql_version The required MySQL version string.
+ * @global string $required_mysql_version The minimum required MySQL version string.
* @return void|WP_Error
*/
public function check_database_version() {
@@ -4047,7 +4053,7 @@ class wpdb {
*
* Capability sniffs for the database server and current version of WPDB.
*
- * Database sniffs are based on the version of MySQL the site is using.
+ * Database sniffs are based on the version of the database server in use.
*
* WPDB sniffs are added as new features are introduced to allow theme and plugin
* developers to determine feature support. This is to account for drop-ins which may
@@ -4119,7 +4125,7 @@ class wpdb {
}
/**
- * Retrieves the database server version.
+ * Retrieves the database server version number.
*
* @since 2.7.0
*
@@ -4130,11 +4136,11 @@ class wpdb {
}
/**
- * Returns the version of the MySQL server.
+ * Returns the raw version string of the database server.
*
* @since 5.5.0
*
- * @return string Server version as a string.
+ * @return string Database server version as a string.
*/
public function db_server_info() {
return mysqli_get_server_info( $this->dbh );
diff --git a/wp-includes/load.php b/wp-includes/load.php
index 0526cb175d..e51c322908 100644
--- a/wp-includes/load.php
+++ b/wp-includes/load.php
@@ -139,15 +139,18 @@ function wp_populate_basic_auth_from_authorization_header() {
}
/**
- * Checks for the required PHP version, and the mysqli extension or
- * a database drop-in.
+ * Checks the server requirements.
+ *
+ * - PHP version
+ * - PHP extensions
+ * - MySQL or MariaDB version (unless a database drop-in is present)
*
* Dies if requirements are not met.
*
* @since 3.0.0
* @access private
*
- * @global string $required_php_version The required PHP version string.
+ * @global string $required_php_version The minimum required PHP version string.
* @global string[] $required_php_extensions The names of required PHP extensions.
* @global string $wp_version The WordPress version string.
*/
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 88b2611276..03df73ad63 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -16,7 +16,7 @@
*
* @global string $wp_version
*/
-$wp_version = '6.9-alpha-60362';
+$wp_version = '6.9-alpha-60363';
/**
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.
@@ -33,7 +33,7 @@ $wp_db_version = 58975;
$tinymce_version = '49110-20201110';
/**
- * Holds the required PHP version.
+ * Holds the minimum required PHP version.
*
* @global string $required_php_version
*/
@@ -50,7 +50,7 @@ $required_php_extensions = array(
);
/**
- * Holds the required MySQL version.
+ * Holds the minimum required MySQL version.
*
* @global string $required_mysql_version
*/
diff --git a/wp-settings.php b/wp-settings.php
index f5a0929db8..60ffc307c5 100644
--- a/wp-settings.php
+++ b/wp-settings.php
@@ -25,9 +25,9 @@ define( 'WPINC', 'wp-includes' );
* @global string $wp_version The WordPress version string.
* @global int $wp_db_version WordPress database version.
* @global string $tinymce_version TinyMCE version.
- * @global string $required_php_version The required PHP version string.
+ * @global string $required_php_version The minimum required PHP version string.
* @global string[] $required_php_extensions The names of required PHP extensions.
- * @global string $required_mysql_version The required MySQL version string.
+ * @global string $required_mysql_version The minimum required MySQL version string.
* @global string $wp_local_package Locale code of the package.
*/
global $wp_version, $wp_db_version, $tinymce_version, $required_php_version, $required_php_extensions, $required_mysql_version, $wp_local_package;
@@ -35,7 +35,7 @@ require ABSPATH . WPINC . '/version.php';
require ABSPATH . WPINC . '/compat.php';
require ABSPATH . WPINC . '/load.php';
-// Check for the required PHP version and for the MySQL extension or a database drop-in.
+// Check the server requirements.
wp_check_php_mysql_versions();
// Include files required for initialization.