From 1b0a44154aa84e534bb85c205ffedeef0338ac6b Mon Sep 17 00:00:00 2001
From: catch <catch@35733.no-reply.drupal.org>
Date: Fri, 9 Apr 2021 13:48:02 +0100
Subject: [PATCH] =?UTF-8?q?Issue=20#3186821=20by=20mohit=5Faghera,=20Dom.,?=
 =?UTF-8?q?=20ankithashetty,=20Kristen=20Pol:=20Attribute=20=E2=80=9Chrefl?=
 =?UTF-8?q?ang=E2=80=9D=20not=20allowed=20on=20element=20=E2=80=9Cspan?=
 =?UTF-8?q?=E2=80=9D=20and=20=E2=80=9Cbutton=E2=80=9D=20at=20this=20point?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../lib/Drupal/Core/Utility/LinkGenerator.php |  4 ++--
 .../Tests/Core/Utility/LinkGeneratorTest.php  | 20 +++++++++++++++++--
 2 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/core/lib/Drupal/Core/Utility/LinkGenerator.php b/core/lib/Drupal/Core/Utility/LinkGenerator.php
index 665e1d3192d..50bc3089a2f 100644
--- a/core/lib/Drupal/Core/Utility/LinkGenerator.php
+++ b/core/lib/Drupal/Core/Utility/LinkGenerator.php
@@ -170,13 +170,13 @@ class LinkGenerator implements LinkGeneratorInterface {
     }
     if ($url->isRouted() && $url->getRouteName() === '<nolink>') {
       $generated_link = new GeneratedNoLink();
-      unset($attributes['href']);
+      unset($attributes['href'], $attributes['hreflang']);
       return $this->doGenerate($generated_link, $attributes, $variables);
     }
     if ($url->isRouted() && $url->getRouteName() === '<button>') {
       $generated_link = new GeneratedButton();
       $attributes['type'] = 'button';
-      unset($attributes['href']);
+      unset($attributes['href'], $attributes['hreflang']);
       return $this->doGenerate($generated_link, $attributes, $variables);
     }
     $generated_url = $url->toString(TRUE);
diff --git a/core/tests/Drupal/Tests/Core/Utility/LinkGeneratorTest.php b/core/tests/Drupal/Tests/Core/Utility/LinkGeneratorTest.php
index 716003bf691..2cc2ce67786 100644
--- a/core/tests/Drupal/Tests/Core/Utility/LinkGeneratorTest.php
+++ b/core/tests/Drupal/Tests/Core/Utility/LinkGeneratorTest.php
@@ -161,7 +161,7 @@ class LinkGeneratorTest extends UnitTestCase {
   public function testGenerateNoLink() {
     $this->urlGenerator->expects($this->never())
       ->method('generateFromRoute');
-    $this->moduleHandler->expects($this->once())
+    $this->moduleHandler->expects($this->exactly(2))
       ->method('alter')
       ->with('link', $this->isType('array'));
 
@@ -172,6 +172,14 @@ class LinkGeneratorTest extends UnitTestCase {
     $result = $this->linkGenerator->generate('Test', $url);
     $this->assertInstanceOf(GeneratedNoLink::class, $result);
     $this->assertSame('<span>Test</span>', (string) $result);
+
+    // Validate removal of hreflang attributes.
+    $url = Url::fromRoute('<nolink>', [], [
+      'language' => new Language(['id' => 'de']),
+    ]);
+    $url->setUrlGenerator($this->urlGenerator);
+    $result = $this->linkGenerator->generate('Test With Language', $url);
+    $this->assertSame('<span>Test With Language</span>', (string) $result);
   }
 
   /**
@@ -208,7 +216,7 @@ class LinkGeneratorTest extends UnitTestCase {
   public function testGenerateButton() {
     $this->urlGenerator->expects($this->never())
       ->method('generateFromRoute');
-    $this->moduleHandler->expects($this->once())
+    $this->moduleHandler->expects($this->exactly(2))
       ->method('alter')
       ->with('link', $this->isType('array'));
 
@@ -218,6 +226,14 @@ class LinkGeneratorTest extends UnitTestCase {
     $result = $this->linkGenerator->generate('Test', $url);
     $this->assertInstanceOf(GeneratedButton::class, $result);
     $this->assertSame('<button type="button">Test</button>', (string) $result);
+
+    // Validate removal of hreflang attributes.
+    $url = new Url('<button>', [], [
+      'language' => new Language(['id' => 'de']),
+    ]);
+    $url->setUrlGenerator($this->urlGenerator);
+    $result = $this->linkGenerator->generate('Test With Language', $url);
+    $this->assertSame('<button type="button">Test With Language</button>', (string) $result);
   }
 
   /**