| ` stops at tags `TABLE`,
+ * `TBODY`, `TR`, and `TD`. The `TBODY` and `TR` tags do not appear in
+ * the original HTML and cannot be used as bookmarks.
+ *
* @since 6.4.0
*
* @param string $bookmark_name Identifies this particular bookmark.
* @return bool Whether the bookmark was successfully created.
*/
public function set_bookmark( $bookmark_name ): bool {
+ if ( $this->is_virtual() ) {
+ _doing_it_wrong(
+ __METHOD__,
+ __( 'Cannot set bookmarks on tokens that do no appear in the original HTML text.' ),
+ '6.8.0'
+ );
+ return false;
+ }
return parent::set_bookmark( "_{$bookmark_name}" );
}
diff --git a/src/wp-includes/https-detection.php b/src/wp-includes/https-detection.php
index f34d6a3a11082..87fd4ad626dab 100644
--- a/src/wp-includes/https-detection.php
+++ b/src/wp-includes/https-detection.php
@@ -63,31 +63,33 @@ function wp_is_site_url_using_https() {
/**
* Checks whether HTTPS is supported for the server and domain.
*
+ * This function makes an HTTP request through `wp_get_https_detection_errors()`
+ * to check for HTTPS support. As this process can be resource-intensive,
+ * it should be used cautiously, especially in performance-sensitive environments,
+ * to avoid potential latency issues.
+ *
* @since 5.7.0
*
* @return bool True if HTTPS is supported, false otherwise.
*/
function wp_is_https_supported() {
- $https_detection_errors = get_option( 'https_detection_errors' );
-
- // If option has never been set by the Cron hook before, run it on-the-fly as fallback.
- if ( false === $https_detection_errors ) {
- wp_update_https_detection_errors();
+ $https_detection_errors = wp_get_https_detection_errors();
- $https_detection_errors = get_option( 'https_detection_errors' );
- }
-
- // If there are no detection errors, HTTPS is supported.
+ // If there are errors, HTTPS is not supported.
return empty( $https_detection_errors );
}
/**
* Runs a remote HTTPS request to detect whether HTTPS supported, and stores potential errors.
*
- * This internal function is called by a regular Cron hook to ensure HTTPS support is detected and maintained.
+ * This function checks for HTTPS support by making an HTTP request. As this process can be resource-intensive,
+ * it should be used cautiously, especially in performance-sensitive environments.
+ * It is called when HTTPS support needs to be validated.
*
* @since 6.4.0
* @access private
+ *
+ * @return array An array containing potential detection errors related to HTTPS, or an empty array if no errors are found.
*/
function wp_get_https_detection_errors() {
/**
diff --git a/src/wp-includes/link-template.php b/src/wp-includes/link-template.php
index 61798c379841b..da57ebd64df80 100644
--- a/src/wp-includes/link-template.php
+++ b/src/wp-includes/link-template.php
@@ -4289,7 +4289,7 @@ function the_shortlink( $text = '', $title = '', $before = '', $after = '' ) {
*
* @since 4.2.0
*
- * @param mixed $id_or_email The avatar to retrieve a URL for. Accepts a user ID, Gravatar MD5 hash,
+ * @param mixed $id_or_email The avatar to retrieve a URL for. Accepts a user ID, Gravatar SHA-256 or MD5 hash,
* user email, WP_User object, WP_Post object, or WP_Comment object.
* @param array $args {
* Optional. Arguments to use instead of the default arguments.
@@ -4353,8 +4353,9 @@ function is_avatar_comment_type( $comment_type ) {
*
* @since 4.2.0
* @since 6.7.0 Gravatar URLs always use HTTPS.
+ * @since 6.8.0 Gravatar URLs use the SHA-256 hashing algorithm.
*
- * @param mixed $id_or_email The avatar to retrieve. Accepts a user ID, Gravatar MD5 hash,
+ * @param mixed $id_or_email The avatar to retrieve. Accepts a user ID, Gravatar SHA-256 or MD5 hash,
* user email, WP_User object, WP_Post object, or WP_Comment object.
* @param array $args {
* Optional. Arguments to use instead of the default arguments.
@@ -4474,7 +4475,7 @@ function get_avatar_data( $id_or_email, $args = null ) {
* @since 4.2.0
*
* @param array $args Arguments passed to get_avatar_data(), after processing.
- * @param mixed $id_or_email The avatar to retrieve. Accepts a user ID, Gravatar MD5 hash,
+ * @param mixed $id_or_email The avatar to retrieve. Accepts a user ID, Gravatar SHA-256 or MD5 hash,
* user email, WP_User object, WP_Post object, or WP_Comment object.
*/
$args = apply_filters( 'pre_get_avatar_data', $args, $id_or_email );
@@ -4496,7 +4497,10 @@ function get_avatar_data( $id_or_email, $args = null ) {
if ( is_numeric( $id_or_email ) ) {
$user = get_user_by( 'id', absint( $id_or_email ) );
} elseif ( is_string( $id_or_email ) ) {
- if ( str_contains( $id_or_email, '@md5.gravatar.com' ) ) {
+ if ( str_contains( $id_or_email, '@sha256.gravatar.com' ) ) {
+ // SHA-256 hash.
+ list( $email_hash ) = explode( '@', $id_or_email );
+ } elseif ( str_contains( $id_or_email, '@md5.gravatar.com' ) ) {
// MD5 hash.
list( $email_hash ) = explode( '@', $id_or_email );
} else {
@@ -4530,7 +4534,7 @@ function get_avatar_data( $id_or_email, $args = null ) {
}
if ( $email ) {
- $email_hash = md5( strtolower( trim( $email ) ) );
+ $email_hash = hash( 'sha256', strtolower( trim( $email ) ) );
}
}
@@ -4564,7 +4568,7 @@ function get_avatar_data( $id_or_email, $args = null ) {
* @since 4.2.0
*
* @param string $url The URL of the avatar.
- * @param mixed $id_or_email The avatar to retrieve. Accepts a user ID, Gravatar MD5 hash,
+ * @param mixed $id_or_email The avatar to retrieve. Accepts a user ID, Gravatar SHA-256 or MD5 hash,
* user email, WP_User object, WP_Post object, or WP_Comment object.
* @param array $args Arguments passed to get_avatar_data(), after processing.
*/
@@ -4576,7 +4580,7 @@ function get_avatar_data( $id_or_email, $args = null ) {
* @since 4.2.0
*
* @param array $args Arguments passed to get_avatar_data(), after processing.
- * @param mixed $id_or_email The avatar to retrieve. Accepts a user ID, Gravatar MD5 hash,
+ * @param mixed $id_or_email The avatar to retrieve. Accepts a user ID, Gravatar SHA-256 or MD5 hash,
* user email, WP_User object, WP_Post object, or WP_Comment object.
*/
return apply_filters( 'get_avatar_data', $args, $id_or_email );
diff --git a/src/wp-includes/ms-functions.php b/src/wp-includes/ms-functions.php
index 29864b01af7da..843bb7546b30b 100644
--- a/src/wp-includes/ms-functions.php
+++ b/src/wp-includes/ms-functions.php
@@ -261,7 +261,7 @@ function remove_user_from_blog( $user_id, $blog_id = 0, $reassign = 0 ) {
$new_domain = '';
$blogs = get_blogs_of_user( $user_id );
foreach ( (array) $blogs as $blog ) {
- if ( (int) $blog->userblog_id === $blog_id ) {
+ if ( $blog->userblog_id === $blog_id ) {
continue;
}
$new_id = $blog->userblog_id;
diff --git a/src/wp-includes/post-thumbnail-template.php b/src/wp-includes/post-thumbnail-template.php
index 7d722ae9de407..59723c7fadb07 100644
--- a/src/wp-includes/post-thumbnail-template.php
+++ b/src/wp-includes/post-thumbnail-template.php
@@ -19,7 +19,7 @@
* @since 2.9.0
* @since 4.4.0 `$post` can be a post ID or WP_Post object.
*
- * @param int|WP_Post $post Optional. Post ID or WP_Post object. Default is global `$post`.
+ * @param int|WP_Post|null $post Optional. Post ID or WP_Post object. Default is global `$post`.
* @return bool Whether the post has an image attached.
*/
function has_post_thumbnail( $post = null ) {
@@ -46,7 +46,7 @@ function has_post_thumbnail( $post = null ) {
* @since 5.5.0 The return value for a non-existing post
* was changed to false instead of an empty string.
*
- * @param int|WP_Post $post Optional. Post ID or WP_Post object. Default is global `$post`.
+ * @param int|WP_Post|null $post Optional. Post ID or WP_Post object. Default is global `$post`.
* @return int|false Post thumbnail ID (which can be 0 if the thumbnail is not set),
* or false if the post does not exist.
*/
@@ -99,7 +99,7 @@ function the_post_thumbnail( $size = 'post-thumbnail', $attr = '' ) {
*
* @global WP_Query $wp_query WordPress Query object.
*
- * @param WP_Query $wp_query Optional. A WP_Query instance. Defaults to the $wp_query global.
+ * @param WP_Query|null $wp_query Optional. A WP_Query instance. Defaults to the $wp_query global.
*/
function update_post_thumbnail_cache( $wp_query = null ) {
if ( ! $wp_query ) {
@@ -156,10 +156,10 @@ function update_post_thumbnail_cache( $wp_query = null ) {
* @since 2.9.0
* @since 4.4.0 `$post` can be a post ID or WP_Post object.
*
- * @param int|WP_Post $post Optional. Post ID or WP_Post object. Default is global `$post`.
- * @param string|int[] $size Optional. Image size. Accepts any registered image size name, or an array of
- * width and height values in pixels (in that order). Default 'post-thumbnail'.
- * @param string|array $attr Optional. Query string or array of attributes. Default empty.
+ * @param int|WP_Post|null $post Optional. Post ID or WP_Post object. Default is global `$post`.
+ * @param string|int[] $size Optional. Image size. Accepts any registered image size name, or an array of
+ * width and height values in pixels (in that order). Default 'post-thumbnail'.
+ * @param string|array $attr Optional. Query string or array of attributes. Default empty.
* @return string The post thumbnail image tag.
*/
function get_the_post_thumbnail( $post = null, $size = 'post-thumbnail', $attr = '' ) {
@@ -241,9 +241,9 @@ function get_the_post_thumbnail( $post = null, $size = 'post-thumbnail', $attr =
*
* @since 4.4.0
*
- * @param int|WP_Post $post Optional. Post ID or WP_Post object. Default is global `$post`.
- * @param string|int[] $size Optional. Registered image size to retrieve the source for or a flat array
- * of height and width dimensions. Default 'post-thumbnail'.
+ * @param int|WP_Post|null $post Optional. Post ID or WP_Post object. Default is global `$post`.
+ * @param string|int[] $size Optional. Registered image size to retrieve the source for or a flat array
+ * of height and width dimensions. Default 'post-thumbnail'.
* @return string|false Post thumbnail URL or false if no image is available. If `$size` does not match
* any registered image size, the original image URL will be returned.
*/
@@ -291,7 +291,7 @@ function the_post_thumbnail_url( $size = 'post-thumbnail' ) {
*
* @since 4.6.0
*
- * @param int|WP_Post $post Optional. Post ID or WP_Post object. Default is global `$post`.
+ * @param int|WP_Post|null $post Optional. Post ID or WP_Post object. Default is global `$post`.
* @return string Post thumbnail caption.
*/
function get_the_post_thumbnail_caption( $post = null ) {
@@ -315,7 +315,7 @@ function get_the_post_thumbnail_caption( $post = null ) {
*
* @since 4.6.0
*
- * @param int|WP_Post $post Optional. Post ID or WP_Post object. Default is global `$post`.
+ * @param int|WP_Post|null $post Optional. Post ID or WP_Post object. Default is global `$post`.
*/
function the_post_thumbnail_caption( $post = null ) {
/**
diff --git a/src/wp-includes/rest-api/endpoints/class-wp-rest-block-directory-controller.php b/src/wp-includes/rest-api/endpoints/class-wp-rest-block-directory-controller.php
index cfcb0dbc5c7bc..8a34c78d33c0b 100644
--- a/src/wp-includes/rest-api/endpoints/class-wp-rest-block-directory-controller.php
+++ b/src/wp-includes/rest-api/endpoints/class-wp-rest-block-directory-controller.php
@@ -285,7 +285,7 @@ public function get_item_schema() {
'context' => array( 'view' ),
),
'humanized_updated' => array(
- 'description' => __( 'The date when the block was last updated, in fuzzy human readable format.' ),
+ 'description' => __( 'The date when the block was last updated, in human readable format.' ),
'type' => 'string',
'context' => array( 'view' ),
),
diff --git a/src/wp-includes/rest-api/endpoints/class-wp-rest-posts-controller.php b/src/wp-includes/rest-api/endpoints/class-wp-rest-posts-controller.php
index 8852519ec45c9..95851199c6e4d 100644
--- a/src/wp-includes/rest-api/endpoints/class-wp-rest-posts-controller.php
+++ b/src/wp-includes/rest-api/endpoints/class-wp-rest-posts-controller.php
@@ -346,7 +346,7 @@ public function get_items( $request ) {
$args = $this->prepare_tax_query( $args, $request );
- if ( ! empty( $request['format'] ) ) {
+ if ( isset( $registered['format'], $request['format'] ) ) {
$formats = $request['format'];
/*
* The relation needs to be set to `OR` since the request can contain
diff --git a/src/wp-includes/script-loader.php b/src/wp-includes/script-loader.php
index d2c8dbe97e393..6a5768a8a4b9b 100644
--- a/src/wp-includes/script-loader.php
+++ b/src/wp-includes/script-loader.php
@@ -106,8 +106,8 @@ function wp_default_packages_vendor( $scripts ) {
);
$vendor_scripts_versions = array(
- 'react' => '18.3.1',
- 'react-dom' => '18.3.1',
+ 'react' => '18.3.1.1', // Final .1 due to switch to UMD build, can be removed in the next update.
+ 'react-dom' => '18.3.1.1', // Final .1 due to switch to UMD build, can be removed in the next update.
'react-jsx-runtime' => '18.3.1',
'regenerator-runtime' => '0.14.1',
'moment' => '2.30.1',
@@ -2517,9 +2517,9 @@ function wp_enqueue_global_styles() {
if ( $is_block_theme ) {
/*
- * Dequeue the Customizer's custom CSS
- * and add it before the global styles custom CSS.
- */
+ * Dequeue the Customizer's custom CSS
+ * and add it before the global styles custom CSS.
+ */
remove_action( 'wp_head', 'wp_custom_css_cb', 101 );
// Get the custom CSS from the Customizer and add it to the global stylesheet.
$custom_css = wp_get_custom_css();
diff --git a/src/wp-includes/theme-templates.php b/src/wp-includes/theme-templates.php
index c01a4ec6721e8..55b9c8fac4990 100644
--- a/src/wp-includes/theme-templates.php
+++ b/src/wp-includes/theme-templates.php
@@ -203,6 +203,7 @@ function wp_enqueue_block_template_skip_link() {
// Create the skip link.
skipLink = document.createElement( 'a' );
skipLink.classList.add( 'skip-link', 'screen-reader-text' );
+ skipLink.id = 'wp-skip-link';
skipLink.href = '#' + skipLinkTargetID;
skipLink.innerHTML = '';
diff --git a/tests/performance/specs/home.test.js b/tests/performance/specs/home.test.js
index b88b6adb9f362..004c8f03debd4 100644
--- a/tests/performance/specs/home.test.js
+++ b/tests/performance/specs/home.test.js
@@ -14,7 +14,7 @@ const results = {
lcpMinusTtfb: [],
};
-const themes = [ 'twentytwentyone', 'twentytwentythree', 'twentytwentyfour' ];
+const themes = [ 'twentytwentyone', 'twentytwentythree', 'twentytwentyfour', 'twentytwentyfive' ];
const locales = [ 'en_US', 'de_DE' ];
diff --git a/tests/phpunit/tests/avatar.php b/tests/phpunit/tests/avatar.php
index 97f24841e372b..baec404c81285 100644
--- a/tests/phpunit/tests/avatar.php
+++ b/tests/phpunit/tests/avatar.php
@@ -11,7 +11,7 @@ class Tests_Avatar extends WP_UnitTestCase {
*/
public function test_get_avatar_url_gravatar_url() {
$url = get_avatar_url( 1 );
- $this->assertSame( preg_match( '|^https?://secure.gravatar.com/avatar/[0-9a-f]{32}\?|', $url ), 1 );
+ $this->assertSame( preg_match( '|^https?://secure.gravatar.com/avatar/[0-9a-f]{64}\?|', $url ), 1 );
}
/**
@@ -90,9 +90,12 @@ public function test_get_avatar_url_user() {
$url2 = get_avatar_url( WP_TESTS_EMAIL );
$this->assertSame( $url, $url2 );
- $url2 = get_avatar_url( md5( WP_TESTS_EMAIL ) . '@md5.gravatar.com' );
+ $url2 = get_avatar_url( hash( 'sha256', WP_TESTS_EMAIL ) . '@sha256.gravatar.com' );
$this->assertSame( $url, $url2 );
+ $url2 = get_avatar_url( md5( WP_TESTS_EMAIL ) . '@md5.gravatar.com' );
+ $this->assertSame( preg_match( '|^https?://secure.gravatar.com/avatar/[0-9a-f]{32}\?|', $url2 ), 1 );
+
$user = get_user_by( 'id', 1 );
$url2 = get_avatar_url( $user );
$this->assertSame( $url, $url2 );
@@ -267,7 +270,7 @@ public function test_get_avatar_data_should_return_gravatar_url_when_input_avata
$actual_data = get_avatar_data( $comment );
$this->assertTrue( is_avatar_comment_type( $comment_type ) );
- $this->assertMatchesRegularExpression( '|^https?://secure.gravatar.com/avatar/[0-9a-f]{32}\?|', $actual_data['url'] );
+ $this->assertMatchesRegularExpression( '|^https?://secure.gravatar.com/avatar/[0-9a-f]{64}\?|', $actual_data['url'] );
}
/**
diff --git a/tests/phpunit/tests/blocks/applyBlockHooksToContent.php b/tests/phpunit/tests/blocks/applyBlockHooksToContent.php
index f238ef6ff5266..22e3c6e8dffb5 100644
--- a/tests/phpunit/tests/blocks/applyBlockHooksToContent.php
+++ b/tests/phpunit/tests/blocks/applyBlockHooksToContent.php
@@ -91,6 +91,26 @@ public function test_apply_block_hooks_to_content_inserts_hooked_block() {
);
}
+ /**
+ * @ticket 61074
+ */
+ public function test_apply_block_hooks_to_content_with_context_set_to_null() {
+ $content = '';
+
+ /*
+ * apply_block_hooks_to_content() will fall back to the global $post object (via get_post())
+ * if the $context parameter is null. However, we'd also like to ensure that the function
+ * works as expected even when get_post() returns null.
+ */
+ $this->assertNull( get_post() );
+
+ $actual = apply_block_hooks_to_content( $content, null, 'insert_hooked_blocks' );
+ $this->assertSame(
+ '',
+ $actual
+ );
+ }
+
/**
* @ticket 61902
*/
diff --git a/tests/phpunit/tests/dependencies/scripts.php b/tests/phpunit/tests/dependencies/scripts.php
index 03dba5df69744..89bfb4ef922e6 100644
--- a/tests/phpunit/tests/dependencies/scripts.php
+++ b/tests/phpunit/tests/dependencies/scripts.php
@@ -3413,6 +3413,21 @@ public function test_vendor_script_versions_registered_manually( $script, $handl
$handle = $script;
}
+ /*
+ * Append '.1' to the version number for React and ReactDOM.
+ *
+ * This is due to a change in the build to use the UMD version of the
+ * scripts, requiring a different version number in order to break the
+ * caches of some CDNs.
+ *
+ * This can be removed in the next update to the packages.
+ *
+ * See https://core.trac.wordpress.org/ticket/62422
+ */
+ if ( in_array( $handle, array( 'react', 'react-dom' ), true ) ) {
+ $package_json[ $script ] .= '.1';
+ }
+
$script_query = $wp_scripts->query( $handle, 'registered' );
$this->assertNotFalse( $script_query, "The script '{$handle}' should be registered." );
diff --git a/tests/phpunit/tests/formatting/convertSmilies.php b/tests/phpunit/tests/formatting/convertSmilies.php
index 6a6cfffdeb990..24c2a8087a93f 100644
--- a/tests/phpunit/tests/formatting/convertSmilies.php
+++ b/tests/phpunit/tests/formatting/convertSmilies.php
@@ -8,6 +8,12 @@
*/
class Tests_Formatting_ConvertSmilies extends WP_UnitTestCase {
+ public function set_up() {
+ parent::set_up();
+
+ smilies_init();
+ }
+
/**
* Basic validation test to confirm that smilies are converted to image
* when use_smilies = 1 and not when use_smilies = 0.
@@ -15,14 +21,9 @@ class Tests_Formatting_ConvertSmilies extends WP_UnitTestCase {
* @dataProvider data_convert_standard_smilies
*/
public function test_convert_standard_smilies( $input, $converted ) {
- // Standard smilies, use_smilies: ON.
- update_option( 'use_smilies', 1 );
-
- smilies_init();
-
$this->assertSame( $converted, convert_smilies( $input ) );
- // Standard smilies, use_smilies: OFF.
+ // Disable smilies.
update_option( 'use_smilies', 0 );
$this->assertSame( $input, convert_smilies( $input ) );
@@ -77,13 +78,6 @@ public function data_convert_standard_smilies() {
public function test_convert_custom_smilies( $input, $converted ) {
global $wpsmiliestrans;
- // Custom smilies, use_smilies: ON.
- update_option( 'use_smilies', 1 );
-
- if ( ! isset( $wpsmiliestrans ) ) {
- smilies_init();
- }
-
$trans_orig = $wpsmiliestrans; // Save original translations array.
$wpsmiliestrans = array(
@@ -97,12 +91,12 @@ public function test_convert_custom_smilies( $input, $converted ) {
$this->assertSame( $converted, convert_smilies( $input ) );
- // Standard smilies, use_smilies: OFF.
+ // Disable smilies.
update_option( 'use_smilies', 0 );
- $this->assertSame( $input, convert_smilies( $input ) );
-
$wpsmiliestrans = $trans_orig; // Reset original translations array.
+
+ $this->assertSame( $input, convert_smilies( $input ) );
}
/**
@@ -147,14 +141,7 @@ public function test_ignore_smilies_in_tags( $element ) {
$input = 'Do we ignore smilies ;-) in ' . $element . ' tags <' . $element . ' class="foo">My Content Here :?: ';
$expected = "Do we ignore smilies \xf0\x9f\x98\x89 in $element tags <$element class=\"foo\">My Content Here :?: ";
- // Standard smilies, use_smilies: ON.
- update_option( 'use_smilies', 1 );
- smilies_init();
-
$this->assertSame( $expected, convert_smilies( $input ) );
-
- // Standard smilies, use_smilies: OFF.
- update_option( 'use_smilies', 0 );
}
/**
@@ -184,13 +171,9 @@ public function data_ignore_smilies_in_tags() {
* @dataProvider data_smilies_combinations
*/
public function test_smilies_combinations( $input, $converted ) {
- // Custom smilies, use_smilies: ON.
- update_option( 'use_smilies', 1 );
- smilies_init();
-
$this->assertSame( $converted, convert_smilies( $input ) );
- // Custom smilies, use_smilies: OFF.
+ // Disable smilies.
update_option( 'use_smilies', 0 );
$this->assertSame( $input, convert_smilies( $input ) );
@@ -247,13 +230,6 @@ public function data_smilies_combinations() {
public function test_single_smilies_in_wpsmiliestrans( $input, $converted ) {
global $wpsmiliestrans;
- // Standard smilies, use_smilies: ON.
- update_option( 'use_smilies', 1 );
-
- if ( ! isset( $wpsmiliestrans ) ) {
- smilies_init();
- }
-
$orig_trans = $wpsmiliestrans; // Save original translations array.
$wpsmiliestrans = array(
@@ -264,12 +240,12 @@ public function test_single_smilies_in_wpsmiliestrans( $input, $converted ) {
$this->assertSame( $converted, convert_smilies( $input ) );
- // Standard smilies, use_smilies: OFF.
+ // Disable smilies.
update_option( 'use_smilies', 0 );
- $this->assertSame( $input, convert_smilies( $input ) );
-
$wpsmiliestrans = $orig_trans; // Reset original translations array.
+
+ $this->assertSame( $input, convert_smilies( $input ) );
}
/**
@@ -312,15 +288,7 @@ public function data_single_smilies_in_wpsmiliestrans() {
* @dataProvider data_spaces_around_smilies
*/
public function test_spaces_around_smilies( $input, $converted ) {
- // Standard smilies, use_smilies: ON.
- update_option( 'use_smilies', 1 );
-
- smilies_init();
-
$this->assertSame( $converted, convert_smilies( $input ) );
-
- // Standard smilies, use_smilies: OFF.
- update_option( 'use_smilies', 0 );
}
/**
@@ -393,4 +361,16 @@ public function _filter_add_smilies( $wpsmiliestrans ) {
$wpsmiliestrans['<3'] = '\xe2\x9d\xa4';
return $wpsmiliestrans;
}
+
+
+ /**
+ * Tests that the function does not throw a fatal error from count()
+ * when preg_split() fails on large input.
+ *
+ * @ticket 51019
+ */
+ public function test_smilies_with_large_text_input() {
+ $text = '  . '=)
:)';
+ $this->assertStringContainsString( "\xf0\x9f\x99\x82", convert_smilies( $text ) );
+ }
}
diff --git a/tests/phpunit/tests/html-api/wpHtmlProcessor-bookmark.php b/tests/phpunit/tests/html-api/wpHtmlProcessor-bookmark.php
index 91cc17898f77d..094fea367878a 100644
--- a/tests/phpunit/tests/html-api/wpHtmlProcessor-bookmark.php
+++ b/tests/phpunit/tests/html-api/wpHtmlProcessor-bookmark.php
@@ -157,4 +157,17 @@ public static function data_processor_constructors(): array {
'Fragment parser' => array( array( WP_HTML_Processor::class, 'create_fragment' ) ),
);
}
+
+ /**
+ * @ticket 62521
+ *
+ * @expectedIncorrectUsage WP_HTML_Processor::set_bookmark
+ */
+ public function test_bookmarks_not_allowed_on_virtual_nodes() {
+ $processor = WP_HTML_Processor::create_full_parser( 'text' );
+ $this->assertTrue( $processor->next_tag( 'BODY' ) );
+ $this->assertFalse( $processor->set_bookmark( 'mark' ) );
+ $this->assertTrue( $processor->next_token() );
+ $this->assertTrue( $processor->set_bookmark( 'mark' ) );
+ }
}
diff --git a/tests/phpunit/tests/https-detection.php b/tests/phpunit/tests/https-detection.php
index da2fdc2d8a7d2..a425878ab114f 100644
--- a/tests/phpunit/tests/https-detection.php
+++ b/tests/phpunit/tests/https-detection.php
@@ -41,17 +41,34 @@ public function test_wp_is_using_https() {
* @ticket 47577
*/
public function test_wp_is_https_supported() {
- // The function works with cached errors, so only test that here.
- $wp_error = new WP_Error();
+ // Simulate that HTTPS is supported by returning an empty error array.
+ add_filter(
+ 'pre_wp_get_https_detection_errors',
+ function () {
+ return new WP_Error(); // No errors means HTTPS is supported.
+ }
+ );
// No errors, so HTTPS is supported.
- update_option( 'https_detection_errors', $wp_error->errors );
$this->assertTrue( wp_is_https_supported() );
- // Errors, so HTTPS is not supported.
- $wp_error->add( 'ssl_verification_failed', 'SSL verification failed.' );
- update_option( 'https_detection_errors', $wp_error->errors );
+ // Now we simulate that HTTPS is not supported by returning errors.
+ $support_errors = new WP_Error();
+ $support_errors->add( 'ssl_verification_failed', 'SSL verification failed.' );
+
+ // Short-circuit the detection logic to return our simulated errors.
+ add_filter(
+ 'pre_wp_get_https_detection_errors',
+ function () use ( $support_errors ) {
+ return $support_errors;
+ }
+ );
+
+ // Test that HTTPS is not supported due to the simulated errors.
$this->assertFalse( wp_is_https_supported() );
+
+ // Remove the filter to avoid affecting other tests.
+ remove_filter( 'pre_wp_get_https_detection_errors', '__return_null' );
}
/**
diff --git a/tests/phpunit/tests/rest-api/rest-posts-controller.php b/tests/phpunit/tests/rest-api/rest-posts-controller.php
index 4574bde83621e..e2fd7139f3f54 100644
--- a/tests/phpunit/tests/rest-api/rest-posts-controller.php
+++ b/tests/phpunit/tests/rest-api/rest-posts-controller.php
@@ -5507,6 +5507,45 @@ public function test_draft_post_does_not_have_the_same_slug_as_existing_post() {
);
}
+ /**
+ * Test the REST API ignores the post format parameter for post types that do not support them.
+ *
+ * @ticket 62646
+ * @ticket 62014
+ *
+ * @covers WP_REST_Posts_Controller::get_items
+ */
+ public function test_standard_post_format_ignored_for_post_types_that_do_not_support_them() {
+ $initial_theme_support = get_theme_support( 'post-formats' );
+ add_theme_support( 'post-formats', array( 'aside', 'gallery', 'link', 'image', 'quote', 'status', 'video', 'audio', 'chat' ) );
+
+ self::factory()->post->create(
+ array(
+ 'post_type' => 'page',
+ 'post_status' => 'publish',
+ )
+ );
+
+ $request = new WP_REST_Request( 'GET', '/wp/v2/pages' );
+ $request->set_param( 'format', 'invalid_type' );
+
+ $response = rest_get_server()->dispatch( $request );
+
+ /*
+ * Restore the initial post formats support.
+ *
+ * This needs to be done prior to the assertions to avoid unexpected
+ * results for other tests should an assertion fail.
+ */
+ if ( $initial_theme_support ) {
+ add_theme_support( 'post-formats', $initial_theme_support[0] );
+ } else {
+ remove_theme_support( 'post-formats' );
+ }
+
+ $this->assertCount( 1, $response->get_data(), 'The response should ignore the post format parameter' );
+ }
+
/**
* Test the REST API support for the standard post format.
*
diff --git a/tests/phpunit/tests/rest-api/rest-schema-setup.php b/tests/phpunit/tests/rest-api/rest-schema-setup.php
index 4d5c269357a68..03dcb0631f133 100644
--- a/tests/phpunit/tests/rest-api/rest-schema-setup.php
+++ b/tests/phpunit/tests/rest-api/rest-schema-setup.php
@@ -729,9 +729,9 @@ public function test_build_wp_api_client_fixtures() {
'TagModel.meta.test_multi' => array(),
'TagModel.meta.test_tag_meta' => '',
'UsersCollection.0.link' => 'http://example.org/?author=1',
- 'UsersCollection.0.avatar_urls.24' => 'https://secure.gravatar.com/avatar/96614ec98aa0c0d2ee75796dced6df54?s=24&d=mm&r=g',
- 'UsersCollection.0.avatar_urls.48' => 'https://secure.gravatar.com/avatar/96614ec98aa0c0d2ee75796dced6df54?s=48&d=mm&r=g',
- 'UsersCollection.0.avatar_urls.96' => 'https://secure.gravatar.com/avatar/96614ec98aa0c0d2ee75796dced6df54?s=96&d=mm&r=g',
+ 'UsersCollection.0.avatar_urls.24' => 'https://secure.gravatar.com/avatar/9387ed9432ec25ef93df84b8a0b9697ddef435a945e7f244670c4f79f88363e9?s=24&d=mm&r=g',
+ 'UsersCollection.0.avatar_urls.48' => 'https://secure.gravatar.com/avatar/9387ed9432ec25ef93df84b8a0b9697ddef435a945e7f244670c4f79f88363e9?s=48&d=mm&r=g',
+ 'UsersCollection.0.avatar_urls.96' => 'https://secure.gravatar.com/avatar/9387ed9432ec25ef93df84b8a0b9697ddef435a945e7f244670c4f79f88363e9?s=96&d=mm&r=g',
'UsersCollection.0._links.self.0.href' => 'http://example.org/index.php?rest_route=/wp/v2/users/1',
'UsersCollection.0._links.collection.0.href' => 'http://example.org/index.php?rest_route=/wp/v2/users',
'UsersCollection.1.id' => 2,
diff --git a/tests/qunit/fixtures/wp-api-generated.js b/tests/qunit/fixtures/wp-api-generated.js
index 4fc897a6242e7..448548aab0c07 100644
--- a/tests/qunit/fixtures/wp-api-generated.js
+++ b/tests/qunit/fixtures/wp-api-generated.js
@@ -13877,9 +13877,9 @@ mockedApiResponse.UsersCollection = [
"link": "http://example.org/?author=1",
"slug": "admin",
"avatar_urls": {
- "24": "https://secure.gravatar.com/avatar/96614ec98aa0c0d2ee75796dced6df54?s=24&d=mm&r=g",
- "48": "https://secure.gravatar.com/avatar/96614ec98aa0c0d2ee75796dced6df54?s=48&d=mm&r=g",
- "96": "https://secure.gravatar.com/avatar/96614ec98aa0c0d2ee75796dced6df54?s=96&d=mm&r=g"
+ "24": "https://secure.gravatar.com/avatar/9387ed9432ec25ef93df84b8a0b9697ddef435a945e7f244670c4f79f88363e9?s=24&d=mm&r=g",
+ "48": "https://secure.gravatar.com/avatar/9387ed9432ec25ef93df84b8a0b9697ddef435a945e7f244670c4f79f88363e9?s=48&d=mm&r=g",
+ "96": "https://secure.gravatar.com/avatar/9387ed9432ec25ef93df84b8a0b9697ddef435a945e7f244670c4f79f88363e9?s=96&d=mm&r=g"
},
"meta": {
"meta_key": "meta_value"
@@ -13914,9 +13914,9 @@ mockedApiResponse.UsersCollection = [
"link": "http://example.org/?author=2",
"slug": "restapiclientfixtureuser",
"avatar_urls": {
- "24": "https://secure.gravatar.com/avatar/57cbd982c963c7eb2294e2eee1b4448e?s=24&d=mm&r=g",
- "48": "https://secure.gravatar.com/avatar/57cbd982c963c7eb2294e2eee1b4448e?s=48&d=mm&r=g",
- "96": "https://secure.gravatar.com/avatar/57cbd982c963c7eb2294e2eee1b4448e?s=96&d=mm&r=g"
+ "24": "https://secure.gravatar.com/avatar/ea862d9636c72500beece7b1990870e2776f89c2096d0c064c14f2beb910077d?s=24&d=mm&r=g",
+ "48": "https://secure.gravatar.com/avatar/ea862d9636c72500beece7b1990870e2776f89c2096d0c064c14f2beb910077d?s=48&d=mm&r=g",
+ "96": "https://secure.gravatar.com/avatar/ea862d9636c72500beece7b1990870e2776f89c2096d0c064c14f2beb910077d?s=96&d=mm&r=g"
},
"meta": {
"meta_key": ""
@@ -13953,9 +13953,9 @@ mockedApiResponse.UserModel = {
"link": "http://example.org/?author=2",
"slug": "restapiclientfixtureuser",
"avatar_urls": {
- "24": "https://secure.gravatar.com/avatar/57cbd982c963c7eb2294e2eee1b4448e?s=24&d=mm&r=g",
- "48": "https://secure.gravatar.com/avatar/57cbd982c963c7eb2294e2eee1b4448e?s=48&d=mm&r=g",
- "96": "https://secure.gravatar.com/avatar/57cbd982c963c7eb2294e2eee1b4448e?s=96&d=mm&r=g"
+ "24": "https://secure.gravatar.com/avatar/ea862d9636c72500beece7b1990870e2776f89c2096d0c064c14f2beb910077d?s=24&d=mm&r=g",
+ "48": "https://secure.gravatar.com/avatar/ea862d9636c72500beece7b1990870e2776f89c2096d0c064c14f2beb910077d?s=48&d=mm&r=g",
+ "96": "https://secure.gravatar.com/avatar/ea862d9636c72500beece7b1990870e2776f89c2096d0c064c14f2beb910077d?s=96&d=mm&r=g"
},
"meta": {
"meta_key": ""
@@ -13970,9 +13970,9 @@ mockedApiResponse.me = {
"link": "http://example.org/?author=2",
"slug": "restapiclientfixtureuser",
"avatar_urls": {
- "24": "https://secure.gravatar.com/avatar/57cbd982c963c7eb2294e2eee1b4448e?s=24&d=mm&r=g",
- "48": "https://secure.gravatar.com/avatar/57cbd982c963c7eb2294e2eee1b4448e?s=48&d=mm&r=g",
- "96": "https://secure.gravatar.com/avatar/57cbd982c963c7eb2294e2eee1b4448e?s=96&d=mm&r=g"
+ "24": "https://secure.gravatar.com/avatar/ea862d9636c72500beece7b1990870e2776f89c2096d0c064c14f2beb910077d?s=24&d=mm&r=g",
+ "48": "https://secure.gravatar.com/avatar/ea862d9636c72500beece7b1990870e2776f89c2096d0c064c14f2beb910077d?s=48&d=mm&r=g",
+ "96": "https://secure.gravatar.com/avatar/ea862d9636c72500beece7b1990870e2776f89c2096d0c064c14f2beb910077d?s=96&d=mm&r=g"
},
"meta": {
"meta_key": ""
@@ -13996,9 +13996,9 @@ mockedApiResponse.CommentsCollection = [
"status": "approved",
"type": "comment",
"author_avatar_urls": {
- "24": "https://secure.gravatar.com/avatar/bd7c2b505bcf39cc71cfee564c614956?s=24&d=mm&r=g",
- "48": "https://secure.gravatar.com/avatar/bd7c2b505bcf39cc71cfee564c614956?s=48&d=mm&r=g",
- "96": "https://secure.gravatar.com/avatar/bd7c2b505bcf39cc71cfee564c614956?s=96&d=mm&r=g"
+ "24": "https://secure.gravatar.com/avatar/9ca51ced0b389ffbeba3d269c6d824be664c84fa1b35503282abdd302e1f417c?s=24&d=mm&r=g",
+ "48": "https://secure.gravatar.com/avatar/9ca51ced0b389ffbeba3d269c6d824be664c84fa1b35503282abdd302e1f417c?s=48&d=mm&r=g",
+ "96": "https://secure.gravatar.com/avatar/9ca51ced0b389ffbeba3d269c6d824be664c84fa1b35503282abdd302e1f417c?s=96&d=mm&r=g"
},
"meta": {
"meta_key": "meta_value"
@@ -14050,9 +14050,9 @@ mockedApiResponse.CommentModel = {
"status": "approved",
"type": "comment",
"author_avatar_urls": {
- "24": "https://secure.gravatar.com/avatar/bd7c2b505bcf39cc71cfee564c614956?s=24&d=mm&r=g",
- "48": "https://secure.gravatar.com/avatar/bd7c2b505bcf39cc71cfee564c614956?s=48&d=mm&r=g",
- "96": "https://secure.gravatar.com/avatar/bd7c2b505bcf39cc71cfee564c614956?s=96&d=mm&r=g"
+ "24": "https://secure.gravatar.com/avatar/9ca51ced0b389ffbeba3d269c6d824be664c84fa1b35503282abdd302e1f417c?s=24&d=mm&r=g",
+ "48": "https://secure.gravatar.com/avatar/9ca51ced0b389ffbeba3d269c6d824be664c84fa1b35503282abdd302e1f417c?s=48&d=mm&r=g",
+ "96": "https://secure.gravatar.com/avatar/9ca51ced0b389ffbeba3d269c6d824be664c84fa1b35503282abdd302e1f417c?s=96&d=mm&r=g"
},
"meta": {
"meta_key": "meta_value"
|