Merge branch 'v3' of https://github.com/craftcms/cms into develop

# Conflicts: # src/helpers/Component.php
michaelrog · Nov 19, 2022 · 0df6fcc · 0df6fcc
2 parents 84189d4 + 39d76dc
commit 0df6fcc
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 7 deletions.
diff --git a/src/fields/Assets.php b/src/fields/Assets.php
@@ -13,6 +13,7 @@
 use craft\elements\conditions\ElementCondition;
 use craft\elements\db\AssetQuery;
 use craft\elements\db\ElementQueryInterface;
+use craft\elements\ElementCollection;
 use craft\errors\FsObjectNotFoundException;
 use craft\errors\InvalidFsException;
 use craft\errors\InvalidSubpathException;
@@ -92,7 +93,7 @@ public static function defaultSelectionLabel(): string
      */
     public static function valueType(): string
     {
-        return AssetQuery::class;
+        return sprintf('%s|%s<%s>', AssetQuery::class, ElementCollection::class, Asset::class);
     }
 
     /**

diff --git a/src/fields/BaseRelationField.php b/src/fields/BaseRelationField.php
@@ -22,6 +22,7 @@
 use craft\elements\db\ElementQuery;
 use craft\elements\db\ElementQueryInterface;
 use craft\elements\db\ElementRelationParamParser;
+use craft\elements\ElementCollection;
 use craft\errors\SiteNotFoundException;
 use craft\events\ElementCriteriaEvent;
 use craft\events\ElementEvent;
@@ -99,7 +100,7 @@ public static function defaultSelectionLabel(): string
      */
     public static function valueType(): string
     {
-        return ElementQueryInterface::class;
+        return sprintf('%s|%s<%s>', ElementQueryInterface::class, ElementCollection::class, ElementInterface::class);
     }
 
     /**

diff --git a/src/fields/Categories.php b/src/fields/Categories.php
@@ -12,6 +12,7 @@
 use craft\elements\Category;
 use craft\elements\db\CategoryQuery;
 use craft\elements\db\ElementQueryInterface;
+use craft\elements\ElementCollection;
 use craft\gql\arguments\elements\Category as CategoryArguments;
 use craft\gql\interfaces\elements\Category as CategoryInterface;
 use craft\gql\resolvers\elements\Category as CategoryResolver;
@@ -61,7 +62,7 @@ public static function defaultSelectionLabel(): string
      */
     public static function valueType(): string
     {
-        return CategoryQuery::class;
+        return sprintf('%s|%s<%s>', CategoryQuery::class, ElementCollection::class, Category::class);
     }
 
     /**

diff --git a/src/fields/Entries.php b/src/fields/Entries.php
@@ -10,6 +10,7 @@
 use Craft;
 use craft\elements\conditions\ElementCondition;
 use craft\elements\db\EntryQuery;
+use craft\elements\ElementCollection;
 use craft\elements\Entry;
 use craft\gql\arguments\elements\Entry as EntryArguments;
 use craft\gql\interfaces\elements\Entry as EntryInterface;
@@ -57,7 +58,7 @@ public static function defaultSelectionLabel(): string
      */
     public static function valueType(): string
     {
-        return EntryQuery::class;
+        return sprintf('%s|%s<%s>', EntryQuery::class, ElementCollection::class, Entry::class);
     }
 
     /**

diff --git a/src/fields/Matrix.php b/src/fields/Matrix.php
@@ -20,6 +20,7 @@
 use craft\elements\db\ElementQuery;
 use craft\elements\db\ElementQueryInterface;
 use craft\elements\db\MatrixBlockQuery;
+use craft\elements\ElementCollection;
 use craft\elements\MatrixBlock;
 use craft\events\BlockTypesEvent;
 use craft\fieldlayoutelements\CustomField;
@@ -97,7 +98,7 @@ public static function supportedTranslationMethods(): array
      */
     public static function valueType(): string
     {
-        return MatrixBlockQuery::class;
+        return sprintf('%s|%s<%s>', MatrixBlockQuery::class, ElementCollection::class, MatrixBlock::class);
     }
 
     /**

diff --git a/src/fields/Tags.php b/src/fields/Tags.php
@@ -11,6 +11,7 @@
 use craft\base\ElementInterface;
 use craft\elements\db\ElementQueryInterface;
 use craft\elements\db\TagQuery;
+use craft\elements\ElementCollection;
 use craft\elements\Tag;
 use craft\gql\arguments\elements\Tag as TagArguments;
 use craft\gql\interfaces\elements\Tag as TagInterface;
@@ -59,7 +60,7 @@ public static function defaultSelectionLabel(): string
      */
     public static function valueType(): string
     {
-        return TagQuery::class;
+        return sprintf('%s|%s<%s>', TagQuery::class, ElementCollection::class, Tag::class);
     }
 
     /**

diff --git a/src/fields/Users.php b/src/fields/Users.php
@@ -10,6 +10,7 @@
 use Craft;
 use craft\elements\conditions\ElementCondition;
 use craft\elements\db\UserQuery;
+use craft\elements\ElementCollection;
 use craft\elements\User;
 use craft\gql\arguments\elements\User as UserArguments;
 use craft\gql\interfaces\elements\User as UserInterface;
@@ -57,7 +58,7 @@ public static function defaultSelectionLabel(): string
      */
     public static function valueType(): string
     {
-        return UserQuery::class;
+        return sprintf('%s|%s<%s>', UserQuery::class, ElementCollection::class, User::class);
     }
 
     /**