From 07a0ce6656e6de53a529018fe7a1421be838d2ad Mon Sep 17 00:00:00 2001
From: Albert Prat <albert.prat@interactiu.cat>
Date: Tue, 14 Jun 2022 14:07:47 +0200
Subject: [PATCH 1/2] [FrameworkBundle] Lower JsonSerializableNormalizer
 priority

---
 Resources/config/serializer.xml                      | 2 +-
 Tests/DependencyInjection/FrameworkExtensionTest.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Resources/config/serializer.xml b/Resources/config/serializer.xml
index c3eea28b8..19defd885 100644
--- a/Resources/config/serializer.xml
+++ b/Resources/config/serializer.xml
@@ -60,7 +60,7 @@
 
         <service id="serializer.normalizer.json_serializable" class="Symfony\Component\Serializer\Normalizer\JsonSerializableNormalizer">
             <!-- Run before serializer.normalizer.object -->
-            <tag name="serializer.normalizer" priority="-900" />
+            <tag name="serializer.normalizer" priority="-950" />
         </service>
 
         <service id="serializer.normalizer.problem" class="Symfony\Component\Serializer\Normalizer\ProblemNormalizer">
diff --git a/Tests/DependencyInjection/FrameworkExtensionTest.php b/Tests/DependencyInjection/FrameworkExtensionTest.php
index c2c7bc6b8..e86e22a20 100644
--- a/Tests/DependencyInjection/FrameworkExtensionTest.php
+++ b/Tests/DependencyInjection/FrameworkExtensionTest.php
@@ -1297,7 +1297,7 @@ public function testJsonSerializableNormalizerRegistered()
         $tag = $definition->getTag('serializer.normalizer');
 
         $this->assertEquals(JsonSerializableNormalizer::class, $definition->getClass());
-        $this->assertEquals(-900, $tag[0]['priority']);
+        $this->assertEquals(-950, $tag[0]['priority']);
     }
 
     public function testObjectNormalizerRegistered()

From 2a5c75abda7887b030fdcc7ce441d9b4a5bf1744 Mon Sep 17 00:00:00 2001
From: plfort <fort.pierrelouis@gmail.com>
Date: Thu, 23 Jun 2022 22:03:41 +0200
Subject: [PATCH 2/2] [HtmlSanitizer] Fix default configuration

---
 Resources/config/html_sanitizer.php           |  2 +-
 .../Fixtures/php/html_sanitizer.php           |  2 +-
 .../php/html_sanitizer_default_config.php     |  5 +++
 .../Fixtures/xml/html_sanitizer.xml           |  2 +-
 .../xml/html_sanitizer_default_config.xml     | 11 ++++++
 .../Fixtures/yml/html_sanitizer.yml           |  2 +-
 .../yml/html_sanitizer_default_config.yml     |  3 ++
 .../FrameworkExtensionTest.php                | 38 +++++++++++++++----
 8 files changed, 53 insertions(+), 12 deletions(-)
 create mode 100644 Tests/DependencyInjection/Fixtures/php/html_sanitizer_default_config.php
 create mode 100644 Tests/DependencyInjection/Fixtures/xml/html_sanitizer_default_config.xml
 create mode 100644 Tests/DependencyInjection/Fixtures/yml/html_sanitizer_default_config.yml

diff --git a/Resources/config/html_sanitizer.php b/Resources/config/html_sanitizer.php
index 9afb63261..175dc2e23 100644
--- a/Resources/config/html_sanitizer.php
+++ b/Resources/config/html_sanitizer.php
@@ -18,7 +18,7 @@
 return static function (ContainerConfigurator $container) {
     $container->services()
         ->set('html_sanitizer.config.default', HtmlSanitizerConfig::class)
-            ->call('allowSafeElements')
+            ->call('allowSafeElements', [], true)
 
         ->set('html_sanitizer.sanitizer.default', HtmlSanitizer::class)
             ->args([service('html_sanitizer.config.default')])
diff --git a/Tests/DependencyInjection/Fixtures/php/html_sanitizer.php b/Tests/DependencyInjection/Fixtures/php/html_sanitizer.php
index 2c8e2eb16..2d117e838 100644
--- a/Tests/DependencyInjection/Fixtures/php/html_sanitizer.php
+++ b/Tests/DependencyInjection/Fixtures/php/html_sanitizer.php
@@ -4,7 +4,7 @@
     'http_method_override' => false,
     'html_sanitizer' => [
         'sanitizers' => [
-            'default' => [
+            'custom' => [
                 'allow_safe_elements' => true,
                 'allow_static_elements' => true,
                 'allow_elements' => [
diff --git a/Tests/DependencyInjection/Fixtures/php/html_sanitizer_default_config.php b/Tests/DependencyInjection/Fixtures/php/html_sanitizer_default_config.php
new file mode 100644
index 000000000..ae973a2db
--- /dev/null
+++ b/Tests/DependencyInjection/Fixtures/php/html_sanitizer_default_config.php
@@ -0,0 +1,5 @@
+<?php
+
+$container->loadFromExtension('framework', [
+    'http_method_override' => false,
+    'html_sanitizer' => null]);
diff --git a/Tests/DependencyInjection/Fixtures/xml/html_sanitizer.xml b/Tests/DependencyInjection/Fixtures/xml/html_sanitizer.xml
index a974ec6ca..771652c8d 100644
--- a/Tests/DependencyInjection/Fixtures/xml/html_sanitizer.xml
+++ b/Tests/DependencyInjection/Fixtures/xml/html_sanitizer.xml
@@ -7,7 +7,7 @@
 
     <config xmlns="http://symfony.com/schema/dic/symfony" http-method-override="false">
         <html-sanitizer>
-            <sanitizer name="default"
+            <sanitizer name="custom"
                 allow-safe-elements="true"
                 allow-static-elements="true"
                 force-https-urls="true"
diff --git a/Tests/DependencyInjection/Fixtures/xml/html_sanitizer_default_config.xml b/Tests/DependencyInjection/Fixtures/xml/html_sanitizer_default_config.xml
new file mode 100644
index 000000000..fcc232a73
--- /dev/null
+++ b/Tests/DependencyInjection/Fixtures/xml/html_sanitizer_default_config.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" ?>
+
+<container xmlns="http://symfony.com/schema/dic/services"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://symfony.com/schema/dic/services https://symfony.com/schema/dic/services/services-1.0.xsd
+                        http://symfony.com/schema/dic/symfony https://symfony.com/schema/dic/symfony/symfony-1.0.xsd">
+
+    <config xmlns="http://symfony.com/schema/dic/symfony" http-method-override="false">
+        <html-sanitizer />
+    </config>
+</container>
diff --git a/Tests/DependencyInjection/Fixtures/yml/html_sanitizer.yml b/Tests/DependencyInjection/Fixtures/yml/html_sanitizer.yml
index 414fcfffc..007f4875b 100644
--- a/Tests/DependencyInjection/Fixtures/yml/html_sanitizer.yml
+++ b/Tests/DependencyInjection/Fixtures/yml/html_sanitizer.yml
@@ -2,7 +2,7 @@ framework:
     http_method_override: false
     html_sanitizer:
         sanitizers:
-            default:
+            custom:
                 allow_safe_elements: true
                 allow_static_elements: true
                 allow_elements:
diff --git a/Tests/DependencyInjection/Fixtures/yml/html_sanitizer_default_config.yml b/Tests/DependencyInjection/Fixtures/yml/html_sanitizer_default_config.yml
new file mode 100644
index 000000000..94fff31d6
--- /dev/null
+++ b/Tests/DependencyInjection/Fixtures/yml/html_sanitizer_default_config.yml
@@ -0,0 +1,3 @@
+framework:
+    http_method_override: false
+    html_sanitizer: ~
diff --git a/Tests/DependencyInjection/FrameworkExtensionTest.php b/Tests/DependencyInjection/FrameworkExtensionTest.php
index 1ee7b3622..3347a1687 100644
--- a/Tests/DependencyInjection/FrameworkExtensionTest.php
+++ b/Tests/DependencyInjection/FrameworkExtensionTest.php
@@ -2050,16 +2050,14 @@ public function testHtmlSanitizer()
         $container = $this->createContainerFromFile('html_sanitizer');
 
         // html_sanitizer service
-        $this->assertTrue($container->hasAlias('html_sanitizer'), '->registerHtmlSanitizerConfiguration() loads html_sanitizer.php');
-        $this->assertSame('html_sanitizer.sanitizer.default', (string) $container->getAlias('html_sanitizer'));
-        $this->assertSame(HtmlSanitizer::class, $container->getDefinition('html_sanitizer.sanitizer.default')->getClass());
-        $this->assertCount(1, $args = $container->getDefinition('html_sanitizer.sanitizer.default')->getArguments());
-        $this->assertSame('html_sanitizer.config.default', (string) $args[0]);
+        $this->assertSame(HtmlSanitizer::class, $container->getDefinition('html_sanitizer.sanitizer.custom')->getClass());
+        $this->assertCount(1, $args = $container->getDefinition('html_sanitizer.sanitizer.custom')->getArguments());
+        $this->assertSame('html_sanitizer.config.custom', (string) $args[0]);
 
         // config
-        $this->assertTrue($container->hasDefinition('html_sanitizer.config.default'), '->registerHtmlSanitizerConfiguration() loads custom sanitizer');
-        $this->assertSame(HtmlSanitizerConfig::class, $container->getDefinition('html_sanitizer.config.default')->getClass());
-        $this->assertCount(23, $calls = $container->getDefinition('html_sanitizer.config.default')->getMethodCalls());
+        $this->assertTrue($container->hasDefinition('html_sanitizer.config.custom'), '->registerHtmlSanitizerConfiguration() loads custom sanitizer');
+        $this->assertSame(HtmlSanitizerConfig::class, $container->getDefinition('html_sanitizer.config.custom')->getClass());
+        $this->assertCount(23, $calls = $container->getDefinition('html_sanitizer.config.custom')->getMethodCalls());
         $this->assertSame(
             [
                 ['allowSafeElements', [], true],
@@ -2103,6 +2101,30 @@ static function ($call) {
         // Named alias
         $this->assertSame('html_sanitizer.sanitizer.all.sanitizer', (string) $container->getAlias(HtmlSanitizerInterface::class.' $allSanitizer'));
         $this->assertFalse($container->hasAlias(HtmlSanitizerInterface::class.' $default'));
+    }
+
+    public function testHtmlSanitizerDefaultConfig()
+    {
+        $container = $this->createContainerFromFile('html_sanitizer_default_config');
+
+        // html_sanitizer service
+        $this->assertTrue($container->hasAlias('html_sanitizer'), '->registerHtmlSanitizerConfiguration() loads default_config');
+        $this->assertSame('html_sanitizer.sanitizer.default', (string) $container->getAlias('html_sanitizer'));
+        $this->assertSame(HtmlSanitizer::class, $container->getDefinition('html_sanitizer.sanitizer.default')->getClass());
+        $this->assertCount(1, $args = $container->getDefinition('html_sanitizer.sanitizer.default')->getArguments());
+        $this->assertSame('html_sanitizer.config.default', (string) $args[0]);
+
+        // config
+        $this->assertTrue($container->hasDefinition('html_sanitizer.config.default'), '->registerHtmlSanitizerConfiguration() loads custom sanitizer');
+        $this->assertSame(HtmlSanitizerConfig::class, $container->getDefinition('html_sanitizer.config.default')->getClass());
+        $this->assertCount(1, $calls = $container->getDefinition('html_sanitizer.config.default')->getMethodCalls());
+        $this->assertSame(
+            ['allowSafeElements', [], true],
+            $calls[0]
+        );
+
+        // Named alias
+        $this->assertFalse($container->hasAlias(HtmlSanitizerInterface::class.' $default'));
 
         // Default alias
         $this->assertSame('html_sanitizer', (string) $container->getAlias(HtmlSanitizerInterface::class));

<!DOCTYPE html PUBLIC '-//W3C//DTD XHTML 1.0 Transitional//EN' 'http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd'>
<html xmlns='http://www.w3.org/1999/xhtml'>
<head>
<title>pFad - Phonifier reborn</title>
<meta http-equiv='Content-Type' content='text/html; charset=utf-8' />
</head>
<body>
<h1>Pfad - The Proxy pFad of &#169; 2024 Garber Painting. All rights reserved.</h1>


<!-- Disclaimer -->
<p>Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.</p>
<br>
<p>Alternative Proxies:</p><p><a href="http://rainy.clevelandohioweatherforecast.com/php-proxy/index.php?q=https://github.com/symfony/framework-bundle/compare/v6.1.1...v6.1.2.patch" target="_blank">Alternative Proxy</a></p><p><a href="http://rainy.clevelandohioweatherforecast.com/pFad/index.php?u=https://github.com/symfony/framework-bundle/compare/v6.1.1...v6.1.2.patch" target="_blank">pFad Proxy</a></p><p><a href="http://rainy.clevelandohioweatherforecast.com/pFad/v3index.php?u=https://github.com/symfony/framework-bundle/compare/v6.1.1...v6.1.2.patch" target="_blank">pFad v3 Proxy</a></p><p><a href="http://rainy.clevelandohioweatherforecast.com/pFad/v4index.php?u=https://github.com/symfony/framework-bundle/compare/v6.1.1...v6.1.2.patch" target="_blank">pFad v4 Proxy</a></p></body>
</html>