Merge branch '6.4' into 7.3

nicolas-grekas · nicolas-grekas · commit 180c544c90b4 · 2025-09-11T12:12:26.000+02:00
* 6.4:
  Replace __sleep/wakeup() by __(un)serialize() for throwing and internal usages
diff --git a/Adapter/ExtLdap/Connection.php b/Adapter/ExtLdap/Connection.php
@@ -40,12 +40,12 @@ class Connection extends AbstractConnection
     private bool $bound = false;
     private ?LDAPConnection $connection = null;
 
-    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__);
     }
diff --git a/Adapter/ExtLdap/Query.php b/Adapter/ExtLdap/Query.php
@@ -30,12 +30,12 @@ class Query extends AbstractQuery
 
     private array $serverctrls = [];
 
-    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__);
     }

Original file line number	Diff line number	Diff line change
`@@ -40,12 +40,12 @@ class Connection extends AbstractConnection`
`40`	`40`	`private bool $bound = false;`
`41`	`41`	`private ?LDAPConnection $connection = null;`
`42`	`42`
`43`		`- public function __sleep(): array`
	`43`	`+ public function __serialize(): array`
`44`	`44`	`{`
`45`	`45`	`throw new \BadMethodCallException('Cannot serialize '.__CLASS__);`
`46`	`46`	`}`
`47`	`47`
`48`		`- public function __wakeup(): void`
	`48`	`+ public function __unserialize(array $data): void`
`49`	`49`	`{`
`50`	`50`	`throw new \BadMethodCallException('Cannot unserialize '.__CLASS__);`
`51`	`51`	`}`
Original file line number	Diff line number	Diff line change
`@@ -30,12 +30,12 @@ class Query extends AbstractQuery`
`30`	`30`
`31`	`31`	`private array $serverctrls = [];`
`32`	`32`
`33`		`- public function __sleep(): array`
	`33`	`+ public function __serialize(): array`
`34`	`34`	`{`
`35`	`35`	`throw new \BadMethodCallException('Cannot serialize '.__CLASS__);`
`36`	`36`	`}`
`37`	`37`
`38`		`- public function __wakeup(): void`
	`38`	`+ public function __unserialize(array $data): void`
`39`	`39`	`{`
`40`	`40`	`throw new \BadMethodCallException('Cannot unserialize '.__CLASS__);`
`41`	`41`	`}`