Merge branch '7.3' into 7.4

* 7.3:
  [SecurityBundle] Fix semantic configuration for singulars/plurals in XML
  [JsonPath] Make the component RFC compliant
  Fix `#[IsCsrfTokenValid]` to ensure `$tokenKey` is non-nullable

Author: nicolas-grekas

DependencyInjection/Configuration.php

@@ -86,6 +86,7 @@ public function getConfigTreeBuilder(): TreeBuilder
                 })
             ->end()
             ->fixXmlConfig('enabled_locale')
+            ->fixXmlConfig('trusted_header')
             ->children()
                 ->scalarNode('secret')->end()
                 ->booleanNode('http_method_override')
@@ -124,7 +125,6 @@ public function getConfigTreeBuilder(): TreeBuilder
                     ->defaultValue(['%env(default::SYMFONY_TRUSTED_PROXIES)%'])
                 ->end()
                 ->arrayNode('trusted_headers')
-                    ->fixXmlConfig('trusted_header')
                     ->performNoDeepMerging()
                     ->beforeNormalization()->ifString()->then(static fn ($v) => $v ? [$v] : [])->end()
                     ->prototype('scalar')->end()
@@ -276,6 +276,7 @@ private function addHttpCacheSection(ArrayNodeDefinition $rootNode): void
                     ->info('HTTP cache configuration')
                     ->canBeEnabled()
                     ->fixXmlConfig('private_header')
+                    ->fixXmlConfig('skip_response_header')
                     ->children()
                         ->booleanNode('debug')->defaultValue('%kernel.debug%')->end()
                         ->enumNode('trace_level')

Resources/config/schema/symfony-1.0.xsd

@@ -47,6 +47,7 @@
             <xsd:element name="webhook" type="webhook" minOccurs="0" maxOccurs="1" />
             <xsd:element name="remote-event" type="remote-event" minOccurs="0" maxOccurs="1" />
             <xsd:element name="json-streamer" type="json-streamer" minOccurs="0" maxOccurs="1" />
+            <xsd:element name="secrets" type="secrets" minOccurs="0" maxOccurs="1" />
         </xsd:choice>
 
         <xsd:attribute name="http-method-override" type="xsd:boolean" />
@@ -62,6 +63,7 @@
         <xsd:attribute name="trusted-hosts" type="xsd:string" />
         <xsd:attribute name="trusted-proxies" type="xsd:string" />
         <xsd:attribute name="trusted-headers" type="xsd:string" />
+        <xsd:attribute name="disallow-search-engine-index" type="xsd:boolean" />
     </xsd:complexType>
 
     <xsd:complexType name="form">
@@ -724,6 +726,7 @@
         <xsd:choice maxOccurs="unbounded">
             <xsd:element name="resolve" type="http_resolve" minOccurs="0" maxOccurs="unbounded" />
             <xsd:element name="header" type="http_header" minOccurs="0" maxOccurs="unbounded" />
+            <xsd:element name="var" type="http_var" minOccurs="0" maxOccurs="unbounded" />
             <xsd:element name="peer-fingerprint" type="fingerprint" minOccurs="0" maxOccurs="unbounded" />
             <xsd:element name="retry-failed" type="http_client_retry_failed" minOccurs="0" maxOccurs="1" />
             <xsd:element name="extra" type="xsd:anyType" minOccurs="0" maxOccurs="unbounded" />
@@ -818,6 +821,10 @@
         <xsd:attribute name="name" type="xsd:string" />
     </xsd:complexType>
 
+    <xsd:complexType name="http_var" mixed="true">
+        <xsd:attribute name="name" type="xsd:string" />
+    </xsd:complexType>
+
     <xsd:complexType name="mailer">
         <xsd:sequence>
             <xsd:element name="transport" type="mailer_transport" minOccurs="0" maxOccurs="unbounded" />
@@ -875,6 +882,7 @@
     <xsd:complexType name="http_cache">
         <xsd:sequence>
             <xsd:element name="private-header" type="xsd:string" minOccurs="0" maxOccurs="unbounded" />
+            <xsd:element name="skip-response-header" type="xsd:string" minOccurs="0" maxOccurs="unbounded" />
         </xsd:sequence>
 
         <xsd:attribute name="enabled" type="xsd:boolean" />
@@ -1077,4 +1085,11 @@
         <xsd:attribute name="enabled" type="xsd:boolean" />
     </xsd:complexType>
 
+    <xsd:complexType name="secrets">
+        <xsd:attribute name="enabled" type="xsd:boolean" />
+        <xsd:attribute name="vault-directory" type="xsd:string" />
+        <xsd:attribute name="local-dotenv-file" type="xsd:string" />
+        <xsd:attribute name="decryption-env-var" type="xsd:string" />
+    </xsd:complexType>
+
 </xsd:schema>