Merge branch '6.4' into 7.3

* 6.4:
  Replace __sleep/wakeup() by __(un)serialize() for throwing and internal usages

Author: nicolas-grekas

Extension/DataCollector/FormDataCollector.php

@@ -197,20 +197,15 @@ public function getData(): array|Data
         return $this->data;
     }
 
-    /**
-     * @internal
-     */
-    public function __sleep(): array
+    public function __serialize(): array
     {
         foreach ($this->data['forms_by_hash'] as &$form) {
             if (isset($form['type_class']) && !$form['type_class'] instanceof ClassStub) {
                 $form['type_class'] = new ClassStub($form['type_class']);
             }
         }
 
-        $this->data = $this->cloneVar($this->data);
-
-        return parent::__sleep();
+        return ['data' => $this->data = $this->cloneVar($this->data)];
     }
 
     protected function getCasters(): array

Util/OrderedHashMapIterator.php

@@ -51,12 +51,12 @@ public function __construct(
         $this->managedCursors[$this->cursorId] = &$this->cursor;
     }
 
-    public function __sleep(): array
+    public function __serialize(): array
     {
         throw new \BadMethodCallException('Cannot serialize '.__CLASS__);
     }
 
-    public function __wakeup(): void
+    public function __unserialize(array $data): void
     {
         throw new \BadMethodCallException('Cannot unserialize '.__CLASS__);
     }