diff -r 34716fd837a4 -r be944660c56a wp/wp-includes/Requests/IRI.php --- a/wp/wp-includes/Requests/IRI.php Tue Dec 15 15:52:01 2020 +0100 +++ b/wp/wp-includes/Requests/IRI.php Wed Sep 21 18:19:35 2022 +0200 @@ -67,28 +67,28 @@ /** * Scheme * - * @var string + * @var string|null */ protected $scheme = null; /** * User Information * - * @var string + * @var string|null */ protected $iuserinfo = null; /** * ihost * - * @var string + * @var string|null */ protected $ihost = null; /** * Port * - * @var string + * @var string|null */ protected $port = null; @@ -102,12 +102,12 @@ /** * iquery * - * @var string + * @var string|null */ protected $iquery = null; /** - * ifragment + * ifragment|null * * @var string */ @@ -118,6 +118,8 @@ * * Each key is the scheme, each value is an array with each key as the IRI * part and value as the default value for that part. + * + * @var array */ protected $normalization = array( 'acap' => array( @@ -249,9 +251,9 @@ * * Returns false if $base is not absolute, otherwise an IRI. * - * @param IRI|string $base (Absolute) Base IRI - * @param IRI|string $relative Relative IRI - * @return IRI|false + * @param Requests_IRI|string $base (Absolute) Base IRI + * @param Requests_IRI|string $relative Relative IRI + * @return Requests_IRI|false */ public static function absolutize($base, $relative) { if (!($relative instanceof Requests_IRI)) { @@ -419,7 +421,7 @@ */ protected function replace_invalid_with_pct_encoding($string, $extra_chars, $iprivate = false) { // Normalize as many pct-encoded sections as possible - $string = preg_replace_callback('/(?:%[A-Fa-f0-9]{2})+/', array(&$this, 'remove_iunreserved_percent_encoded'), $string); + $string = preg_replace_callback('/(?:%[A-Fa-f0-9]{2})+/', array($this, 'remove_iunreserved_percent_encoded'), $string); // Replace invalid percent characters $string = preg_replace('/%(?![A-Fa-f0-9]{2})/', '%25', $string); @@ -1010,7 +1012,7 @@ /** * Get the complete IRI * - * @return string + * @return string|false */ protected function get_iri() { if (!$this->is_valid()) { @@ -1047,7 +1049,7 @@ /** * Get the complete iauthority * - * @return string + * @return string|null */ protected function get_iauthority() { if ($this->iuserinfo === null && $this->ihost === null && $this->port === null) {