Merge branch '6.4' into 7.0

* 6.4:
  [FrameworkBundle] Add TemplateController to the list of allowed controllers for fragments
  [Cache][Lock] Fix PDO store not creating table + add tests
  Closes #51936-Added Missing translations for Czech (cs) in validators.cs.xlf file
  Added missing translations in turkish and updated validators.tr.xlf
  [Serializer] Fix denormalizing date intervals having both weeks and days
  [Validator] updated Turkish translation
  [Serializer] Remove wrong final tags
  [Serializer] Fix denormalize constructor arguments
  Add some more non-countable English nouns
  Add hint that changing input arguments has no effect
  register the virtual request stack together with common profiling services
  Don't lose checkpoint state when lock is acquired from another
  [DomCrawler] Revert "bug #52579 UriResolver support path with colons"
  [VarExporter] Fix handling mangled property names returned by __sleep()
  Update Github template for 7.1
  Fix memory limit in PhpSubprocess unit test

Author: nicolas-grekas

Internal/Exporter.php

@@ -158,21 +158,19 @@ public static function prepare($values, $objectsPool, &$refsPool, &$objectsCount
                     $n = substr($n, 1 + $i);
                 }
                 if (null !== $sleep) {
-                    if (!isset($sleep[$n]) || ($i && $c !== $class)) {
+                    if (!isset($sleep[$name]) && (!isset($sleep[$n]) || ($i && $c !== $class))) {
                         unset($arrayValue[$name]);
                         continue;
                     }
-                    $sleep[$n] = false;
+                    unset($sleep[$name], $sleep[$n]);
                 }
                 if (!\array_key_exists($name, $proto) || $proto[$name] !== $v || "\x00Error\x00trace" === $name || "\x00Exception\x00trace" === $name) {
                     $properties[$c][$n] = $v;
                 }
             }
             if ($sleep) {
                 foreach ($sleep as $n => $v) {
-                    if (false !== $v) {
-                        trigger_error(sprintf('serialize(): "%s" returned as member variable from __sleep() but does not exist', $n), \E_USER_NOTICE);
-                    }
+                    trigger_error(sprintf('serialize(): "%s" returned as member variable from __sleep() but does not exist', $n), \E_USER_NOTICE);
                 }
             }
             if (method_exists($class, '__unserialize')) {

Tests/Fixtures/var-on-sleep.php

@@ -11,6 +11,14 @@
                 'night',
             ],
         ],
+        'Symfony\\Component\\VarExporter\\Tests\\GoodNight' => [
+            'foo' => [
+                'afternoon',
+            ],
+            'bar' => [
+                'morning',
+            ],
+        ],
     ],
     $o[0],
     []

Tests/VarExporterTest.php

@@ -329,17 +329,21 @@ public function setFlags($flags): void
 class GoodNight
 {
     public $good;
+    protected $foo;
+    private $bar;
 
     public function __construct()
     {
         unset($this->good);
+        $this->foo = 'afternoon';
+        $this->bar = 'morning';
     }
 
     public function __sleep(): array
     {
         $this->good = 'night';
 
-        return ['good'];
+        return ['good', 'foo', "\0*\0foo", "\0".__CLASS__."\0bar"];
     }
 }
 

VarExporter.php

@@ -82,7 +82,7 @@ public static function export(mixed $value, bool &$isStaticValue = null, array &
         ksort($states);
 
         $wakeups = [null];
-        foreach ($states as $k => $v) {
+        foreach ($states as $v) {
             if (\is_array($v)) {
                 $wakeups[-$v[0]] = $v[1];
             } else {