Merge branch '6.1' into 6.2

* 6.1:
  [Console] Prevent PHP 8.1 str_replace deprec on null
  [HttpKernel] Fix BackedEnumValueResolver already resolved enum value
  Improve DE translations for Form/Validator
  [Serializer] Fix ignore attribute in Xml files
  [Console] Escape % in command name & description from getDefault*()
  [WebProfilerBundle] Fix dark theme selected line highlight color & reuse css vars
  [Runtime] List Fulgens as backer of version 6.1
  [HttpClient] List Prisma Media as backer of version 6.1
  [WebProfilerBundle] normalizer and encoder can be undefined in template
  [Mime] Check that the path is a file in the DataPart::fromPath
  [Cache] do not pass null to strlen()
  [HtmlSanitizer][FrameworkBundle] Fix calling `allowStaticElements` when setting `allow_all_static_elements: true`
  [Mailer] Sort transports alphabetically
  [Security] Fix some phpdoc
  [Serializer] Get attributeContext after converting name

Author: derrabus

DependencyInjection/Configuration.php

@@ -2149,7 +2149,7 @@ private function addHtmlSanitizerSection(ArrayNodeDefinition $rootNode, callable
                                         ->info('Allows "safe" elements and attributes.')
                                         ->defaultFalse()
                                     ->end()
-                                    ->booleanNode('allow_all_static_elements')
+                                    ->booleanNode('allow_static_elements')
                                         ->info('Allows all static elements and attributes from the W3C Sanitizer API standard.')
                                         ->defaultFalse()
                                     ->end()

DependencyInjection/FrameworkExtension.php

@@ -2430,11 +2430,11 @@ private function registerMailerConfiguration(array $config, ContainerBuilder $co
             MailgunTransportFactory::class => 'mailer.transport_factory.mailgun',
             MailjetTransportFactory::class => 'mailer.transport_factory.mailjet',
             MandrillTransportFactory::class => 'mailer.transport_factory.mailchimp',
+            OhMySmtpTransportFactory::class => 'mailer.transport_factory.ohmysmtp',
             PostmarkTransportFactory::class => 'mailer.transport_factory.postmark',
             SendgridTransportFactory::class => 'mailer.transport_factory.sendgrid',
             SendinblueTransportFactory::class => 'mailer.transport_factory.sendinblue',
             SesTransportFactory::class => 'mailer.transport_factory.amazon',
-            OhMySmtpTransportFactory::class => 'mailer.transport_factory.ohmysmtp',
         ];
 
         foreach ($classToServices as $class => $service) {
@@ -2682,8 +2682,8 @@ private function registerHtmlSanitizerConfiguration(array $config, ContainerBuil
                 $def->addMethodCall('allowSafeElements', [], true);
             }
 
-            if ($sanitizerConfig['allow_all_static_elements']) {
-                $def->addMethodCall('allowAllStaticElements', [], true);
+            if ($sanitizerConfig['allow_static_elements']) {
+                $def->addMethodCall('allowStaticElements', [], true);
             }
 
             // Configures elements

Resources/config/schema/symfony-1.0.xsd

@@ -845,7 +845,7 @@
         </xsd:sequence>
         <xsd:attribute name="name" type="xsd:string" use="required" />
         <xsd:attribute name="allow-safe-elements" type="xsd:boolean" />
-        <xsd:attribute name="allow-all-static-elements" type="xsd:boolean" />
+        <xsd:attribute name="allow-static-elements" type="xsd:boolean" />
         <xsd:attribute name="force-https-urls" type="xsd:boolean" />
         <xsd:attribute name="allow-relative-links" type="xsd:boolean" />
         <xsd:attribute name="allow-relative-medias" type="xsd:boolean" />

Tests/DependencyInjection/Fixtures/php/html_sanitizer.php

@@ -6,7 +6,7 @@
         'sanitizers' => [
             'default' => [
                 'allow_safe_elements' => true,
-                'allow_all_static_elements' => true,
+                'allow_static_elements' => true,
                 'allow_elements' => [
                     'iframe' => 'src',
                     'custom-tag' => ['data-attr', 'data-attr-1'],

Tests/DependencyInjection/Fixtures/xml/html_sanitizer.xml

@@ -9,7 +9,7 @@
         <html-sanitizer>
             <sanitizer name="default"
                 allow-safe-elements="true"
-                allow-all-static-elements="true"
+                allow-static-elements="true"
                 force-https-urls="true"
                 allow-relative-links="true"
                 allow-relative-medias="true"

Tests/DependencyInjection/Fixtures/yml/html_sanitizer.yml

@@ -4,7 +4,7 @@ framework:
         sanitizers:
             default:
                 allow_safe_elements: true
-                allow_all_static_elements: true
+                allow_static_elements: true
                 allow_elements:
                     iframe: 'src'
                     custom-tag: ['data-attr', 'data-attr-1']

Tests/DependencyInjection/FrameworkExtensionTest.php

@@ -2045,7 +2045,7 @@ public function testHtmlSanitizer()
         $this->assertSame(
             [
                 ['allowSafeElements', [], true],
-                ['allowAllStaticElements', [], true],
+                ['allowStaticElements', [], true],
                 ['allowElement', ['iframe', 'src'], true],
                 ['allowElement', ['custom-tag', ['data-attr', 'data-attr-1']], true],
                 ['allowElement', ['custom-tag-2', '*'], true],