From c204185ae86a98994f80010abf35a190c9406739 Mon Sep 17 00:00:00 2001
From: Jake Vanderwerf <get@jakevanderwerf.ca>
Date: Sun, 12 Jul 2026 18:08:19 +0000
Subject: [PATCH] =Refactor of Integrations.php. Separated different functionality into traits that classes can use to add that functionality. Hopefully will make maintaining it a little easier. Still have to finish up, as well as refactoring the individual classes to utilize the new system.
---
inc/managers/SEO/BreadcrumbManager.php | 58 ++++++++++++++++++++++++----------------------------------
1 files changed, 24 insertions(+), 34 deletions(-)
diff --git a/inc/managers/SEO/BreadcrumbManager.php b/inc/managers/SEO/BreadcrumbManager.php
index 341debf..2993c98 100644
--- a/inc/managers/SEO/BreadcrumbManager.php
+++ b/inc/managers/SEO/BreadcrumbManager.php
@@ -25,10 +25,10 @@
private function __construct()
{
$this->cache = Cache::for('breadcrumbs', MONTH_IN_SECONDS)->connect('post')->connect('taxonomy')->connect('user');
- $this->cache->flush();
if (JVB_TESTING) {
$this->cache->flush();
}
+ $this->cache->flush();
}
public static function getInstance(): self
@@ -50,22 +50,13 @@
return [];
}
- switch (true) {
- case is_singular():
- $key = get_queried_object_id();
- break;
- case is_post_type_archive():
- $obj = get_queried_object();
- $key = $obj->name;
- break;
- case is_tax():
- $obj = get_queried_object();
- $key = $obj->taxonomy;
- break;
- default:
- $key = 'home';
- break;
- }
+
+ $key = match(true) {
+ is_singular() => get_queried_object_id(),
+ is_tax() => get_queried_object()->taxonomy,
+ is_post_type_archive() => get_queried_object()->name,
+ default => 'home'
+ };
return $this->cache->remember(
$key,
@@ -91,9 +82,12 @@
];
$obj = get_queried_object();
+ if (is_null($obj)) {
+ return $crumbs;
+ }
if (is_tax()) {
$crumbs = $this->addTaxonomyCrumbs($crumbs, $obj);
- } elseif (is_singular()) {
+ } elseif (is_singular() || is_home()) {
$crumbs = $this->addArchiveCrumbs($crumbs, $obj);
$hierarchy = $this->addSingularCrumbs($crumbs, $obj);
$crumbs = $crumbs + $hierarchy;
@@ -140,12 +134,12 @@
// Add directory if exists
- if ($registrar && $registrar->hasFeature('directory')) {
+ if ($registrar && $registrar->hasFeature('show_directory')) {
$directory = JVB()->directories();
- if ($directory && !empty($directory->directories($tax))) {
+ if ($directory && !empty($directory->directories($tax)??[])) {
$crumbs[] = [
- 'name' => $directory['title'],
- 'url' => $directory['url']
+ 'name' => $directory->directories($tax)['title'],
+ 'url' =>$directory->directories($tax)['url']
];
}
}
@@ -167,16 +161,6 @@
$crumbConfig = $registrar->getConfig('breadcrumbs');
}
- if($registrar && $registrar->hasFeature('show_directory')) {
- $directory = JVB()->directories();
- if ($directory && !empty($directory->directories($content)??[])){
- $crumbs[] = [
- 'name' => $directory->directories($content)['title'],
- 'url' =>$directory->directories($content)['url']
- ];
- }
- }
-
// Handle directory posts specially
if (JVB()->directories() && JVB()->directories()->isDirectory()) {
$pos = jvbGetDirectoryInfo();
@@ -211,13 +195,17 @@
*/
private function addArchiveCrumbs(array $crumbs, object $obj): array
{
+ if (is_singular('page') || is_home()) {
+ return $crumbs;
+ }
$type = is_singular() ? $obj->post_type : $obj->name;
$name = jvbNoBase($type);
$registrar = Registrar::getInstance($name);
- if($registrar && $registrar->hasFeature('show_directory')) {
+ if($registrar && $registrar->hasFeature('show_directory') && JVB()->directories()) {
$directory = JVB()->directories();
+
if ($directory && !empty($directory->directories($name)??[])){
$crumbs[] = [
'name' => $directory->directories($name)['title'],
@@ -225,6 +213,7 @@
];
}
} elseif (Site::has('is_directory') && $name === 'directory') {
+
$crumbs[] = [
'name' => JVB()->directories()->referAs(true),
'url' => get_post_type_archive_link($type)
@@ -235,8 +224,9 @@
'url' => get_post_type_archive_link($type)
];
} else {
+ $postTypeObject = get_post_type_object($type);
$crumbs[] = [
- 'name' => $obj->label,
+ 'name' => $postTypeObject->label,
'url' => get_post_type_archive_link($type)
];
}
--
Gitblit v1.10.0