From 4710faf347984ce27573c7a61cfc14112978b6d3 Mon Sep 17 00:00:00 2001
From: Hans Kuijpers <hans2103@gmail.com>
Date: Tue, 22 Sep 2020 09:48:14 +0200
Subject: [PATCH 1/7] :recycle: convert microdata to JSON-LD

---
 modules/mod_breadcrumbs/tmpl/default.php | 56 +++++++++++++++++-------
 1 file changed, 41 insertions(+), 15 deletions(-)

diff --git a/modules/mod_breadcrumbs/tmpl/default.php b/modules/mod_breadcrumbs/tmpl/default.php
index 7442caeb90a89..a72cd298fc42e 100644
--- a/modules/mod_breadcrumbs/tmpl/default.php
+++ b/modules/mod_breadcrumbs/tmpl/default.php
@@ -9,11 +9,13 @@
 
 defined('_JEXEC') or die;
 
+use Joomla\CMS\HTML\HTMLHelper;
 use Joomla\CMS\Language\Text;
+use Joomla\CMS\Uri\Uri;
 
 ?>
 <nav role="navigation" aria-label="<?php echo $module->title; ?>">
-	<ol itemscope itemtype="https://schema.org/BreadcrumbList" class="mod-breadcrumbs breadcrumb">
+	<ol class="mod-breadcrumbs breadcrumb">
 		<?php if ($params->get('showHere', 1)) : ?>
 			<li class="mod-breadcrumbs__here float-left">
 				<?php echo Text::_('MOD_BREADCRUMBS_HERE'); ?>&#160;
@@ -36,32 +38,56 @@
 
 		// Find last and penultimate items in breadcrumbs list
 		end($list);
-		$last_item_key   = key($list);
+		$last_item_key = key($list);
 		prev($list);
 		$penult_item_key = key($list);
 
 		// Make a link if not the last item in the breadcrumbs
 		$show_last = $params->get('showLast', 1);
 
+		$class   = null;
+		$divider = null;
+
 		// Generate the trail
 		foreach ($list as $key => $item) :
 			if ($key !== $last_item_key) :
 				if (!empty($item->link)) :
-					$breadcrumbItem = '<a itemprop="item" href="' . $item->link . '" class="pathway"><span itemprop="name">' . $item->name . '</span></a>';
+					$breadcrumbItem = HTMLHelper::link($item->link, '<span>' . $item->name . '</span>', ['class' => 'pathway']);
 				else :
-					$breadcrumbItem = '<span itemprop="name">' . $item->name . '</span>';
+					$breadcrumbItem = '<span>' . $item->name . '</span>';
 				endif;
-				// Render all but last item - along with separator ?>
-				<li itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem" class="mod-breadcrumbs__item breadcrumb-item"><?php echo $breadcrumbItem; ?>
-					<meta itemprop="position" content="<?php echo $key + 1; ?>">
-				</li>
-			<?php elseif ($show_last) :
-				$breadcrumbItem = '<span itemprop="name">' . $item->name . '</span>';
-				// Render last item if required. ?>
-				<li aria-current="page" itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem" class="mod-breadcrumbs__item breadcrumb-item active"><?php echo $breadcrumbItem; ?>
-					<meta itemprop="position" content="<?php echo $key + 1; ?>">
-				</li>
-			<?php endif;
+
+			elseif ($show_last) :
+				// Render last item if required.
+				$breadcrumbItem = '<span>' . $item->name . '</span>';
+				$class          = ' active';
+			endif;
+
+			echo '<li class="mod-breadcrumbs__item breadcrumb-item' . $class . '">' . $breadcrumbItem . '</li>';
 		endforeach; ?>
 	</ol>
+	<?php
+
+	// Structured data as JSON
+	$data = [
+			'@context'        => 'https://schema.org',
+			'@type'           => 'BreadcrumbList',
+			'itemListElement' => []
+	];
+
+	foreach ($list as $key => $item)
+	{
+		$data['itemListElement'][] = [
+				'@type'    => 'ListItem',
+				'position' => $key + 1,
+				'item'     => [
+						'@id'  => $item->link ? Uri::base() . ltrim($item->link, '/') : Uri::current(),
+						'name' => $item->name
+				]
+		];
+	}
+	?>
+	<script type="application/ld+json">
+	<?php echo json_encode($data, JSON_UNESCAPED_UNICODE); ?>
+	</script>
 </nav>

From 2fbe114a8d3860bef84f8ec58552691c3a721fe0 Mon Sep 17 00:00:00 2001
From: Hans Kuijpers <hans2103@gmail.com>
Date: Thu, 1 Oct 2020 20:59:23 +0200
Subject: [PATCH 2/7] :recycle: move script to WebAssetManager

---
 modules/mod_breadcrumbs/tmpl/default.php | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/modules/mod_breadcrumbs/tmpl/default.php b/modules/mod_breadcrumbs/tmpl/default.php
index a72cd298fc42e..244804b1f04db 100644
--- a/modules/mod_breadcrumbs/tmpl/default.php
+++ b/modules/mod_breadcrumbs/tmpl/default.php
@@ -9,10 +9,13 @@
 
 defined('_JEXEC') or die;
 
+use Joomla\CMS\Factory;
 use Joomla\CMS\HTML\HTMLHelper;
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\Uri\Uri;
+use Joomla\CMS\WebAsset\WebAssetManager;
 
+$app       = Factory::getApplication();
 ?>
 <nav role="navigation" aria-label="<?php echo $module->title; ?>">
 	<ol class="mod-breadcrumbs breadcrumb">
@@ -86,8 +89,9 @@
 				]
 		];
 	}
+
+	/** @var WebAssetManager $wa */
+	$wa = $app->getDocument()->getWebAssetManager();
+	$wa->addInline('script', json_encode($data, JSON_UNESCAPED_UNICODE), [], ['type' => 'application/ld+json']);
 	?>
-	<script type="application/ld+json">
-	<?php echo json_encode($data, JSON_UNESCAPED_UNICODE); ?>
-	</script>
 </nav>

From f01c72905274730d8d5941f3a75d19edd65a9a73 Mon Sep 17 00:00:00 2001
From: Hans Kuijpers <hans2103@gmail.com>
Date: Thu, 1 Oct 2020 21:08:06 +0200
Subject: [PATCH 3/7] Update modules/mod_breadcrumbs/tmpl/default.php

Co-authored-by: SharkyKZ <sharkykz@gmail.com>
---
 modules/mod_breadcrumbs/tmpl/default.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/modules/mod_breadcrumbs/tmpl/default.php b/modules/mod_breadcrumbs/tmpl/default.php
index 7ad8213661415..b4c058ffcfde2 100644
--- a/modules/mod_breadcrumbs/tmpl/default.php
+++ b/modules/mod_breadcrumbs/tmpl/default.php
@@ -16,7 +16,6 @@
 use Joomla\CMS\Uri\Uri;
 use Joomla\CMS\WebAsset\WebAssetManager;
 
-$app       = Factory::getApplication();
 ?>
 <nav role="navigation" aria-label="<?php echo $module->title; ?>">
 	<ol class="mod-breadcrumbs breadcrumb">

From be55d71857599058c53ec87c43f3abc0f579bf9c Mon Sep 17 00:00:00 2001
From: Hans Kuijpers <hans2103@gmail.com>
Date: Thu, 1 Oct 2020 21:08:14 +0200
Subject: [PATCH 4/7] Update modules/mod_breadcrumbs/tmpl/default.php

Co-authored-by: SharkyKZ <sharkykz@gmail.com>
---
 modules/mod_breadcrumbs/tmpl/default.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/modules/mod_breadcrumbs/tmpl/default.php b/modules/mod_breadcrumbs/tmpl/default.php
index b4c058ffcfde2..b362ca0cb7283 100644
--- a/modules/mod_breadcrumbs/tmpl/default.php
+++ b/modules/mod_breadcrumbs/tmpl/default.php
@@ -9,7 +9,6 @@
 
 defined('_JEXEC') or die;
 
-use Joomla\CMS\Factory;
 use Joomla\CMS\HTML\HTMLHelper;
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\Router\Route;

From 4a863cf050ce26108202e811eceef7d548cff1e9 Mon Sep 17 00:00:00 2001
From: Hans Kuijpers <hans2103@gmail.com>
Date: Thu, 1 Oct 2020 21:12:59 +0200
Subject: [PATCH 5/7] removal non used variable

---
 modules/mod_breadcrumbs/tmpl/default.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/modules/mod_breadcrumbs/tmpl/default.php b/modules/mod_breadcrumbs/tmpl/default.php
index b362ca0cb7283..6fca0abae4fdb 100644
--- a/modules/mod_breadcrumbs/tmpl/default.php
+++ b/modules/mod_breadcrumbs/tmpl/default.php
@@ -48,7 +48,6 @@
 		$show_last = $params->get('showLast', 1);
 
 		$class   = null;
-		$divider = null;
 
 		// Generate the trail
 		foreach ($list as $key => $item) :

From a2a8c9e34d3a13bbf333687efdc377be6f452c2b Mon Sep 17 00:00:00 2001
From: Hans Kuijpers <hans2103@gmail.com>
Date: Fri, 2 Oct 2020 08:21:39 +0200
Subject: [PATCH 6/7] Update modules/mod_breadcrumbs/tmpl/default.php

Co-authored-by: SharkyKZ <sharkykz@gmail.com>
---
 modules/mod_breadcrumbs/tmpl/default.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/mod_breadcrumbs/tmpl/default.php b/modules/mod_breadcrumbs/tmpl/default.php
index 6fca0abae4fdb..e6c7a319999ea 100644
--- a/modules/mod_breadcrumbs/tmpl/default.php
+++ b/modules/mod_breadcrumbs/tmpl/default.php
@@ -82,7 +82,7 @@
 				'@type'    => 'ListItem',
 				'position' => $key + 1,
 				'item'     => [
-						'@id'  => $item->link ? Route::_(Uri::base() . ltrim($item->link, '/')) : Route::_(Uri::current()),
+						'@id'  => $item->link ? Route::_($item->link, true, Route::TLS_IGNORE, true) : Route::_(Uri::current()),
 						'name' => $item->name
 				]
 		];

From f38b735ea76b0a55f2363d4856a8f221805fecb2 Mon Sep 17 00:00:00 2001
From: Hans Kuijpers <hans2103@gmail.com>
Date: Fri, 2 Oct 2020 08:29:54 +0200
Subject: [PATCH 7/7] replace Uri::current() with Uri::getInstance()

---
 modules/mod_breadcrumbs/tmpl/default.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/mod_breadcrumbs/tmpl/default.php b/modules/mod_breadcrumbs/tmpl/default.php
index e6c7a319999ea..e120f40ac5986 100644
--- a/modules/mod_breadcrumbs/tmpl/default.php
+++ b/modules/mod_breadcrumbs/tmpl/default.php
@@ -82,7 +82,7 @@
 				'@type'    => 'ListItem',
 				'position' => $key + 1,
 				'item'     => [
-						'@id'  => $item->link ? Route::_($item->link, true, Route::TLS_IGNORE, true) : Route::_(Uri::current()),
+						'@id'  => $item->link ? Route::_($item->link, true, Route::TLS_IGNORE, true) : Route::_(Uri::getInstance()),
 						'name' => $item->name
 				]
 		];