Changeset 60490

Timestamp:

07/21/2025 01:39:41 AM (11 hours ago)

Author:

peterwilsoncc

Message:

External Libraries: Upgrade Simple Pie to 1.8.1 (patched).

Upgrades the Simple Pie library to a patched version of ​Simple Pie 1.8.1. Much of 1.8.1 was included in the 1.8.0 upgrade committed in r59141. The following fixes from the latest release those that remain for this upgrade:

• Fix locator with website missing Content-Type header ​simplepie/simplepie#891
• Fix encode argument of SimplePie::strip_htmltags() ​simplepie/simplepie#894

A caching fix not included in Simple Pie 1.8.1 is also included in this upgrade, see ​simplepie/simplepie#883.

A caching test for fetch_feed() is introduced in this pull request to ensure that the caching patch is included in future upgrades of the library.

Props kaygee79, oglekler, SergeyBiryukov, peterwilsoncc.
Fixes #63717.

Location:

trunk

Files:

• src/wp-includes/SimplePie/src/Core.php (deleted)
• src/wp-includes/SimplePie/src/Decode/HTML/Entities.php (deleted)
• src/wp-includes/SimplePie/src/SimplePie.php (modified) (4 diffs)
• tests/phpunit/tests/feed/fetchFeed.php (modified) (1 diff)

trunk/src/wp-includes/SimplePie/src/SimplePie.php

@@ -71 +71 @@
      * SimplePie Version
      */
-    public const VERSION = '1.8.0';
+    public const VERSION = '1.8.1';
 
     /**
@@ -1374 +1374 @@
         $this->sanitize->strip_htmltags($tags);
         if ($encode !== null) {
-            $this->sanitize->encode_instead_of_strip($tags);
+            $this->sanitize->encode_instead_of_strip($encode);
         }
     }
@@ -1757 +1757 @@
                 }
                 // Check if the cache has been updated
-                elseif (isset($this->data['cache_expiration_time']) && $this->data['cache_expiration_time'] > time()) {
+                elseif (!isset($this->data['cache_expiration_time']) || $this->data['cache_expiration_time'] < time()) {
                     // Want to know if we tried to send last-modified and/or etag headers
                     // when requesting this file. (Note that it's up to the file to
@@ -1832 +1832 @@
             if (!$locate->is_feed($file)) {
                 $copyStatusCode = $file->status_code;
-                $copyContentType = $file->headers['content-type'];
+                $copyContentType = $file->headers['content-type'] ?? '';
                 try {
                     $microformats = false;

trunk/tests/phpunit/tests/feed/fetchFeed.php

@@ -34 +34 @@
     }
 
+    /**
+     * Ensure that fetch_feed() is cached on second and subsequent calls.
+     *
+     * Note: The HTTP request is mocked on the `pre_http_request` filter so
+     * this test doesn't make any HTTP requests so it doesn't need to be
+     * placed in the external-http group.
+     *
+     * @ticket 63717
+     *
+     * @group feed
+     *
+     * @covers ::fetch_feed
+     */
+    public function test_fetch_feed_cached() {
+        $filter = new MockAction();
+        add_filter( 'pre_http_request', array( $filter, 'filter' ) );
+
+        fetch_feed( 'https://wordpress.org/news/feed/' );
+        $this->assertEquals( 1, $filter->get_call_count(), 'The feed should be fetched on the first call.' );
+
+        fetch_feed( 'https://wordpress.org/news/feed/' );
+        $this->assertEquals( 1, $filter->get_call_count(), 'The feed should be cached on the second call. For SP 1.8.x upgrades, backport simplepie/simplepie#830 to resolve.' );
+    }
+
+    /**
+     * Mock response for `fetch_feed()`.
+     *
+     * This simulates a response from WordPress.org's server for the news feed
+     * to avoid making actual HTTP requests during the tests.
+     *
+     * The method runs on the `pre_http_request` filter, a low level filter
+     * to allow developers to determine whether a request would have been made
+     * under normal circumstances.
+     *
+     * @return array Mocked response data.
+     */
     public function mocked_rss_response() {
         $single_value_headers = array(