Merge branch '7.4' into 8.0

* 7.4:
  [Mime] Deprecate implementing `__sleep/wakeup()` on `AbstractPart` implementations
  [Validator] Deprecate implementing `__sleep/wakeup()` on GenericMetadata implementations
  [String] Deprecate implementing `__sleep/wakeup()` on string implementations
  More cleanups related to internal sleep/wakeup usages
  [HttpKernel] Deprecate `__sleep/wakeup()` on kernels and data collectors and make `Profile` final
  [Serializer] Make `AttributeMetadata` and `ClassMetadata` final
  Replace __sleep/wakeup() by __(un)serialize() when BC isn't a concern
  chore: PHP CS Fixer - simplify config

Author: nicolas-grekas

.php-cs-fixer.dist.php

@@ -34,7 +34,6 @@
         '@PHPUnit91Migration:risky' => true, // take version from src/Symfony/Bridge/PhpUnit/phpunit.xml.dist#L4
         '@Symfony' => true,
         '@Symfony:risky' => true,
-        'phpdoc_var_annotation_correct_order' => true,
         'protected_to_private' => false,
         'header_comment' => [
             'header' => implode('', $fileHeaderParts),
@@ -47,9 +46,6 @@
             ]),
         ],
         'php_unit_attributes' => true,
-        'method_argument_space' => ['after_heredoc' => true, 'on_multiline' => 'ignore'],
-        'no_trailing_whitespace_in_string' => false,
-        'no_whitespace_before_comma_in_array' => ['after_heredoc' => true],
     ])
     ->setRiskyAllowed(true)
     ->setFinder(

UPGRADE-7.4.md

@@ -52,13 +52,35 @@ HttpFoundation
 
  * Deprecate using `Request::sendHeaders()` after headers have already been sent; use a `StreamedResponse` instead
 
+HttpKernel
+----------
+
+ * Deprecate implementing `__sleep/wakeup()` on kernels; use `__(un)serialize()` instead
+ * Deprecate implementing `__sleep/wakeup()` on data collectors; use `__(un)serialize()` instead
+ * Make `Profile` final and `Profiler::__sleep()` internal
+
+Mime
+----
+
+ * Deprecate implementing `__sleep/wakeup()` on `AbstractPart` implementations; use `__(un)serialize()` instead
+
 Security
 --------
 
  * Deprecate callable firewall listeners, extend `AbstractListener` or implement `FirewallListenerInterface` instead
  * Deprecate `AbstractListener::__invoke`
  * Deprecate `LazyFirewallContext::__invoke()`
 
+Serializer
+----------
+
+ * Make `AttributeMetadata` and `ClassMetadata` final
+
+String
+------
+
+ * Deprecate implementing `__sleep/wakeup()` on string implementations
+
 Translation
 -----------
 
@@ -67,6 +89,7 @@ Translation
 Validator
 ---------
 
+ * Deprecate implementing `__sleep/wakeup()` on `GenericMetadata` implementations; use `__(un)serialize()` instead
  * Deprecate passing a list of choices to the first argument of the `Choice` constraint. Use the `choices` option instead
  * Deprecate `getRequiredOptions()` and `getDefaultOption()` methods of the `All`, `AtLeastOneOf`, `CardScheme`, `Collection`,
    `CssColor`, `Expression`, `Regex`, `Sequentially`, `Type`, and `When` constraints

src/Symfony/Bridge/Monolog/Handler/ElasticsearchLogstashHandler.php

@@ -138,12 +138,12 @@ private function sendToElasticsearch(array $records): void
         $this->wait(false);
     }
 
-    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__);
     }

src/Symfony/Bridge/PhpUnit/Legacy/SymfonyTestsListenerTrait.php

@@ -92,12 +92,12 @@ public function __construct(array $mockedNamespaces = [])
         }
     }
 
-    public function __sleep()
+    public function __serialize(): array
     {
         throw new \BadMethodCallException('Cannot serialize '.__CLASS__);
     }
 
-    public function __wakeup()
+    public function __unserialize(array $data): void
     {
         throw new \BadMethodCallException('Cannot unserialize '.__CLASS__);
     }

src/Symfony/Bridge/PhpUnit/composer.json

@@ -23,7 +23,7 @@
         "php": ">=8.1.0"
     },
     "require-dev": {
-        "symfony/deprecation-contracts": "^2.5|^3.0",
+        "symfony/deprecation-contracts": "^2.5|^3",
         "symfony/error-handler": "^6.4.3|^7.0.3|^8.0"
     },
     "autoload": {

src/Symfony/Bundle/FrameworkBundle/Tests/Functional/app/AppKernel.php

@@ -89,14 +89,16 @@ protected function build(ContainerBuilder $container): void
         $container->registerExtension(new TestDumpExtension());
     }
 
-    public function __sleep(): array
+    public function __serialize(): array
     {
-        return ['varDir', 'testCase', 'rootConfig', 'environment', 'debug'];
+        return [$this->varDir, $this->testCase, $this->rootConfig, $this->environment, $this->debug];
     }
 
-    public function __wakeup(): void
+    public function __unserialize(array $data): void
     {
-        foreach ($this as $k => $v) {
+        [$this->varDir, $this->testCase, $this->rootConfig, $this->environment, $this->debug] = $data;
+
+        foreach ($this as $v) {
             if (\is_object($v)) {
                 throw new \BadMethodCallException('Cannot unserialize '.__CLASS__);
             }

src/Symfony/Bundle/FrameworkBundle/Tests/Kernel/ConcreteMicroKernel.php

@@ -55,12 +55,12 @@ public function getLogDir(): string
         return $this->cacheDir;
     }
 
-    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__);
     }

src/Symfony/Bundle/FrameworkBundle/Tests/Kernel/flex-style/src/FlexStyleMicroKernel.php

@@ -64,12 +64,12 @@ public function getProjectDir(): string
         return \dirname((new \ReflectionObject($this))->getFileName(), 2);
     }
 
-    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__);
     }

src/Symfony/Bundle/WebProfilerBundle/Tests/Profiler/TemplateManagerTest.php

@@ -13,6 +13,9 @@
 
 use Symfony\Bundle\WebProfilerBundle\Profiler\TemplateManager;
 use Symfony\Bundle\WebProfilerBundle\Tests\TestCase;
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpFoundation\Response;
+use Symfony\Component\HttpKernel\DataCollector\DataCollector;
 use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 use Symfony\Component\HttpKernel\Profiler\Profile;
 use Symfony\Component\HttpKernel\Profiler\Profiler;
@@ -57,7 +60,10 @@ public function testGetNameValidTemplate()
             ->withAnyParameters()
             ->willReturnCallback($this->profilerHasCallback(...));
 
-        $this->assertEquals('@Foo/Collector/foo.html.twig', $this->templateManager->getName(new ProfileDummy(), 'foo'));
+        $profile = new Profile('token');
+        $profile->addCollector(new DummyCollector('foo'));
+        $profile->addCollector(new DummyCollector('bar'));
+        $this->assertEquals('@Foo/Collector/foo.html.twig', $this->templateManager->getName($profile, 'foo'));
     }
 
     public function profilerHasCallback($panel)
@@ -94,19 +100,18 @@ protected function mockTwigEnvironment()
     }
 }
 
-class ProfileDummy extends Profile
+class DummyCollector extends DataCollector
 {
-    public function __construct()
+    public function __construct(private string $name)
     {
-        parent::__construct('token');
     }
 
-    public function hasCollector(string $name): bool
+    public function getName(): string
+    {
+        return $this->name;
+    }
+
+    public function collect(Request $request, Response $response, ?\Throwable $exception = null): void
     {
-        return match ($name) {
-            'foo',
-            'bar' => true,
-            default => false,
-        };
     }
 }

src/Symfony/Component/Cache/Adapter/TagAwareAdapter.php

@@ -309,12 +309,12 @@ public function reset(): void
         $this->tags instanceof ResettableInterface && $this->tags->reset();
     }
 
-    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__);
     }