From e2851240a84eceeaf4b94c2b3500e2f180bb6290 Mon Sep 17 00:00:00 2001
From: Alex Pott <alex.a.pott@googlemail.com>
Date: Mon, 25 May 2015 11:41:47 +0100
Subject: [PATCH] Issue #2342745 by Cottser, chr.fritsch, epari.siva, lauriii,
wesruv, joelpittet, dawehner: Allow Twig link function to pass in HTML
attributes
---
core/lib/Drupal/Core/Template/TwigExtension.php | 10 +++++++++-
core/modules/system/src/Tests/Theme/EngineTwigTest.php | 4 ++++
.../twig_theme_test/src/TwigThemeTestController.php | 1 +
.../templates/twig_theme_test.link_generator.html.twig | 5 ++++-
.../modules/twig_theme_test/twig_theme_test.module | 2 +-
5 files changed, 19 insertions(+), 3 deletions(-)
diff --git a/core/lib/Drupal/Core/Template/TwigExtension.php b/core/lib/Drupal/Core/Template/TwigExtension.php
index 1e7a71fcd872..1902113ca2c3 100644
--- a/core/lib/Drupal/Core/Template/TwigExtension.php
+++ b/core/lib/Drupal/Core/Template/TwigExtension.php
@@ -222,14 +222,22 @@ public function getUrlFromPath($path, $options = array()) {
* The link text for the anchor tag as a translated string.
* @param \Drupal\Core\Url|string $url
* The URL object or string used for the link.
+ * @param array $attributes
+ * An optional array of link attributes.
*
* @return array
* A render array representing a link to the given URL.
*/
- public function getLink($text, $url) {
+ public function getLink($text, $url, array $attributes = []) {
if (!$url instanceof Url) {
$url = Url::fromUri($url);
}
+ if ($attributes) {
+ if ($existing_attributes = $url->getOption('attributes')) {
+ $attributes = array_merge($existing_attributes, $attributes);
+ }
+ $url->setOption('attributes', $attributes);
+ }
$build = [
'#type' => 'link',
'#title' => $text,
diff --git a/core/modules/system/src/Tests/Theme/EngineTwigTest.php b/core/modules/system/src/Tests/Theme/EngineTwigTest.php
index 6c9286d4677b..86b49e89d3ac 100644
--- a/core/modules/system/src/Tests/Theme/EngineTwigTest.php
+++ b/core/modules/system/src/Tests/Theme/EngineTwigTest.php
@@ -77,10 +77,14 @@ public function testTwigUrlGenerator() {
public function testTwigLinkGenerator() {
$this->drupalGet('twig-theme-test/link-generator');
+ /** @var \Drupal\Core\Utility\LinkGenerator $link_generator */
$link_generator = $this->container->get('link_generator');
$expected = [
'link via the linkgenerator: ' . $link_generator->generate('register', new Url('user.register', [], ['absolute' => TRUE])),
+ 'link via the linkgenerator: ' . $link_generator->generate('register', new Url('user.register', [], ['absolute' => TRUE, 'attributes' => ['foo' => 'bar']])),
+ 'link via the linkgenerator: ' . $link_generator->generate('register', new Url('user.register', [], ['attributes' => ['foo' => 'bar', 'id' => 'kitten']])),
+ 'link via the linkgenerator: ' . $link_generator->generate('register', new Url('user.register', [], ['attributes' => ['id' => 'kitten']])),
];
// Verify that link() has the ability to bubble cacheability metadata:
diff --git a/core/modules/system/tests/modules/twig_theme_test/src/TwigThemeTestController.php b/core/modules/system/tests/modules/twig_theme_test/src/TwigThemeTestController.php
index fe25d626e761..040b5216e790 100644
--- a/core/modules/system/tests/modules/twig_theme_test/src/TwigThemeTestController.php
+++ b/core/modules/system/tests/modules/twig_theme_test/src/TwigThemeTestController.php
@@ -46,6 +46,7 @@ public function linkGeneratorRender() {
return array(
'#theme' => 'twig_theme_test_link_generator',
'#test_url' => new Url('user.register', [], ['absolute' => TRUE]),
+ '#test_url_attribute' => new Url('user.register', [], ['attributes' => ['foo' => 'bar']]),
);
}
diff --git a/core/modules/system/tests/modules/twig_theme_test/templates/twig_theme_test.link_generator.html.twig b/core/modules/system/tests/modules/twig_theme_test/templates/twig_theme_test.link_generator.html.twig
index a365859e6693..3fb846fa36ae 100644
--- a/core/modules/system/tests/modules/twig_theme_test/templates/twig_theme_test.link_generator.html.twig
+++ b/core/modules/system/tests/modules/twig_theme_test/templates/twig_theme_test.link_generator.html.twig
@@ -1 +1,4 @@
-<div>link via the linkgenerator: {{ link("register", test_url) }}</div>
+<div>link via the linkgenerator: {{ link('register', test_url) }}</div>
+<div>link via the linkgenerator: {{ link('register', test_url, {'foo': 'bar'}) }}</div>
+<div>link via the linkgenerator: {{ link('register', test_url_attribute, {'id': 'kitten'}) }}</div>
+<div>link via the linkgenerator: {{ link('register', 'route:user.register', {'id': 'kitten'}) }}</div>
diff --git a/core/modules/system/tests/modules/twig_theme_test/twig_theme_test.module b/core/modules/system/tests/modules/twig_theme_test/twig_theme_test.module
index 021d039c505e..9aaccfa9fc7c 100644
--- a/core/modules/system/tests/modules/twig_theme_test/twig_theme_test.module
+++ b/core/modules/system/tests/modules/twig_theme_test/twig_theme_test.module
@@ -39,7 +39,7 @@ function twig_theme_test_theme($existing, $type, $theme, $path) {
'template' => 'twig_theme_test.url_generator',
);
$items['twig_theme_test_link_generator'] = array(
- 'variables' => array('test_url' => NULL),
+ 'variables' => array('test_url' => NULL, 'test_url_attribute' => NULL),
'template' => 'twig_theme_test.link_generator',
);
$items['twig_theme_test_url_to_string'] = array(
--
GitLab