Changeset 52328 for trunk/src/wp-includes/Requests/Auth/Basic.php

Timestamp:

12/06/2021 09:29:00 PM (5 years ago)

Author:

SergeyBiryukov

Message:

HTTP API: Revert changeset [52244].

Reverting Requests 2.0.0 changes and moving to WordPress 6.0 cycle. Why? The namespace and file case renaming revealed 2 issues in Core's upgrader process.

See https://core.trac.wordpress.org/ticket/54504#comment:22 for more information.

Follow-up to [52327].

See #54562, #54504.

File:

• trunk/src/wp-includes/Requests/Auth/Basic.php (modified) (5 diffs)

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

@@ -3 +3 @@
  * Basic Authentication provider
  *
- * @package Requests\Authentication
+ * @package Requests
+ * @subpackage Authentication
  */
-
-namespace WpOrg\Requests\Auth;
-
-use WpOrg\Requests\Auth;
-use WpOrg\Requests\Exception\ArgumentCount;
-use WpOrg\Requests\Exception\InvalidArgument;
-use WpOrg\Requests\Hooks;
 
 /**
@@ -19 +13 @@
  * header.
  *
- * @package Requests\Authentication
+ * @package Requests
+ * @subpackage Authentication
  */
-class Basic implements Auth {
+class Requests_Auth_Basic implements Requests_Auth {
         /**
          * Username
@@ -39 +34 @@
          * Constructor
          *
-         * @since 2.0 Throws an `InvalidArgument` exception.
-         * @since 2.0 Throws an `ArgumentCount` exception instead of the Requests base `Exception.
-         *
+         * @throws Requests_Exception On incorrect number of arguments (`authbasicbadargs`)
          * @param array|null $args Array of user and password. Must have exactly two elements
-         *
-         * @throws \WpOrg\Requests\Exception\InvalidArgument When the passed argument is not an array or null.
-         * @throws \WpOrg\Requests\Exception\ArgumentCount   On incorrect number of array elements (`authbasicbadargs`).
          */
         public function __construct($args = null) {
                 if (is_array($args)) {
                         if (count($args) !== 2) {
-                                throw ArgumentCount::create('an array with exactly two elements', count($args), 'authbasicbadargs');
+                                throw new Requests_Exception('Invalid number of arguments', 'authbasicbadargs');
                         }
 
                         list($this->user, $this->pass) = $args;
-                        return;
-                }
-
-                if ($args !== null) {
-                        throw InvalidArgument::create(1, '$args', 'array|null', gettype($args));
                 }
         }
@@ -65 +50 @@
          * Register the necessary callbacks
          *
-         * @see \WpOrg\Requests\Auth\Basic::curl_before_send()
-         * @see \WpOrg\Requests\Auth\Basic::fsockopen_header()
-         * @param \WpOrg\Requests\Hooks $hooks Hook system
+         * @see curl_before_send
+         * @see fsockopen_header
+         * @param Requests_Hooks $hooks Hook system
          */
-        public function register(Hooks $hooks) {
-                $hooks->register('curl.before_send', [$this, 'curl_before_send']);
-                $hooks->register('fsockopen.after_headers', [$this, 'fsockopen_header']);
+        public function register(Requests_Hooks $hooks) {
+                $hooks->register('curl.before_send', array($this, 'curl_before_send'));
+                $hooks->register('fsockopen.after_headers', array($this, 'fsockopen_header'));
         }
 
@@ -77 +62 @@
          * Set cURL parameters before the data is sent
          *
-         * @param resource|\CurlHandle $handle cURL handle
+         * @param resource $handle cURL resource
          */
         public function curl_before_send(&$handle) {