Merge branch '5.4' into 6.0

* 5.4:
  ignore the cached body when comparing e-mails for equality
  fix PHP syntax to be compatible with 7.2 and 7.3
  [HttpFoundation] Add session ID regex comment
  [Workflow] Fix typo in MethodMarkingStore
  Fix CS

Author: fabpot

src/Symfony/Component/HttpFoundation/Session/Storage/NativeSessionStorage.php

@@ -136,6 +136,36 @@ public function start(): bool
         }
 
         $sessionId = $_COOKIE[session_name()] ?? null;
+        /*
+         * Explanation of the session ID regular expression: `/^[a-zA-Z0-9,-]{22,250}$/`.
+         *
+         * ---------- Part 1
+         *
+         * The part `[a-zA-Z0-9,-]` is related to the PHP ini directive `session.sid_bits_per_character` defined as 6.
+         * See https://www.php.net/manual/en/session.configuration.php#ini.session.sid-bits-per-character.
+         * Allowed values are integers such as:
+         * - 4 for range `a-f0-9`
+         * - 5 for range `a-v0-9`
+         * - 6 for range `a-zA-Z0-9,-`
+         *
+         * ---------- Part 2
+         *
+         * The part `{22,250}` is related to the PHP ini directive `session.sid_length`.
+         * See https://www.php.net/manual/en/session.configuration.php#ini.session.sid-length.
+         * Allowed values are integers between 22 and 256, but we use 250 for the max.
+         *
+         * Where does the 250 come from?
+         * - The length of Windows and Linux filenames is limited to 255 bytes. Then the max must not exceed 255.
+         * - The session filename prefix is `sess_`, a 5 bytes string. Then the max must not exceed 255 - 5 = 250.
+         *
+         * ---------- Conclusion
+         *
+         * The parts 1 and 2 prevent the warning below:
+         * `PHP Warning: SessionHandler::read(): Session ID is too long or contains illegal characters. Only the A-Z, a-z, 0-9, "-", and "," characters are allowed.`
+         *
+         * The part 2 prevents the warning below:
+         * `PHP Warning: SessionHandler::read(): open(filepath, O_RDWR) failed: No such file or directory (2).`
+         */
         if ($sessionId && $this->saveHandler instanceof AbstractProxy && 'files' === $this->saveHandler->getSaveHandlerName() && !preg_match('/^[a-zA-Z0-9,-]{22,250}$/', $sessionId)) {
             // the session ID in the header is invalid, create a new one
             session_id(session_create_id());

src/Symfony/Component/Mime/Email.php

@@ -468,9 +468,7 @@ private function generateBody(): AbstractPart
             }
         }
 
-        $this->cachedBody = $part;
-
-        return $part;
+        return $this->cachedBody = $part;
     }
 
     private function prepareParts(): ?array

src/Symfony/Component/Mime/Tests/MessageConverterTest.php

@@ -76,6 +76,12 @@ private function assertConversion(Email $expected)
             $expected->html('HTML content');
             $converted->html('HTML content');
         }
+
+        $r = new \ReflectionProperty($expected, 'cachedBody');
+        $r->setAccessible(true);
+        $r->setValue($expected, null);
+        $r->setValue($converted, null);
+
         $this->assertEquals($expected, $converted);
     }
 }

src/Symfony/Component/Workflow/MarkingStore/MethodMarkingStore.php

@@ -58,8 +58,8 @@ public function getMarking(object $subject): Marking
         try {
             $marking = $subject->{$method}();
         } catch (\Error $e) {
-            $unInitializedPropertyMassage = sprintf('Typed property %s::$%s must not be accessed before initialization', get_debug_type($subject), $this->property);
-            if ($e->getMessage() !== $unInitializedPropertyMassage) {
+            $unInitializedPropertyMessage = sprintf('Typed property %s::$%s must not be accessed before initialization', get_debug_type($subject), $this->property);
+            if ($e->getMessage() !== $unInitializedPropertyMessage) {
                 throw $e;
             }
         }