Skip to content

Commit d4f55d9

Browse files
committed
Merge branch '62622-php-74' of https://github.com/johnbillion/wordpress-develop into 62622-php-74
2 parents 8a0172f + edc4ed1 commit d4f55d9

2 files changed

Lines changed: 3 additions & 1 deletion

File tree

src/wp-admin/includes/misc.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1626,7 +1626,7 @@ function wp_check_php_version() {
16261626

16271627
$response['is_lower_than_future_minimum'] = false;
16281628

1629-
// The minimum supported PHP version will be updated to 8.0 in the future. Check if the current version is lower.
1629+
// The minimum supported PHP version will be updated to at least 8.0 in the future. Check if the current version is lower.
16301630
if ( version_compare( $version, '8.0', '<' ) ) {
16311631
$response['is_lower_than_future_minimum'] = true;
16321632

src/wp-includes/pluggable.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2677,6 +2677,7 @@ function wp_hash_password(
26772677
* - `PASSWORD_DEFAULT`
26782678
*
26792679
* @since 6.8.0
2680+
* @since 6.9.0 The paramater passed will always be a string.
26802681
*
26812682
* @param string $algorithm The hashing algorithm. Default is the value of the `PASSWORD_BCRYPT` constant.
26822683
*/
@@ -2689,6 +2690,7 @@ function wp_hash_password(
26892690
* filter. You must ensure that the options are appropriate for the algorithm in use.
26902691
*
26912692
* @since 6.8.0
2693+
* @since 6.9 $algorithm will always be a string rather than sometimes being an integer.
26922694
*
26932695
* @param array $options Array of options to pass to the password hashing functions.
26942696
* By default this is an empty array which means the default

0 commit comments

Comments
 (0)