Changeset 57876

Timestamp:

03/25/2024 12:21:36 PM (3 years ago)

Author:

swissspidy

Message:

External Libraries: Update the Requests library to version 2.0.11.

This is a maintenance release with two minor fixes to improve PHP 8.4 compatibility.

References:

• ​Requests 2.0.11 release notes
• ​Full list of changes in Requests 2.0.11

Follow-up to [56554], [54997], [55007], [55046], [55225], [55296], [55629].

Props swissspidy, jrf.
Fixes #60838.

Location:

trunk/src/wp-includes/Requests/src

Files:

• Cookie.php (modified) (1 diff)
• Requests.php (modified) (1 diff)
• Transport/Fsockopen.php (modified) (1 diff)

trunk/src/wp-includes/Requests/src/Cookie.php

@@ -471 +471 @@
          * @param int|null $time Reference time for expiration calculation
          * @return array
-         */
-        public static function parse_from_headers(Headers $headers, Iri $origin = null, $time = null) {
+         *
+         * @throws \WpOrg\Requests\Exception\InvalidArgument When the passed $origin argument is not null or an instance of the Iri class.
+         */
+        public static function parse_from_headers(Headers $headers, $origin = null, $time = null) {
                 $cookie_headers = $headers->getValues('Set-Cookie');
                 if (empty($cookie_headers)) {
                         return [];
+                }
+
+                if ($origin !== null && !($origin instanceof Iri)) {
+                        throw InvalidArgument::create(2, '$origin', Iri::class . ' or null', gettype($origin));
                 }
 

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

@@ -149 +149 @@
          * @var string
          */
-        const VERSION = '2.0.9';
+        const VERSION = '2.0.11';
 
         /**

trunk/src/wp-includes/Requests/src/Transport/Fsockopen.php

@@ -145 +145 @@
                         }
 
-                        stream_context_set_option($context, ['ssl' => $context_options]);
+                        // Handle the PHP 8.4 deprecation (PHP 9.0 removal) of the function signature we use for stream_context_set_option().
+                        // Ref: https://wiki.php.net/rfc/deprecate_functions_with_overloaded_signatures#stream_context_set_option
+                        if (function_exists('stream_context_set_options')) {
+                                // PHP 8.3+.
+                                stream_context_set_options($context, ['ssl' => $context_options]);
+                        } else {
+                                // PHP < 8.3.
+                                stream_context_set_option($context, ['ssl' => $context_options]);
+                        }
                 } else {
                         $remote_socket = 'tcp://' . $host;