Map category/tag/globalset reference tags to entries post-entrification

Resolves #13082
craftcms · Apr 21, 2023 · 008b382 · 008b382
1 parent 3103f11
commit 008b382
Show file tree

Hide file tree

Showing 5 changed files with 40 additions and 11 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,7 @@
 
 ## Unreleased
 
+- Category/tag/global set reference tags now map to entries, if no category groups/tag groups/global sets exist. ([#13082](https://github.com/craftcms/cms/issues/13082))
 - `craft\services\Elements::propagateElements()` now returns the element in the target site.
 - Fixed a bug where it was possible to select a disallowed volume as the Default Asset Location in Assets field settings. ([#13072](https://github.com/craftcms/cms/issues/13072))
 - Fixed a bug where it was possible to upload files to Assets fields outside of the allowed volumes, if the Default Upload Location was set to a disallowed volume. ([#13072](https://github.com/craftcms/cms/issues/13072))

diff --git a/src/elements/Category.php b/src/elements/Category.php
@@ -43,6 +43,11 @@
  */
 class Category extends Element
 {
+    /**
+     * @since 4.4.8
+     */
+    public const REF_HANDLE = 'category';
+
     /**
      * @inheritdoc
      */
@@ -80,7 +85,7 @@ public static function pluralLowerDisplayName(): string
      */
     public static function refHandle(): ?string
     {
-        return 'category';
+        return self::REF_HANDLE;
     }
 
     /**

diff --git a/src/elements/GlobalSet.php b/src/elements/GlobalSet.php
@@ -27,8 +27,10 @@
  */
 class GlobalSet extends Element
 {
-    // Validation scenarios
-    // -------------------------------------------------------------------------
+    /**
+     * @since 4.4.8
+     */
+    public const REF_HANDLE = 'globalset';
 
     /**
      * @since 4.4.6
@@ -72,7 +74,7 @@ public static function pluralLowerDisplayName(): string
      */
     public static function refHandle(): ?string
     {
-        return 'globalset';
+        return self::REF_HANDLE;
     }
 
     /**

diff --git a/src/elements/Tag.php b/src/elements/Tag.php
@@ -29,6 +29,11 @@
  */
 class Tag extends Element
 {
+    /**
+     * @since 4.4.8
+     */
+    public const REF_HANDLE = 'tag';
+
     /**
      * @inheritdoc
      */
@@ -66,7 +71,7 @@ public static function pluralLowerDisplayName(): string
      */
     public static function refHandle(): ?string
     {
-        return 'tag';
+        return self::REF_HANDLE;
     }
 
     /**

diff --git a/src/services/Elements.php b/src/services/Elements.php
@@ -2338,13 +2338,29 @@ public function createExporter(mixed $config): ElementExporterInterface
     public function getElementTypeByRefHandle(string $refHandle): ?string
     {
         if (!isset($this->_elementTypesByRefHandle[$refHandle])) {
-            $this->_elementTypesByRefHandle[$refHandle] = $this->elementTypeByRefHandle($refHandle);
+            $class = $this->elementTypeByRefHandle($refHandle);
+
+            // Special cases for categories/tags/globals, if they’ve been entrified
+            if (
+                ($class === Category::class && empty(Craft::$app->getCategories()->getAllGroups())) ||
+                ($class === Tag::class && empty(Craft::$app->getTags()->getAllTagGroups())) ||
+                ($class === GlobalSet::class && empty(Craft::$app->getGlobals()->getAllSets()))
+            ) {
+                $class = Entry::class;
+            }
+
+            $this->_elementTypesByRefHandle[$refHandle] = $class;
         }
+
         return $this->_elementTypesByRefHandle[$refHandle] ?: null;
     }
 
     private function elementTypeByRefHandle(string $refHandle): string|false
     {
+        if (is_subclass_of($refHandle, ElementInterface::class)) {
+            return $refHandle;
+        }
+
         foreach ($this->getAllElementTypes() as $class) {
             /** @var string|ElementInterface $class */
             /** @phpstan-var class-string<ElementInterface>|ElementInterface $class */
@@ -2389,11 +2405,11 @@ function(array $matches) use (
                     $fallback = $fullMatch;
                 }
 
-                // Does it already have a full element type class name?
-                if (
-                    !is_subclass_of($elementType, ElementInterface::class) &&
-                    ($elementType = $this->getElementTypeByRefHandle($elementType)) === null
-                ) {
+                // Swap out the ref handle for the element type
+                $elementType = $this->getElementTypeByRefHandle($elementType);
+
+                // Use the fallback if we couldn't find an element type
+                if ($elementType === null) {
                     return $fallback;
                 }