Automation: Updating built files with changes.

Author: wordpress-develop-pr-bot[bot]

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

@@ -1,12 +1,78 @@
 <?php
 /**
- * Loads the old Requests class file when the autoloader
- * references the original PSR-0 Requests class.
+ * Requests for PHP
  *
- * @deprecated 6.2.0
- * @package WordPress
- * @subpackage Requests
- * @since 6.2.0
+ * Inspired by Requests for Python.
+ *
+ * Based on concepts from SimplePie_File, RequestCore and WP_Http.
+ *
+ * @package Requests
+ *
+ * @deprecated 2.0.0
+ */
+
+/*
+ * Integrators who cannot yet upgrade to the PSR-4 class names can silence deprecations
+ * by defining a `REQUESTS_SILENCE_PSR0_DEPRECATIONS` constant and setting it to `true`.
+ * The constant needs to be defined before this class is required.
+ */
+if (!defined('REQUESTS_SILENCE_PSR0_DEPRECATIONS') || REQUESTS_SILENCE_PSR0_DEPRECATIONS !== true) {
+	// phpcs:ignore WordPress.PHP.DevelopmentFunctions.error_log_trigger_error
+	trigger_error(
+		'The PSR-0 `Requests_...` class names in the Requests library are deprecated.'
+		. ' Switch to the PSR-4 `WpOrg\Requests\...` class names at your earliest convenience.',
+		E_USER_DEPRECATED
+	);
+
+	// Prevent the deprecation notice from being thrown twice.
+	if (!defined('REQUESTS_SILENCE_PSR0_DEPRECATIONS')) {
+		define('REQUESTS_SILENCE_PSR0_DEPRECATIONS', true);
+	}
+}
+
+require_once dirname(__DIR__) . '/src/Requests.php';
+
+/**
+ * Requests for PHP
+ *
+ * Inspired by Requests for Python.
+ *
+ * Based on concepts from SimplePie_File, RequestCore and WP_Http.
+ *
+ * @package Requests
+ *
+ * @deprecated 2.0.0 Use `WpOrg\Requests\Requests` instead for the actual functionality and
+ *                   use `WpOrg\Requests\Autoload` for the autoloading.
  */
+class Requests extends WpOrg\Requests\Requests {
+
+	/**
+	 * Deprecated autoloader for Requests.
+	 *
+	 * @deprecated 2.0.0 Use the `WpOrg\Requests\Autoload::load()` method instead.
+	 *
+	 * @codeCoverageIgnore
+	 *
+	 * @param string $class Class name to load
+	 */
+	public static function autoloader($class) {
+		if (class_exists('WpOrg\Requests\Autoload') === false) {
+			require_once dirname(__DIR__) . '/src/Autoload.php';
+		}
+
+		return WpOrg\Requests\Autoload::load($class);
+	}
 
-include_once ABSPATH . WPINC . '/class-requests.php';
+	/**
+	 * Register the built-in autoloader
+	 *
+	 * @deprecated 2.0.0 Include the `WpOrg\Requests\Autoload` class and
+	 *                   call `WpOrg\Requests\Autoload::register()` instead.
+	 *
+	 * @codeCoverageIgnore
+	 */
+	public static function register_autoloader() {
+		require_once dirname(__DIR__) . '/src/Autoload.php';
+		WpOrg\Requests\Autoload::register();
+	}
+}

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

@@ -96,8 +96,4 @@ public function dispatch($hook, $parameters = []) {
 
 		return true;
 	}
-
-	public function __wakeup() {
-		throw new \LogicException( __CLASS__ . ' should never be unserialized' );
-	}
 }

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

@@ -717,20 +717,6 @@ public function is_valid() {
 		return true;
 	}
 
-	public function __wakeup() {
-		$class_props = get_class_vars( __CLASS__ );
-		$string_props = array( 'scheme', 'iuserinfo', 'ihost', 'port', 'ipath', 'iquery', 'ifragment' );
-		$array_props = array( 'normalization' );
-		foreach ( $class_props as $prop => $default_value ) {
-			if ( in_array( $prop, $string_props, true ) && ! is_string( $this->$prop ) ) {
-				throw new UnexpectedValueException();
-			} elseif ( in_array( $prop, $array_props, true ) && ! is_array( $this->$prop ) ) {
-				throw new UnexpectedValueException();
-			}
-			$this->$prop = null;
-		}
-	}
-
 	/**
 	 * Set the entire IRI. Returns true on success, false on failure (if there
 	 * are any invalid characters).

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

@@ -265,10 +265,6 @@ public function request_multiple($requests, $options = []) {
 		return Requests::request_multiple($requests, $options);
 	}
 
-	public function __wakeup() {
-		throw new \LogicException( __CLASS__ . ' should never be unserialized' );
-	}
-
 	/**
 	 * Merge a request's data with the default data
 	 *

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

@@ -170,7 +170,7 @@ public function __get(string $name)
             $return = null;
         }
 
-        if ($return === null && isset($this->scheme, $this->normalization[$this->scheme][$name])) {
+        if ($return === null && isset($this->normalization[$this->scheme][$name])) {
             return $this->normalization[$this->scheme][$name];
         }
 
@@ -623,10 +623,6 @@ protected function remove_iunreserved_percent_encoded(array $match)
      */
     protected function scheme_normalization()
     {
-        if ($this->scheme === null) {
-            return;
-        }
-
         if (isset($this->normalization[$this->scheme]['iuserinfo']) && $this->iuserinfo === $this->normalization[$this->scheme]['iuserinfo']) {
             $this->iuserinfo = null;
         }

src/wp-includes/SimplePie/library/SimplePie/Cache/Memcached.php

@@ -3306,7 +3306,7 @@ public function __call(string $method, array $args)
         }
 
         $class = get_class($this);
-        $trace = debug_backtrace(); // phpcs:ignore PHPCompatibility.FunctionUse.ArgumentFunctionsReportCurrentValue.NeedsInspection
+        $trace = debug_backtrace();
         $file = $trace[0]['file'] ?? '';
         $line = $trace[0]['line'] ?? '';
         throw new SimplePieException("Call to undefined method $class::$method() in $file on line $line");