More cleanups related to internal sleep/wakeup usages

nicolas-grekas · nicolas-grekas · commit e7e37013acb9 · 2025-08-14T14:02:30.000+02:00
diff --git a/src/Symfony/Bridge/Monolog/Handler/ElasticsearchLogstashHandler.php b/src/Symfony/Bridge/Monolog/Handler/ElasticsearchLogstashHandler.php
@@ -143,7 +143,7 @@ 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/src/Symfony/Component/HttpClient/Response/AmpResponseV5.php b/src/Symfony/Component/HttpClient/Response/AmpResponseV5.php
@@ -122,12 +122,12 @@ public function getInfo(?string $type = null): mixed
         return null !== $type ? $this->info[$type] ?? null : $this->info;
     }
 
-    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/src/Symfony/Component/Validator/Constraint.php b/src/Symfony/Component/Validator/Constraint.php
@@ -313,11 +313,22 @@ public function getTargets(): string|array
      *
      * @internal
      */
-    public function __sleep(): array
+    public function __serialize(): array
     {
         // Initialize "groups" option if it is not set
         $this->groups;
 
-        return array_keys(get_object_vars($this));
+        $data = [];
+        $class = $this::class;
+        foreach ((array) $this as $k => $v) {
+            $data[match (true) {
+                '' === $k || "\0" !== $k[0] => $k,
+                str_starts_with($k, "\0*\0") => substr($k, 3),
+                str_starts_with($k, "\0{$class}\0") => substr($k, 2 + \strlen($class)),
+                default => $k,
+            }] = $v;
+        }
+
+        return $data;
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -143,7 +143,7 @@ public function __serialize(): array`
`143`	`143`	`throw new \BadMethodCallException('Cannot serialize '.__CLASS__);`
`144`	`144`	`}`
`145`	`145`
`146`		`- public function __wakeup(): void`
	`146`	`+ public function __unserialize(array $data): void`
`147`	`147`	`{`
`148`	`148`	`throw new \BadMethodCallException('Cannot unserialize '.__CLASS__);`
`149`	`149`	`}`
Original file line number	Diff line number	Diff line change
`@@ -122,12 +122,12 @@ public function getInfo(?string $type = null): mixed`
`122`	`122`	`return null !== $type ? $this->info[$type] ?? null : $this->info;`
`123`	`123`	`}`
`124`	`124`
`125`		`- public function __sleep(): array`
	`125`	`+ public function __serialize(): array`
`126`	`126`	`{`
`127`	`127`	`throw new \BadMethodCallException('Cannot serialize '.__CLASS__);`
`128`	`128`	`}`
`129`	`129`
`130`		`- public function __wakeup(): void`
	`130`	`+ public function __unserialize(array $data): void`
`131`	`131`	`{`
`132`	`132`	`throw new \BadMethodCallException('Cannot unserialize '.__CLASS__);`
`133`	`133`	`}`
Original file line number	Diff line number	Diff line change
`@@ -313,11 +313,22 @@ public function getTargets(): string\|array`
`313`	`313`	`*`
`314`	`314`	`* @internal`
`315`	`315`	`*/`
`316`		`- public function __sleep(): array`
	`316`	`+ public function __serialize(): array`
`317`	`317`	`{`
`318`	`318`	`// Initialize "groups" option if it is not set`
`319`	`319`	`$this->groups;`
`320`	`320`
`321`		`- return array_keys(get_object_vars($this));`
	`321`	`+ $data = [];`
	`322`	`+ $class = $this::class;`
	`323`	`+ foreach ((array) $this as $k => $v) {`
	`324`	`+ $data[match (true) {`
	`325`	`+ '' === $k \|\| "\0" !== $k[0] => $k,`
	`326`	`+ str_starts_with($k, "\0*\0") => substr($k, 3),`
	`327`	`+ str_starts_with($k, "\0{$class}\0") => substr($k, 2 + \strlen($class)),`
	`328`	`+ default => $k,`
	`329`	`+ }] = $v;`
	`330`	`+ }`
	`331`	`+`
	`332`	`+ return $data;`
`322`	`333`	`}`
`323`	`334`	`}`