[HtmlSanitizer][FrameworkBundle] Fix calling allowStaticElements when setting allow_all_static_elements: true

norkunas · norkunas · commit 98a4b8a5fd5d · 2022-06-01T15:59:10.000+03:00
diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php b/src/Symfony/Bundle/FrameworkBundle/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()
diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
@@ -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
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/config/schema/symfony-1.0.xsd b/src/Symfony/Bundle/FrameworkBundle/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" />
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/html_sanitizer.php b/src/Symfony/Bundle/FrameworkBundle/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'],
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/html_sanitizer.xml b/src/Symfony/Bundle/FrameworkBundle/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"
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/yml/html_sanitizer.yml b/src/Symfony/Bundle/FrameworkBundle/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']
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTest.php b/src/Symfony/Bundle/FrameworkBundle/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],

Original file line number	Diff line number	Diff line change
`@@ -2682,8 +2682,8 @@ private function registerHtmlSanitizerConfiguration(array $config, ContainerBuil`
`2682`	`2682`	`$def->addMethodCall('allowSafeElements', [], true);`
`2683`	`2683`	`}`
`2684`	`2684`
`2685`		`- if ($sanitizerConfig['allow_all_static_elements']) {`
`2686`		`- $def->addMethodCall('allowAllStaticElements', [], true);`
	`2685`	`+ if ($sanitizerConfig['allow_static_elements']) {`
	`2686`	`+ $def->addMethodCall('allowStaticElements', [], true);`
`2687`	`2687`	`}`
`2688`	`2688`
`2689`	`2689`	`// Configures elements`
Original file line number	Diff line number	Diff line change
`@@ -2045,7 +2045,7 @@ public function testHtmlSanitizer()`
`2045`	`2045`	`$this->assertSame(`
`2046`	`2046`	`[`
`2047`	`2047`	`['allowSafeElements', [], true],`
`2048`		`- ['allowAllStaticElements', [], true],`
	`2048`	`+ ['allowStaticElements', [], true],`
`2049`	`2049`	`['allowElement', ['iframe', 'src'], true],`
`2050`	`2050`	`['allowElement', ['custom-tag', ['data-attr', 'data-attr-1']], true],`
`2051`	`2051`	`['allowElement', ['custom-tag-2', '*'], true],`