symfony
diff --git a/‎UPGRADE-8.0.md
Copy file name to clipboard
+12Lines changed: 12 additions & 0 deletions
Display the source diff
Display the rich diff b/‎UPGRADE-8.0.md
Copy file name to clipboard
+12Lines changed: 12 additions & 0 deletions
Display the source diff
Display the rich diff
diff --git a/‎src/Symfony/Component/HttpKernel/CHANGELOG.md
Copy file name to clipboard
+1Lines changed: 1 addition & 0 deletions
Display the source diff
Display the rich diff b/‎src/Symfony/Component/HttpKernel/CHANGELOG.md
Copy file name to clipboard
+1Lines changed: 1 addition & 0 deletions
Display the source diff
Display the rich diff
diff --git a/‎src/Symfony/Component/HttpKernel/DataCollector/DataCollector.php
Copy file name to clipboard
+2-61Lines changed: 2 additions & 61 deletions b/‎src/Symfony/Component/HttpKernel/DataCollector/DataCollector.php
Copy file name to clipboard
+2-61Lines changed: 2 additions & 61 deletions
diff --git a/‎src/Symfony/Component/HttpKernel/Kernel.php
Copy file name to clipboard
+11-82Lines changed: 11 additions & 82 deletions b/‎src/Symfony/Component/HttpKernel/Kernel.php
Copy file name to clipboard
+11-82Lines changed: 11 additions & 82 deletions
diff --git a/‎src/Symfony/Component/HttpKernel/Profiler/Profile.php
Copy file name to clipboard
+14-6Lines changed: 14 additions & 6 deletions b/‎src/Symfony/Component/HttpKernel/Profiler/Profile.php
Copy file name to clipboard
+14-6Lines changed: 14 additions & 6 deletions
diff --git a/‎src/Symfony/Component/Mime/CHANGELOG.md
Copy file name to clipboard
+5Lines changed: 5 additions & 0 deletions
Display the source diff
Display the rich diff b/‎src/Symfony/Component/Mime/CHANGELOG.md
Copy file name to clipboard
+5Lines changed: 5 additions & 0 deletions
Display the source diff
Display the rich diff
diff --git a/‎src/Symfony/Component/Mime/Part/AbstractPart.php
Copy file name to clipboard
+2-43Lines changed: 2 additions & 43 deletions b/‎src/Symfony/Component/Mime/Part/AbstractPart.php
Copy file name to clipboard
+2-43Lines changed: 2 additions & 43 deletions
@@ -200,6 +200,7 @@ HttpKernel
  * Remove `Kernel::getAnnotatedClassesToCompile()` and `Kernel::setAnnotatedClassCache()`
  * Make `ServicesResetter` class `final`
  * Add argument `$logChannel` to `ErrorListener::logException()`
+ * Replace `__sleep/wakeup()` by `__(un)serialize()` on kernels and data collectors
 
 Intl
 ----
@@ -224,6 +225,11 @@ Messenger
  * Remove `text` format when using the `messenger:stats` command
  * Add method `getRetryDelay()` to `RecoverableExceptionInterface`
 
+Mime
+----
+
+ * Replace `__sleep/wakeup()` by `__(un)serialize()` on `AbstractPart` implementations
+
 Notifier
 --------
 
@@ -464,6 +470,11 @@ Translation
  * Make `DataCollectorTranslator` class `final`
  * Remove `ProviderFactoryTestCase`, extend `AbstractProviderFactoryTestCase` instead
 
+String
+------
+
+ * Replace `__sleep/wakeup()` by `__(un)serialize()` on string implementations
+
 TwigBridge
 ----------
 
@@ -498,6 +509,7 @@ Validator
 ---------
 
  * Add method `getGroupProvider()` to `ClassMetadataInterface`
+ * Replace `__sleep/wakeup()` by `__(un)serialize()`  on `GenericMetadata` implementations
  * Remove the `getRequiredOptions()` and `getDefaultOption()` methods from the `All`, `AtLeastOneOf`, `CardScheme`, `Collection`,
    `CssColor`, `Expression`, `Regex`, `Sequentially`, `Type`, and `When` constraints
  * Remove support for evaluating options in the base `Constraint` class. Initialize properties in the constructor of the concrete constraint
 
@@ -9,6 +9,7 @@ CHANGELOG
  * Remove `Kernel::getAnnotatedClassesToCompile()` and `Kernel::setAnnotatedClassCache()`
  * Make `ServicesResetter` class `final`
  * Add argument `$logChannel` to `ErrorListener::logException()`
+ * Replace `__sleep/wakeup()` by `__(un)serialize()` on kernels and data collectors
 
 7.4
 ---
 
@@ -86,71 +86,12 @@ protected function getCasters(): array
 
     public function __serialize(): array
     {
-        if (self::class === (new \ReflectionMethod($this, '__sleep'))->class || self::class !== (new \ReflectionMethod($this, '__serialize'))->class) {
-            return ['data' => $this->data];
-        }
-
-        trigger_deprecation('symfony/http-kernel', '7.4', 'Implementing "%s::__sleep()" is deprecated, use "__serialize()" instead.', get_debug_type($this));
-
-        $data = [];
-        foreach ($this->__sleep() as $key) {
-            try {
-                if (($r = new \ReflectionProperty($this, $key))->isInitialized($this)) {
-                    $data[$key] = $r->getValue($this);
-                }
-            } catch (\ReflectionException) {
-                $data[$key] = $this->$key;
-            }
-        }
-
-        return $data;
+        return ['data' => $this->data];
     }
 
     public function __unserialize(array $data): void
     {
-        if ($wakeup = self::class !== (new \ReflectionMethod($this, '__wakeup'))->class && self::class === (new \ReflectionMethod($this, '__unserialize'))->class) {
-            trigger_deprecation('symfony/http-kernel', '7.4', 'Implementing "%s::__wakeup()" is deprecated, use "__unserialize()" instead.', get_debug_type($this));
-        }
-
-        if (\in_array(array_keys($data), [['data'], ["\0*\0data"]], true)) {
-            $this->data = $data['data'] ?? $data["\0*\0data"];
-
-            if ($wakeup) {
-                $this->__wakeup();
-            }
-
-            return;
-        }
-
-        trigger_deprecation('symfony/http-kernel', '7.4', 'Passing more than just key "data" to "%s::__unserialize()" is deprecated, populate properties in "%s::__unserialize()" instead.', self::class, get_debug_type($this));
-
-        \Closure::bind(function ($data) use ($wakeup) {
-            foreach ($data as $key => $value) {
-                $this->{("\0" === $key[0] ?? '') ? substr($key, 1 + strrpos($key, "\0")) : $key} = $value;
-            }
-
-            if ($wakeup) {
-                $this->__wakeup();
-            }
-        }, $this, static::class)($data);
-    }
-
-    /**
-     * @deprecated since Symfony 7.4, will be replaced by `__serialize()` in 8.0
-     */
-    public function __sleep(): array
-    {
-        trigger_deprecation('symfony/http-kernel', '7.4', 'Calling "%s::__sleep()" is deprecated, use "__serialize()" instead.', get_debug_type($this));
-
-        return ['data'];
-    }
-
-    /**
-     * @deprecated since Symfony 7.4, will be replaced by `__unserialize()` in 8.0
-     */
-    public function __wakeup(): void
-    {
-        trigger_deprecation('symfony/http-kernel', '7.4', 'Calling "%s::__wakeup()" is deprecated, use "__unserialize()" instead.', get_debug_type($this));
+        $this->data = $data['data'] ?? $data["\0*\0data"];
     }
 
     public function reset(): void
 
@@ -751,95 +751,24 @@ private function preBoot(): ContainerInterface
 
     public function __serialize(): array
     {
-        if (self::class === (new \ReflectionMethod($this, '__sleep'))->class || self::class !== (new \ReflectionMethod($this, '__serialize'))->class) {
-            return [
-                'environment' => $this->environment,
-                'debug' => $this->debug,
-            ];
-        }
-
-        trigger_deprecation('symfony/http-kernel', '7.4', 'Implementing "%s::__sleep()" is deprecated, use "__serialize()" instead.', get_debug_type($this));
-
-        $data = [];
-        foreach ($this->__sleep() as $key) {
-            try {
-                if (($r = new \ReflectionProperty($this, $key))->isInitialized($this)) {
-                    $data[$key] = $r->getValue($this);
-                }
-            } catch (\ReflectionException) {
-                $data[$key] = $this->$key;
-            }
-        }
-
-        return $data;
+        return [
+            'environment' => $this->environment,
+            'debug' => $this->debug,
+        ];
     }
 
     public function __unserialize(array $data): void
     {
-        if ($wakeup = self::class !== (new \ReflectionMethod($this, '__wakeup'))->class && self::class === (new \ReflectionMethod($this, '__unserialize'))->class) {
-            trigger_deprecation('symfony/http-kernel', '7.4', 'Implementing "%s::__wakeup()" is deprecated, use "__unserialize()" instead.', get_debug_type($this));
-        }
-
-        if (\in_array(array_keys($data), [['environment', 'debug'], ["\0*\0environment", "\0*\0debug"]], true)) {
-            $environment = $data['environment'] ?? $data["\0*\0environment"];
-            $debug = $data['debug'] ?? $data["\0*\0debug"];
-
-            if (\is_object($environment) || \is_object($debug)) {
-                throw new \BadMethodCallException('Cannot unserialize '.__CLASS__);
-            }
-
-            $this->environment = $environment;
-            $this->debug = $debug;
-
-            if ($wakeup) {
-                $this->__wakeup();
-            } else {
-                $this->__construct($environment, $debug);
-            }
-
-            return;
-        }
-
-        trigger_deprecation('symfony/http-kernel', '7.4', 'Passing more than just key "environment" and "debug" to "%s::__unserialize()" is deprecated, populate properties in "%s::__unserialize()" instead.', self::class, get_debug_type($this));
-
-        \Closure::bind(function ($data) use ($wakeup) {
-            foreach ($data as $key => $value) {
-                $this->{("\0" === $key[0] ?? '') ? substr($key, 1 + strrpos($key, "\0")) : $key} = $value;
-            }
-
-            if ($wakeup) {
-                $this->__wakeup();
-            } else {
-                if (\is_object($this->environment) || \is_object($this->debug)) {
-                    throw new \BadMethodCallException('Cannot unserialize '.__CLASS__);
-                }
-
-                $this->__construct($this->environment, $this->debug);
-            }
-        }, $this, static::class)($data);
-    }
-
-    /**
-     * @deprecated since Symfony 7.4, will be replaced by `__serialize()` in 8.0
-     */
-    public function __sleep(): array
-    {
-        trigger_deprecation('symfony/http-kernel', '7.4', 'Calling "%s::__sleep()" is deprecated, use "__serialize()" instead.', get_debug_type($this));
-
-        return ['environment', 'debug'];
-    }
-
-    /**
-     * @deprecated since Symfony 7.4, will be replaced by `__unserialize()` in 8.0
-     */
-    public function __wakeup(): void
-    {
-        trigger_deprecation('symfony/http-kernel', '7.4', 'Calling "%s::__wakeup()" is deprecated, use "__unserialize()" instead.', get_debug_type($this));
+        $environment = $data['environment'] ?? $data["\0*\0environment"];
+        $debug = $data['debug'] ?? $data["\0*\0debug"];
 
-        if (\is_object($this->environment) || \is_object($this->debug)) {
+        if (\is_object($environment) || \is_object($debug)) {
             throw new \BadMethodCallException('Cannot unserialize '.__CLASS__);
         }
 
-        $this->__construct($this->environment, $this->debug);
+        $this->environment = $environment;
+        $this->debug = $debug;
+
+        $this->__construct($environment, $debug);
     }
 }
@@ -16,7 +16,7 @@
 /**
  * @author Fabien Potencier <fabien@symfony.com>
  *
- * @final since Symfony 7.4
+ * @final
  */
 class Profile
 {
@@ -248,11 +248,19 @@ public function hasCollector(string $name): bool
         return isset($this->collectors[$name]);
     }
 
-    /**
-     * @internal since Symfony 7.4, will be replaced by `__serialize()` in 8.0
-     */
-    public function __sleep(): array
+    public function __serialize(): array
     {
-        return ['token', 'parent', 'children', 'collectors', 'ip', 'method', 'url', 'time', 'statusCode', 'virtualType'];
+        return [
+            'token' => $this->token,
+            'parent' => $this->parent,
+            'children' => $this->children,
+            'collectors' => $this->collectors,
+            'ip' => $this->ip,
+            'method' => $this->method,
+            'url' => $this->url,
+            'time' => $this->time,
+            'statusCode' => $this->statusCode,
+            'virtualType' => $this->virtualType,
+        ];
     }
 }
@@ -1,6 +1,11 @@
 CHANGELOG
 =========
 
+8.0
+---
+
+ * Replace `__sleep/wakeup()` by `__(un)serialize()` on `AbstractPart` implementations
+
 7.4
 ---
 
 
@@ -65,52 +65,11 @@ abstract public function getMediaSubtype(): string;
 
     public function __serialize(): array
     {
-        if (!method_exists($this, '__sleep')) {
-            return ['headers' => $this->headers];
-        }
-
-        trigger_deprecation('symfony/mime', '7.4', 'Implementing "%s::__sleep()" is deprecated, use "__serialize()" instead.', get_debug_type($this));
-
-        $data = [];
-        foreach ($this->__sleep() as $key) {
-            try {
-                if (($r = new \ReflectionProperty($this, $key))->isInitialized($this)) {
-                    $data[$key] = $r->getValue($this);
-                }
-            } catch (\ReflectionException) {
-                $data[$key] = $this->$key;
-            }
-        }
-
-        return $data;
+        return ['headers' => $this->headers];
     }
 
     public function __unserialize(array $data): void
     {
-        if ($wakeup = method_exists($this, '__wakeup') && self::class === (new \ReflectionMethod($this, '__unserialize'))->class) {
-            trigger_deprecation('symfony/mime', '7.4', 'Implementing "%s::__wakeup()" is deprecated, use "__unserialize()" instead.', get_debug_type($this));
-        }
-
-        if (['headers'] === array_keys($data)) {
-            $this->headers = $data['headers'];
-
-            if ($wakeup) {
-                $this->__wakeup();
-            }
-
-            return;
-        }
-
-        trigger_deprecation('symfony/mime', '7.4', 'Passing more than just key "headers" to "%s::__unserialize()" is deprecated, populate properties in "%s::__unserialize()" instead.', self::class, get_debug_type($this));
-
-        \Closure::bind(function ($data) use ($wakeup) {
-            foreach ($data as $key => $value) {
-                $this->{("\0" === $key[0] ?? '') ? substr($key, 1 + strrpos($key, "\0")) : $key} = $value;
-            }
-
-            if ($wakeup) {
-                $this->__wakeup();
-            }
-        }, $this, static::class)($data);
+        $this->headers = $data['headers'];
     }
 }
Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@`
`16`	`16`	`/**`
`17`	`17`	`* @author Fabien Potencier <fabien@symfony.com>`
`18`	`18`	`*`
`19`		`- * @final since Symfony 7.4`
	`19`	`+ * @final`
`20`	`20`	`*/`
`21`	`21`	`class Profile`
`22`	`22`	`{`
`@@ -248,11 +248,19 @@ public function hasCollector(string $name): bool`
`248`	`248`	`return isset($this->collectors[$name]);`
`249`	`249`	`}`
`250`	`250`
`251`		`- /**`
`252`		- * @internal since Symfony 7.4, will be replaced by `__serialize()` in 8.0
`253`		`- */`
`254`		`- public function __sleep(): array`
	`251`	`+ public function __serialize(): array`
`255`	`252`	`{`
`256`		`- return ['token', 'parent', 'children', 'collectors', 'ip', 'method', 'url', 'time', 'statusCode', 'virtualType'];`
	`253`	`+ return [`
	`254`	`+ 'token' => $this->token,`
	`255`	`+ 'parent' => $this->parent,`
	`256`	`+ 'children' => $this->children,`
	`257`	`+ 'collectors' => $this->collectors,`
	`258`	`+ 'ip' => $this->ip,`
	`259`	`+ 'method' => $this->method,`
	`260`	`+ 'url' => $this->url,`
	`261`	`+ 'time' => $this->time,`
	`262`	`+ 'statusCode' => $this->statusCode,`
	`263`	`+ 'virtualType' => $this->virtualType,`
	`264`	`+ ];`
`257`	`265`	`}`
`258`	`266`	`}`