Merge branch '6.4' into 7.3

* 6.4:
  [GitHub] Update .github/PULL_REQUEST_TEMPLATE.md to remove SF 7.2 as it's not supported anymore
  [WebProfilerBundle] Fix toolbar not rendering after replacing it
  [HtmlSanitizer] Fix force_attributes not replacing existing attribute in initial data

Author: nicolas-grekas

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,6 +1,6 @@
 | Q             | A
 | ------------- | ---
-| Branch?       | 7.4 for features / 6.4, 7.2, or 7.3 for bug fixes
+| Branch?       | 7.4 for features / 6.4, 7.3 for bug fixes
 | Bug fix?      | yes/no
 | New feature?  | yes/no <!-- if yes, also update src/**/CHANGELOG.md -->
 | Deprecations? | yes/no <!-- if yes, also update UPGRADE-*.md and src/**/CHANGELOG.md -->

src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/toolbar_js.html.twig

@@ -512,11 +512,16 @@
                         'sfwdt' + token,
                         '{{ url("_wdt", { "token": "xxxxxx" })|escape('js') }}'.replace(/xxxxxx/, newToken),
                         function(xhr, el) {
+                            var toolbarContent = document.getElementById('sfToolbarMainContent-' + newToken);
+
                             /* Do nothing in the edge case where the toolbar has already been replaced with a new one */
-                            if (!document.getElementById('sfToolbarMainContent-' + newToken)) {
+                            if (!toolbarContent) {
                                 return;
                             }
 
+                            /* Replace the ID, it has to match the new token */
+                            toolbarContent.parentElement.id = 'sfwdt' + newToken;
+
                             /* Evaluate in global scope scripts embedded inside the toolbar */
                             var i, scripts = [].slice.call(el.querySelectorAll('script'));
                             for (i = 0; i < scripts.length; ++i) {

src/Symfony/Component/HtmlSanitizer/Tests/HtmlSanitizerCustomTest.php

@@ -232,10 +232,17 @@ public function testForceAttribute()
     {
         $config = (new HtmlSanitizerConfig())
             ->allowElement('div')
+            ->allowElement('img', '*')
             ->allowElement('a', ['href'])
             ->forceAttribute('a', 'rel', 'noopener noreferrer')
+            ->forceAttribute('img', 'loading', 'lazy')
         ;
 
+        $this->assertSame(
+            '<img title="My image" src="https://example.com/image.png" loading="lazy" />',
+            $this->sanitize($config, '<img title="My image" src="https://example.com/image.png" loading="eager" onerror="alert(\'1234\')" />')
+        );
+
         $this->assertSame(
             '<a rel="noopener noreferrer">Hello</a> world',
             $this->sanitize($config, '<a>Hello</a> world')
@@ -250,6 +257,11 @@ public function testForceAttribute()
             '<div>Hello</div> world',
             $this->sanitize($config, '<div style="width: 100px">Hello</div> world')
         );
+
+        $this->assertSame(
+            '<a href="https://symfony.com" rel="noopener noreferrer">Hello</a> world',
+            $this->sanitize($config, '<a href="https://symfony.com" rel="noopener">Hello</a> world')
+        );
     }
 
     public function testForceHttps()

src/Symfony/Component/HtmlSanitizer/Visitor/DomVisitor.php

@@ -129,7 +129,7 @@ private function enterNode(string $domNodeName, \DOMNode $domNode, Cursor $curso
 
         // Force configured attributes
         foreach ($this->forcedAttributes[$domNodeName] ?? [] as $attribute => $value) {
-            $node->setAttribute($attribute, $value);
+            $node->setAttribute($attribute, $value, true);
         }
 
         $cursor->node->addChild($node);

src/Symfony/Component/HtmlSanitizer/Visitor/Node/Node.php

@@ -56,10 +56,10 @@ public function getAttribute(string $name): ?string
         return $this->attributes[$name] ?? null;
     }
 
-    public function setAttribute(string $name, ?string $value): void
+    public function setAttribute(string $name, ?string $value, bool $override = false): void
     {
         // Always use only the first declaration (ease sanitization)
-        if (!\array_key_exists($name, $this->attributes)) {
+        if ($override || !\array_key_exists($name, $this->attributes)) {
             $this->attributes[$name] = $value;
         }
     }