Merge branch '5.4' into 6.3

* 5.4:
  Update templating.rst
  [Expression Language] Clarify number of backslashes to escape a backslash
  reference the decorated service using the special .inner id

Author: xabbuh

cache.rst

@@ -804,7 +804,7 @@ Then, register the ``SodiumMarshaller`` service using this key:
                     - ['%env(base64:CACHE_DECRYPTION_KEY)%']
                     # use multiple keys in order to rotate them
                     #- ['%env(base64:CACHE_DECRYPTION_KEY)%', '%env(base64:OLD_CACHE_DECRYPTION_KEY)%']
-                    - '@Symfony\Component\Cache\Marshaller\SodiumMarshaller.inner'
+                    - '@.inner'
 
     .. code-block:: xml
 
@@ -827,7 +827,7 @@ Then, register the ``SodiumMarshaller`` service using this key:
                         <!-- use multiple keys in order to rotate them -->
                         <!-- <argument>env(base64:OLD_CACHE_DECRYPTION_KEY)</argument> -->
                     </argument>
-                    <argument type="service" id="Symfony\Component\Cache\Marshaller\SodiumMarshaller.inner"/>
+                    <argument type="service" id=".inner"/>
                 </service>
             </services>
         </container>
@@ -844,7 +844,7 @@ Then, register the ``SodiumMarshaller`` service using this key:
             ->addArgument(['env(base64:CACHE_DECRYPTION_KEY)'])
             // use multiple keys in order to rotate them
             //->addArgument(['env(base64:CACHE_DECRYPTION_KEY)', 'env(base64:OLD_CACHE_DECRYPTION_KEY)'])
-            ->addArgument(new Reference(SodiumMarshaller::class.'.inner'));
+            ->addArgument(new Reference('.inner'));
 
 .. caution::
 

create_framework/templating.rst

@@ -142,13 +142,14 @@ framework does not need to be modified in any way, create a new
 ``app.php`` file::
 
     // example.com/src/app.php
+    use Symfony\Component\HttpFoundation\Request;
     use Symfony\Component\HttpFoundation\Response;
     use Symfony\Component\Routing;
 
     function is_leap_year(int $year = null): bool
     {
         if (null === $year) {
-            $year = date('Y');
+            $year = (int)date('Y');
         }
 
         return 0 === $year % 400 || (0 === $year % 4 && 0 !== $year % 100);

reference/formats/expression_language.rst

@@ -28,8 +28,8 @@ The component supports:
 
 .. caution::
 
-    A backslash (``\``) must be escaped by 4 backslashes (``\\\\``) in a string
-    and 8 backslashes (``\\\\\\\\``) in a regex::
+    A backslash (``\``) must be escaped by 3 backslashes (``\\\\``) in a string
+    and 7 backslashes (``\\\\\\\\``) in a regex::
 
         echo $expressionLanguage->evaluate('"\\\\"'); // prints \
         $expressionLanguage->evaluate('"a\\\\b" matches "/^a\\\\\\\\b$/"'); // returns true

session.rst

@@ -1621,7 +1621,7 @@ Then, register the ``SodiumMarshaller`` service using this key:
                 decorates: 'session.marshaller'
                 arguments:
                     - ['%env(file:resolve:SESSION_DECRYPTION_FILE)%']
-                    - '@Symfony\Component\Cache\Marshaller\SodiumMarshaller.inner'
+                    - '@.inner'
 
     .. code-block:: xml
 
@@ -1637,7 +1637,7 @@ Then, register the ``SodiumMarshaller`` service using this key:
                     <argument type="collection">
                         <argument>env(file:resolve:SESSION_DECRYPTION_FILE)</argument>
                     </argument>
-                    <argument type="service" id="Symfony\Component\Cache\Marshaller\SodiumMarshaller.inner"/>
+                    <argument type="service" id=".inner"/>
                 </service>
             </services>
         </container>
@@ -1658,7 +1658,7 @@ Then, register the ``SodiumMarshaller`` service using this key:
                 ->decorate('session.marshaller')
                 ->args([
                     [env('file:resolve:SESSION_DECRYPTION_FILE')],
-                    service(SodiumMarshaller::class.'.inner'),
+                    service('.inner'),
                 ]);
         };