Context Navigation

← Previous Change
Next Change →

Ipv6.php

Timestamp:

11/25/2021 01:10:30 AM (5 years ago)

Author:

SergeyBiryukov

Message:

External Libraries: Update the Requests library to version 2.0.0.

This is a major release and contains breaking changes.

Most important changes to be aware of for this release:

All code is now namespaced. Though there is a full backward compatibility layer available and the old class names are still supported, using them will generate a deprecation notice (which can be silenced by plugins if they'd need to support multiple WP versions). See the upgrade guide for more details.
A lot of classes have been marked final. This should generally not affect userland code as care has been taken to not apply the final keyword to classes which are known to be extended in userland code.
Extensive input validation has been added to Requests. When Requests is used as documented though, this will be unnoticable.
A new WpOrg\Requests\Requests::has_capabilities() method has been introduced which can be used to address #37708.
A new WpOrg\Requests\Response::decode_body() method has been introduced which may be usable to simplify some of the WP native wrapper code.
Remaining PHP 8.0 compatibility fixed (support for named parameters).
PHP 8.1 compatibility.

Release notes: https://github.com/WordPress/Requests/releases/tag/v2.0.0

For a full list of changes in this update, see the Requests GitHub:
https://github.com/WordPress/Requests/compare/v1.8.1...v2.0.0

Follow-up to [50842], [51078].

Props jrf, schlessera, datagutten, wojsmol, dd32, dustinrue, soulseekah, costdev, szepeviktor.
Fixes #54504.

File:

: 1 moved

trunk/src/wp-includes/Requests/Ipv6.php (moved) (moved from trunk/src/wp-includes/Requests/IPv6.php ) (6 diffs)

Legend:

: Unmodified
: Added
: Removed

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

-              r52243
+              r52244
  * Class to validate and to work with IPv6 addresses
+ *
+ * @package Requests
+ * @subpackage Utilities
+ * @package Requests\Utilities
  */
+namespace WpOrg\Requests;
+use WpOrg\Requests\Exception\InvalidArgument;
+use WpOrg\Requests\Utility\InputValidator;
 /**
 …
  * entirely rewritten.
+ *
+ * @package Requests
+ * @subpackage Utilities
+ * @package Requests\Utilities
  */
 class Requests_IPv6 {
+final class Ipv6 {
         /**
          * Uncompresses an IPv6 address
 …
          * @author Josh Peck <jmp at joshpeck dot org>
          * @copyright 2003-2005 The PHP Group
+         * @license http://www.opensource.org/licenses/bsd-license.php
+         * @param string $ip An IPv6 address
+         * @license https://opensource.org/licenses/bsd-license.php
+         *
+         * @param string|Stringable $ip An IPv6 address
          * @return string The uncompressed IPv6 address
+         *
+         * @throws \WpOrg\Requests\Exception\InvalidArgument When the passed argument is not a string or a stringable object.
          */
         public static function uncompress($ip) {
+                if (InputValidator::is_string_or_stringable($ip) === false) {
+                        throw InvalidArgument::create(1, '$ip', 'string|Stringable', gettype($ip));
+                }
+                $ip = (string) $ip;
                 if (substr_count($ip, '::') !== 1) {
                         return $ip;
 …
          *           0:0:0:0:0:0:0:1        ->  ::1
+         *
+         * @see uncompress()
+         * @see \WpOrg\Requests\IPv6::uncompress()
+         *
          * @param string $ip An IPv6 address
          * @return string The compressed IPv6 address
          */
         public static function compress($ip) {
+                // Prepare the IP to be compressed
+                // Prepare the IP to be compressed.
+                // Note: Input validation is handled in the `uncompress()` method, which is the first call made in this method.
                 $ip       = self::uncompress($ip);
                 $ip_parts = self::split_v6_v4($ip);
 …
          * @return string[] [0] contains the IPv6 represented part, and [1] the IPv4 represented part
          */
         protected static function split_v6_v4($ip) {
+        private static function split_v6_v4($ip) {
                 if (strpos($ip, '.') !== false) {
                         $pos       = strrpos($ip, ':');
                         $ipv6_part = substr($ip, 0, $pos);
                         $ipv4_part = substr($ip, $pos + 1);
                         return array($ipv6_part, $ipv4_part);
+                }
                 else {
                         return array($ip, '');
+                        return [$ipv6_part, $ipv4_part];
+                }
+                else {
+                        return [$ip, ''];
+                }
+        }
 …
          */
         public static function check_ipv6($ip) {
+                // Note: Input validation is handled in the `uncompress()` method, which is the first call made in this method.
                 $ip                = self::uncompress($ip);
                 list($ipv6, $ipv4) = self::split_v6_v4($ip);

Note: See TracChangeset for help on using the changeset viewer.

Make WordPress Core

Context Navigation

Changeset 52244 for trunk/src/wp-includes/Requests/Ipv6.php

Legend:

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

Download in other formats: