Merge branch '6.4' into 7.3

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

Author: nicolas-grekas

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

@@ -93,12 +93,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/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/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__);
     }

src/Symfony/Component/Cache/Tests/Adapter/AdapterTestCase.php

@@ -399,7 +399,7 @@ public function testNamespaces()
 
 class NotUnserializable
 {
-    public function __wakeup(): void
+    public function __unserialize(array $data): void
     {
         throw new \Exception(__CLASS__);
     }

src/Symfony/Component/Cache/Tests/Psr16CacheTest.php

@@ -174,7 +174,7 @@ protected function isPruned(CacheInterface $cache, string $name): bool
 
 class NotUnserializable
 {
-    public function __wakeup(): void
+    public function __unserialize(array $data): void
     {
         throw new \Exception(__CLASS__);
     }

src/Symfony/Component/Cache/Traits/AbstractAdapterTrait.php

@@ -288,12 +288,12 @@ public function reset(): void
         $this->ids = [];
     }
 
-    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/Component/Cache/Traits/FilesystemCommonTrait.php

@@ -168,12 +168,12 @@ private function scanHashDir(string $directory): \Generator
         }
     }
 
-    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__);
     }