From f5eda6481a2c38364ec35826e6ee92831590670a Mon Sep 17 00:00:00 2001
From: catch <catch@35733.no-reply.drupal.org>
Date: Mon, 1 Aug 2022 09:16:32 +0900
Subject: [PATCH] Issue #3298717 by Libbna, alison, longwave: Twig macro
 documentation link goes to Twig 1.x docs

---
 core/modules/book/templates/book-tree.html.twig               | 2 +-
 core/modules/system/templates/menu.html.twig                  | 2 +-
 core/modules/toolbar/templates/menu--toolbar.html.twig        | 2 +-
 .../umami/templates/classy/navigation/book-tree.html.twig     | 2 +-
 .../templates/components/navigation/menu--main.html.twig      | 2 +-
 .../umami/templates/components/navigation/menu.html.twig      | 2 +-
 .../Drupal/KernelTests/Core/Theme/ConfirmClassyCopiesTest.php | 4 ++--
 .../bartik/templates/classy/navigation/book-tree.html.twig    | 2 +-
 core/themes/bartik/templates/classy/navigation/menu.html.twig | 2 +-
 .../claro/templates/classy/navigation/book-tree.html.twig     | 2 +-
 core/themes/claro/templates/classy/navigation/menu.html.twig  | 2 +-
 .../themes/claro/templates/navigation/menu--toolbar.html.twig | 2 +-
 core/themes/classy/templates/navigation/book-tree.html.twig   | 2 +-
 core/themes/classy/templates/navigation/menu.html.twig        | 2 +-
 core/themes/olivero/templates/navigation/book-tree.html.twig  | 2 +-
 .../olivero/templates/navigation/menu--primary-menu.html.twig | 2 +-
 .../templates/navigation/menu--secondary-menu.html.twig       | 2 +-
 core/themes/olivero/templates/navigation/menu.html.twig       | 2 +-
 .../seven/templates/classy/navigation/book-tree.html.twig     | 2 +-
 core/themes/seven/templates/classy/navigation/menu.html.twig  | 2 +-
 core/themes/stable/templates/navigation/book-tree.html.twig   | 2 +-
 .../stable/templates/navigation/menu--toolbar.html.twig       | 2 +-
 core/themes/stable/templates/navigation/menu.html.twig        | 2 +-
 core/themes/stable9/templates/navigation/book-tree.html.twig  | 2 +-
 .../stable9/templates/navigation/menu--toolbar.html.twig      | 2 +-
 core/themes/stable9/templates/navigation/menu.html.twig       | 2 +-
 .../starterkit_theme/templates/navigation/book-tree.html.twig | 2 +-
 .../starterkit_theme/templates/navigation/menu.html.twig      | 2 +-
 28 files changed, 29 insertions(+), 29 deletions(-)

diff --git a/core/modules/book/templates/book-tree.html.twig b/core/modules/book/templates/book-tree.html.twig
index 7a818389ef88..3d3069cb4543 100644
--- a/core/modules/book/templates/book-tree.html.twig
+++ b/core/modules/book/templates/book-tree.html.twig
@@ -24,7 +24,7 @@
 
 {#
   We call a macro which calls itself to render the full tree.
-  @see https://twig.symfony.com/doc/1.x/tags/macro.html
+  @see https://twig.symfony.com/doc/3.x/tags/macro.html
 #}
 {{ book_tree.book_links(items, attributes, 0) }}
 
diff --git a/core/modules/system/templates/menu.html.twig b/core/modules/system/templates/menu.html.twig
index e7bb57b7e1e4..b8a9aab2b56c 100644
--- a/core/modules/system/templates/menu.html.twig
+++ b/core/modules/system/templates/menu.html.twig
@@ -24,7 +24,7 @@
 
 {#
   We call a macro which calls itself to render the full tree.
-  @see https://twig.symfony.com/doc/1.x/tags/macro.html
+  https://twig.symfony.com/doc/3.x/tags/macro.html
 #}
 {{ menus.menu_links(items, attributes, 0) }}
 
diff --git a/core/modules/toolbar/templates/menu--toolbar.html.twig b/core/modules/toolbar/templates/menu--toolbar.html.twig
index a78829986b6c..7ba45dba011f 100644
--- a/core/modules/toolbar/templates/menu--toolbar.html.twig
+++ b/core/modules/toolbar/templates/menu--toolbar.html.twig
@@ -24,7 +24,7 @@
 
 {#
   We call a macro which calls itself to render the full tree.
-  @see https://twig.symfony.com/doc/1.x/tags/macro.html
+  @see https://twig.symfony.com/doc/3.x/tags/macro.html
 #}
 {{ menus.menu_links(items, attributes, 0) }}
 
diff --git a/core/profiles/demo_umami/themes/umami/templates/classy/navigation/book-tree.html.twig b/core/profiles/demo_umami/themes/umami/templates/classy/navigation/book-tree.html.twig
index 94fac5598b57..fba921921e8c 100644
--- a/core/profiles/demo_umami/themes/umami/templates/classy/navigation/book-tree.html.twig
+++ b/core/profiles/demo_umami/themes/umami/templates/classy/navigation/book-tree.html.twig
@@ -22,7 +22,7 @@
 
 {#
   We call a macro which calls itself to render the full tree.
-  @see https://twig.symfony.com/doc/1.x/tags/macro.html
+  @see https://twig.symfony.com/doc/3.x/tags/macro.html
 #}
 {{ book_tree.book_links(items, attributes, 0) }}
 
diff --git a/core/profiles/demo_umami/themes/umami/templates/components/navigation/menu--main.html.twig b/core/profiles/demo_umami/themes/umami/templates/components/navigation/menu--main.html.twig
index 6884d81b8c8c..ced0de2176a8 100644
--- a/core/profiles/demo_umami/themes/umami/templates/components/navigation/menu--main.html.twig
+++ b/core/profiles/demo_umami/themes/umami/templates/components/navigation/menu--main.html.twig
@@ -23,7 +23,7 @@
 
 {#
   We call a macro which calls itself to render the full tree.
-  @see https://twig.symfony.com/doc/1.x/tags/macro.html
+  @see https://twig.symfony.com/doc/3.x/tags/macro.html
 
   1. We use menu_name (see above) to create a CSS class name from it.
   See https://www.drupal.org/node/2649076
diff --git a/core/profiles/demo_umami/themes/umami/templates/components/navigation/menu.html.twig b/core/profiles/demo_umami/themes/umami/templates/components/navigation/menu.html.twig
index 0a3742115dd4..4a599ccc437d 100644
--- a/core/profiles/demo_umami/themes/umami/templates/components/navigation/menu.html.twig
+++ b/core/profiles/demo_umami/themes/umami/templates/components/navigation/menu.html.twig
@@ -23,7 +23,7 @@
 
 {#
   We call a macro which calls itself to render the full tree.
-  @see https://twig.symfony.com/doc/1.x/tags/macro.html
+  @see https://twig.symfony.com/doc/3.x/tags/macro.html
 
   1. We use menu_name (see above) to create a CSS class name from it.
   See https://www.drupal.org/node/2649076
diff --git a/core/tests/Drupal/KernelTests/Core/Theme/ConfirmClassyCopiesTest.php b/core/tests/Drupal/KernelTests/Core/Theme/ConfirmClassyCopiesTest.php
index 5a5c69f4abb7..b58ec3dcb742 100644
--- a/core/tests/Drupal/KernelTests/Core/Theme/ConfirmClassyCopiesTest.php
+++ b/core/tests/Drupal/KernelTests/Core/Theme/ConfirmClassyCopiesTest.php
@@ -772,9 +772,9 @@ protected function getClassyHash($type, $file) {
         'book-export-html.html.twig' => 'd09aadf9e8e05d50145872f86544d0d0',
         'html.html.twig' => '7bc0366efb52d727aa6fb48d4d3d75fb',
         'region.html.twig' => 'b1c621b93e5ab7334151fe31d4c163a8',
-        'menu.html.twig' => 'a85f0d836f62a4a2834934b15b5cc4f3',
+        'menu.html.twig' => '5beee3e850948159f720b76b783dded6',
         'book-all-books-block.html.twig' => '7210413d32aafa0c5413f1c29b9a87cc',
-        'book-tree.html.twig' => '027a2d9aa9d8e13afeb87b2f830f4339',
+        'book-tree.html.twig' => '31372cf50f2c6e0a54a98da7d7219025',
         'links.html.twig' => '158ded06d80f3071b051a3263d9bdeac',
         'vertical-tabs.html.twig' => 'cccdb9b454f5befdfedfc629a6a51e4d',
         'pager.html.twig' => '3ad3ad68fa70d7f6b69676d1e28b0338',
diff --git a/core/themes/bartik/templates/classy/navigation/book-tree.html.twig b/core/themes/bartik/templates/classy/navigation/book-tree.html.twig
index 94fac5598b57..fba921921e8c 100644
--- a/core/themes/bartik/templates/classy/navigation/book-tree.html.twig
+++ b/core/themes/bartik/templates/classy/navigation/book-tree.html.twig
@@ -22,7 +22,7 @@
 
 {#
   We call a macro which calls itself to render the full tree.
-  @see https://twig.symfony.com/doc/1.x/tags/macro.html
+  @see https://twig.symfony.com/doc/3.x/tags/macro.html
 #}
 {{ book_tree.book_links(items, attributes, 0) }}
 
diff --git a/core/themes/bartik/templates/classy/navigation/menu.html.twig b/core/themes/bartik/templates/classy/navigation/menu.html.twig
index b437f8760e97..ef04cedd1756 100644
--- a/core/themes/bartik/templates/classy/navigation/menu.html.twig
+++ b/core/themes/bartik/templates/classy/navigation/menu.html.twig
@@ -22,7 +22,7 @@
 
 {#
   We call a macro which calls itself to render the full tree.
-  @see https://twig.symfony.com/doc/1.x/tags/macro.html
+  @see https://twig.symfony.com/doc/3.x/tags/macro.html
 #}
 {{ menus.menu_links(items, attributes, 0) }}
 
diff --git a/core/themes/claro/templates/classy/navigation/book-tree.html.twig b/core/themes/claro/templates/classy/navigation/book-tree.html.twig
index 94fac5598b57..fba921921e8c 100644
--- a/core/themes/claro/templates/classy/navigation/book-tree.html.twig
+++ b/core/themes/claro/templates/classy/navigation/book-tree.html.twig
@@ -22,7 +22,7 @@
 
 {#
   We call a macro which calls itself to render the full tree.
-  @see https://twig.symfony.com/doc/1.x/tags/macro.html
+  @see https://twig.symfony.com/doc/3.x/tags/macro.html
 #}
 {{ book_tree.book_links(items, attributes, 0) }}
 
diff --git a/core/themes/claro/templates/classy/navigation/menu.html.twig b/core/themes/claro/templates/classy/navigation/menu.html.twig
index b437f8760e97..ef04cedd1756 100644
--- a/core/themes/claro/templates/classy/navigation/menu.html.twig
+++ b/core/themes/claro/templates/classy/navigation/menu.html.twig
@@ -22,7 +22,7 @@
 
 {#
   We call a macro which calls itself to render the full tree.
-  @see https://twig.symfony.com/doc/1.x/tags/macro.html
+  @see https://twig.symfony.com/doc/3.x/tags/macro.html
 #}
 {{ menus.menu_links(items, attributes, 0) }}
 
diff --git a/core/themes/claro/templates/navigation/menu--toolbar.html.twig b/core/themes/claro/templates/navigation/menu--toolbar.html.twig
index fd9350d37659..ead73a479a50 100644
--- a/core/themes/claro/templates/navigation/menu--toolbar.html.twig
+++ b/core/themes/claro/templates/navigation/menu--toolbar.html.twig
@@ -25,7 +25,7 @@
 
 {#
   We call a macro which calls itself to render the full tree.
-  @see https://twig.symfony.com/doc/1.x/tags/macro.html
+  @see https://twig.symfony.com/doc/3.x/tags/macro.html
 #}
 {{ menus.menu_links(items, attributes, 0) }}
 
diff --git a/core/themes/classy/templates/navigation/book-tree.html.twig b/core/themes/classy/templates/navigation/book-tree.html.twig
index 94fac5598b57..fba921921e8c 100644
--- a/core/themes/classy/templates/navigation/book-tree.html.twig
+++ b/core/themes/classy/templates/navigation/book-tree.html.twig
@@ -22,7 +22,7 @@
 
 {#
   We call a macro which calls itself to render the full tree.
-  @see https://twig.symfony.com/doc/1.x/tags/macro.html
+  @see https://twig.symfony.com/doc/3.x/tags/macro.html
 #}
 {{ book_tree.book_links(items, attributes, 0) }}
 
diff --git a/core/themes/classy/templates/navigation/menu.html.twig b/core/themes/classy/templates/navigation/menu.html.twig
index b437f8760e97..ef04cedd1756 100644
--- a/core/themes/classy/templates/navigation/menu.html.twig
+++ b/core/themes/classy/templates/navigation/menu.html.twig
@@ -22,7 +22,7 @@
 
 {#
   We call a macro which calls itself to render the full tree.
-  @see https://twig.symfony.com/doc/1.x/tags/macro.html
+  @see https://twig.symfony.com/doc/3.x/tags/macro.html
 #}
 {{ menus.menu_links(items, attributes, 0) }}
 
diff --git a/core/themes/olivero/templates/navigation/book-tree.html.twig b/core/themes/olivero/templates/navigation/book-tree.html.twig
index ff02e64cfbab..bc16f5acce25 100644
--- a/core/themes/olivero/templates/navigation/book-tree.html.twig
+++ b/core/themes/olivero/templates/navigation/book-tree.html.twig
@@ -22,7 +22,7 @@
 
 {#
   We call a macro which calls itself to render the full tree.
-  @see https://twig.symfony.com/doc/1.x/tags/macro.html
+  @see https://twig.symfony.com/doc/3.x/tags/macro.html
 #}
 {{ book_tree.book_links(items, attributes, 0) }}
 
diff --git a/core/themes/olivero/templates/navigation/menu--primary-menu.html.twig b/core/themes/olivero/templates/navigation/menu--primary-menu.html.twig
index 20dcd1915fe1..0338c1a1acdc 100644
--- a/core/themes/olivero/templates/navigation/menu--primary-menu.html.twig
+++ b/core/themes/olivero/templates/navigation/menu--primary-menu.html.twig
@@ -26,7 +26,7 @@
 
 {#
   We call a macro which calls itself to render the full tree.
-  @see https://twig.symfony.com/doc/1.x/tags/macro.html
+  @see https://twig.symfony.com/doc/3.x/tags/macro.html
 #}
 {% set attributes = attributes.addClass('menu') %}
 {{ menus.menu_links(items, attributes, 0, 'primary-menu-item-') }}
diff --git a/core/themes/olivero/templates/navigation/menu--secondary-menu.html.twig b/core/themes/olivero/templates/navigation/menu--secondary-menu.html.twig
index 27520da59eaf..68d1b25b7d14 100644
--- a/core/themes/olivero/templates/navigation/menu--secondary-menu.html.twig
+++ b/core/themes/olivero/templates/navigation/menu--secondary-menu.html.twig
@@ -26,7 +26,7 @@
 
 {#
   We call a macro which calls itself to render the full tree.
-  @see https://twig.symfony.com/doc/1.x/tags/macro.html
+  @see https://twig.symfony.com/doc/3.x/tags/macro.html
 #}
 {% set attributes = attributes.addClass('menu') %}
 {{ menus.menu_links(items, attributes, 0) }}
diff --git a/core/themes/olivero/templates/navigation/menu.html.twig b/core/themes/olivero/templates/navigation/menu.html.twig
index f825ae574b51..1f7eda20267b 100644
--- a/core/themes/olivero/templates/navigation/menu.html.twig
+++ b/core/themes/olivero/templates/navigation/menu.html.twig
@@ -24,7 +24,7 @@
 
 {#
   We call a macro which calls itself to render the full tree.
-  @see https://twig.symfony.com/doc/1.x/tags/macro.html
+  @see https://twig.symfony.com/doc/3.x/tags/macro.html
 #}
 {% set attributes = attributes.addClass('menu') %}
 {{ menus.menu_links(items, attributes, 0) }}
diff --git a/core/themes/seven/templates/classy/navigation/book-tree.html.twig b/core/themes/seven/templates/classy/navigation/book-tree.html.twig
index 94fac5598b57..fba921921e8c 100644
--- a/core/themes/seven/templates/classy/navigation/book-tree.html.twig
+++ b/core/themes/seven/templates/classy/navigation/book-tree.html.twig
@@ -22,7 +22,7 @@
 
 {#
   We call a macro which calls itself to render the full tree.
-  @see https://twig.symfony.com/doc/1.x/tags/macro.html
+  @see https://twig.symfony.com/doc/3.x/tags/macro.html
 #}
 {{ book_tree.book_links(items, attributes, 0) }}
 
diff --git a/core/themes/seven/templates/classy/navigation/menu.html.twig b/core/themes/seven/templates/classy/navigation/menu.html.twig
index b437f8760e97..ef04cedd1756 100644
--- a/core/themes/seven/templates/classy/navigation/menu.html.twig
+++ b/core/themes/seven/templates/classy/navigation/menu.html.twig
@@ -22,7 +22,7 @@
 
 {#
   We call a macro which calls itself to render the full tree.
-  @see https://twig.symfony.com/doc/1.x/tags/macro.html
+  @see https://twig.symfony.com/doc/3.x/tags/macro.html
 #}
 {{ menus.menu_links(items, attributes, 0) }}
 
diff --git a/core/themes/stable/templates/navigation/book-tree.html.twig b/core/themes/stable/templates/navigation/book-tree.html.twig
index 6f4d3ad0a796..bbb5c93a9767 100644
--- a/core/themes/stable/templates/navigation/book-tree.html.twig
+++ b/core/themes/stable/templates/navigation/book-tree.html.twig
@@ -22,7 +22,7 @@
 
 {#
   We call a macro which calls itself to render the full tree.
-  @see https://twig.symfony.com/doc/1.x/tags/macro.html
+  @see https://twig.symfony.com/doc/3.x/tags/macro.html
 #}
 {{ book_tree.book_links(items, attributes, 0) }}
 
diff --git a/core/themes/stable/templates/navigation/menu--toolbar.html.twig b/core/themes/stable/templates/navigation/menu--toolbar.html.twig
index c9702f5c06e5..2e6fd1735ce3 100644
--- a/core/themes/stable/templates/navigation/menu--toolbar.html.twig
+++ b/core/themes/stable/templates/navigation/menu--toolbar.html.twig
@@ -22,7 +22,7 @@
 
 {#
   We call a macro which calls itself to render the full tree.
-  @see https://twig.symfony.com/doc/1.x/tags/macro.html
+  @see https://twig.symfony.com/doc/3.x/tags/macro.html
 #}
 {{ menus.menu_links(items, attributes, 0) }}
 
diff --git a/core/themes/stable/templates/navigation/menu.html.twig b/core/themes/stable/templates/navigation/menu.html.twig
index 9ad847475446..ee1d534e478f 100644
--- a/core/themes/stable/templates/navigation/menu.html.twig
+++ b/core/themes/stable/templates/navigation/menu.html.twig
@@ -22,7 +22,7 @@
 
 {#
   We call a macro which calls itself to render the full tree.
-  @see https://twig.symfony.com/doc/1.x/tags/macro.html
+  @see https://twig.symfony.com/doc/3.x/tags/macro.html
 #}
 {{ menus.menu_links(items, attributes, 0) }}
 
diff --git a/core/themes/stable9/templates/navigation/book-tree.html.twig b/core/themes/stable9/templates/navigation/book-tree.html.twig
index 6f4d3ad0a796..bbb5c93a9767 100644
--- a/core/themes/stable9/templates/navigation/book-tree.html.twig
+++ b/core/themes/stable9/templates/navigation/book-tree.html.twig
@@ -22,7 +22,7 @@
 
 {#
   We call a macro which calls itself to render the full tree.
-  @see https://twig.symfony.com/doc/1.x/tags/macro.html
+  @see https://twig.symfony.com/doc/3.x/tags/macro.html
 #}
 {{ book_tree.book_links(items, attributes, 0) }}
 
diff --git a/core/themes/stable9/templates/navigation/menu--toolbar.html.twig b/core/themes/stable9/templates/navigation/menu--toolbar.html.twig
index c9702f5c06e5..2e6fd1735ce3 100644
--- a/core/themes/stable9/templates/navigation/menu--toolbar.html.twig
+++ b/core/themes/stable9/templates/navigation/menu--toolbar.html.twig
@@ -22,7 +22,7 @@
 
 {#
   We call a macro which calls itself to render the full tree.
-  @see https://twig.symfony.com/doc/1.x/tags/macro.html
+  @see https://twig.symfony.com/doc/3.x/tags/macro.html
 #}
 {{ menus.menu_links(items, attributes, 0) }}
 
diff --git a/core/themes/stable9/templates/navigation/menu.html.twig b/core/themes/stable9/templates/navigation/menu.html.twig
index 9ad847475446..ee1d534e478f 100644
--- a/core/themes/stable9/templates/navigation/menu.html.twig
+++ b/core/themes/stable9/templates/navigation/menu.html.twig
@@ -22,7 +22,7 @@
 
 {#
   We call a macro which calls itself to render the full tree.
-  @see https://twig.symfony.com/doc/1.x/tags/macro.html
+  @see https://twig.symfony.com/doc/3.x/tags/macro.html
 #}
 {{ menus.menu_links(items, attributes, 0) }}
 
diff --git a/core/themes/starterkit_theme/templates/navigation/book-tree.html.twig b/core/themes/starterkit_theme/templates/navigation/book-tree.html.twig
index 94fac5598b57..fba921921e8c 100644
--- a/core/themes/starterkit_theme/templates/navigation/book-tree.html.twig
+++ b/core/themes/starterkit_theme/templates/navigation/book-tree.html.twig
@@ -22,7 +22,7 @@
 
 {#
   We call a macro which calls itself to render the full tree.
-  @see https://twig.symfony.com/doc/1.x/tags/macro.html
+  @see https://twig.symfony.com/doc/3.x/tags/macro.html
 #}
 {{ book_tree.book_links(items, attributes, 0) }}
 
diff --git a/core/themes/starterkit_theme/templates/navigation/menu.html.twig b/core/themes/starterkit_theme/templates/navigation/menu.html.twig
index b437f8760e97..ef04cedd1756 100644
--- a/core/themes/starterkit_theme/templates/navigation/menu.html.twig
+++ b/core/themes/starterkit_theme/templates/navigation/menu.html.twig
@@ -22,7 +22,7 @@
 
 {#
   We call a macro which calls itself to render the full tree.
-  @see https://twig.symfony.com/doc/1.x/tags/macro.html
+  @see https://twig.symfony.com/doc/3.x/tags/macro.html
 #}
 {{ menus.menu_links(items, attributes, 0) }}
 
-- 
GitLab