Changeset 52328 for trunk/src/wp-includes/Requests/Utility/FilteredIterator.php

Timestamp:

12/06/2021 09:29:00 PM (3 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/Utility/FilteredIterator.php (modified) (5 diffs)

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

@@ -3 +3 @@
  * Iterator for arrays requiring filtered values
  *
- * @package Requests\Utilities
+ * @package Requests
+ * @subpackage Utilities
  */
-
-namespace WpOrg\Requests\Utility;
-
-use ArrayIterator;
-use ReturnTypeWillChange;
-use WpOrg\Requests\Exception\InvalidArgument;
-use WpOrg\Requests\Utility\InputValidator;
 
 /**
  * Iterator for arrays requiring filtered values
  *
- * @package Requests\Utilities
+ * @package Requests
+ * @subpackage Utilities
  */
-final class FilteredIterator extends ArrayIterator {
+class Requests_Utility_FilteredIterator extends ArrayIterator {
     /**
      * Callback to run as a filter
@@ -24 +19 @@
      * @var callable
      */
-    private $callback;
+    protected $callback;
 
     /**
@@ -31 +26 @@
      * @param array $data
      * @param callable $callback Callback to be called on each value
-     *
-     * @throws \WpOrg\Requests\Exception\InvalidArgument When the passed $data argument is not iterable.
      */
     public function __construct($data, $callback) {
-        if (InputValidator::is_iterable($data) === false) {
-            throw InvalidArgument::create(1, '$data', 'iterable', gettype($data));
-        }
-
         parent::__construct($data);
 
-        if (is_callable($callback)) {
-            $this->callback = $callback;
-        }
-    }
-
-    /**
-     * @inheritdoc
-     *
-     * @phpcs:disable PHPCompatibility.FunctionNameRestrictions.NewMagicMethods.__unserializeFound
-     */
-    #[ReturnTypeWillChange]
-    public function __unserialize($data) {}
-    // phpcs:enable
-
-    public function __wakeup() {
-        unset($this->callback);
+        $this->callback = $callback;
     }
 
@@ -64 +38 @@
      * @return string
      */
-    #[ReturnTypeWillChange]
     public function current() {
         $value = parent::current();
@@ -78 +51 @@
      * @inheritdoc
      */
-    #[ReturnTypeWillChange]
-    public function unserialize($data) {}
+    public function unserialize($serialized) {}
+
+    /**
+     * @inheritdoc
+     *
+     * @phpcs:disable PHPCompatibility.FunctionNameRestrictions.ReservedFunctionNames.MethodDoubleUnderscore,PHPCompatibility.FunctionNameRestrictions.NewMagicMethods.__unserializeFound
+     */
+    public function __unserialize($serialized) {}
+
+    public function __wakeup() {
+        unset($this->callback);
+    }
 }