Don't throw UnknownMethodException's for null arguments

#7954
craftcms · Jun 14, 2023 · eaab984 · eaab984
1 parent 0a405b1
commit eaab984
Show file tree

Hide file tree

Showing 9 changed files with 65 additions and 8 deletions.
diff --git a/CHANGELOG-WIP.md b/CHANGELOG-WIP.md
@@ -27,6 +27,7 @@
 - Added a new `_globals` global Twig variable for front-end templates, which can be used to store custom values in a global scope. ([#13050](https://github.com/craftcms/cms/pull/13050), [#12951](https://github.com/craftcms/cms/discussions/12951))
 - The `|replace` Twig filter now supports passing in a hash with regular expression keys. ([#12956](https://github.com/craftcms/cms/issues/12956))
 - `{% exit %}` tags now support passing a message after the status code. ([#13166](https://github.com/craftcms/cms/discussions/13166))
+- Built-in element types’ GraphQL queries now support passing `null` to `relatedToAssets`, `relatedToEntries`, `relatedToUsers`, `relatedToCategories`, `relatedToTags`, and `relatedToAll` arguments. ([#7954](https://github.com/craftcms/cms/issues/7954))
 - Elements now include custom field values when being iterated over, and when being merged. ([#13009](https://github.com/craftcms/cms/issues/13009))
 - Dropdown and Radio Buttons fields now have a “Column Type” setting, which will be set to `varchar` for existing fields, and defaults to “Automatic” for new fields. ([#13025](https://github.com/craftcms/cms/pull/13025), [#12954](https://github.com/craftcms/cms/issues/12954))
 

diff --git a/src/gql/resolvers/elements/Address.php b/src/gql/resolvers/elements/Address.php
@@ -13,6 +13,7 @@
 use craft\gql\base\ElementResolver;
 use craft\helpers\Gql as GqlHelper;
 use Illuminate\Support\Collection;
+use yii\base\UnknownMethodException;
 
 /**
  * Class Address
@@ -42,7 +43,13 @@ public static function prepareQuery(mixed $source, array $arguments, ?string $fi
         }
 
         foreach ($arguments as $key => $value) {
-            $query->$key($value);
+            try {
+                $query->$key($value);
+            } catch (UnknownMethodException $e) {
+                if ($value !== null) {
+                    throw $e;
+                }
+            }
         }
 
         if (!GqlHelper::canQueryUsers()) {

diff --git a/src/gql/resolvers/elements/Asset.php b/src/gql/resolvers/elements/Asset.php
@@ -13,6 +13,7 @@
 use craft\gql\base\ElementResolver;
 use craft\helpers\Gql as GqlHelper;
 use Illuminate\Support\Collection;
+use yii\base\UnknownMethodException;
 
 /**
  * Class Asset
@@ -41,7 +42,13 @@ public static function prepareQuery(mixed $source, array $arguments, ?string $fi
         }
 
         foreach ($arguments as $key => $value) {
-            $query->$key($value);
+            try {
+                $query->$key($value);
+            } catch (UnknownMethodException $e) {
+                if ($value !== null) {
+                    throw $e;
+                }
+            }
         }
 
         $pairs = GqlHelper::extractAllowedEntitiesFromSchema('read');

diff --git a/src/gql/resolvers/elements/Category.php b/src/gql/resolvers/elements/Category.php
@@ -13,6 +13,7 @@
 use craft\gql\base\ElementResolver;
 use craft\helpers\Gql as GqlHelper;
 use Illuminate\Support\Collection;
+use yii\base\UnknownMethodException;
 
 /**
  * Class Category
@@ -41,7 +42,13 @@ public static function prepareQuery(mixed $source, array $arguments, ?string $fi
         }
 
         foreach ($arguments as $key => $value) {
-            $query->$key($value);
+            try {
+                $query->$key($value);
+            } catch (UnknownMethodException $e) {
+                if ($value !== null) {
+                    throw $e;
+                }
+            }
         }
 
         $pairs = GqlHelper::extractAllowedEntitiesFromSchema('read');

diff --git a/src/gql/resolvers/elements/Entry.php b/src/gql/resolvers/elements/Entry.php
@@ -13,6 +13,7 @@
 use craft\gql\base\ElementResolver;
 use craft\helpers\Gql as GqlHelper;
 use Illuminate\Support\Collection;
+use yii\base\UnknownMethodException;
 
 /**
  * Class Entry
@@ -41,7 +42,13 @@ public static function prepareQuery(mixed $source, array $arguments, ?string $fi
         }
 
         foreach ($arguments as $key => $value) {
-            $query->$key($value);
+            try {
+                $query->$key($value);
+            } catch (UnknownMethodException $e) {
+                if ($value !== null) {
+                    throw $e;
+                }
+            }
         }
 
         $pairs = GqlHelper::extractAllowedEntitiesFromSchema('read');

diff --git a/src/gql/resolvers/elements/GlobalSet.php b/src/gql/resolvers/elements/GlobalSet.php
@@ -11,6 +11,7 @@
 use craft\gql\base\ElementResolver;
 use craft\helpers\Gql as GqlHelper;
 use Illuminate\Support\Collection;
+use yii\base\UnknownMethodException;
 
 /**
  * Class GlobalSet
@@ -28,7 +29,13 @@ public static function prepareQuery(mixed $source, array $arguments, ?string $fi
         $query = GlobalSetElement::find();
 
         foreach ($arguments as $key => $value) {
-            $query->$key($value);
+            try {
+                $query->$key($value);
+            } catch (UnknownMethodException $e) {
+                if ($value !== null) {
+                    throw $e;
+                }
+            }
         }
 
         $pairs = GqlHelper::extractAllowedEntitiesFromSchema('read');

diff --git a/src/gql/resolvers/elements/MatrixBlock.php b/src/gql/resolvers/elements/MatrixBlock.php
@@ -10,6 +10,7 @@
 use craft\elements\db\ElementQuery;
 use craft\elements\MatrixBlock as MatrixBlockElement;
 use craft\gql\base\ElementResolver;
+use yii\base\UnknownMethodException;
 
 /**
  * Class MatrixBlock
@@ -38,7 +39,13 @@ public static function prepareQuery(mixed $source, array $arguments, ?string $fi
         }
 
         foreach ($arguments as $key => $value) {
-            $query->$key($value);
+            try {
+                $query->$key($value);
+            } catch (UnknownMethodException $e) {
+                if ($value !== null) {
+                    throw $e;
+                }
+            }
         }
 
         return $query;

diff --git a/src/gql/resolvers/elements/Tag.php b/src/gql/resolvers/elements/Tag.php
@@ -13,6 +13,7 @@
 use craft\gql\base\ElementResolver;
 use craft\helpers\Gql as GqlHelper;
 use Illuminate\Support\Collection;
+use yii\base\UnknownMethodException;
 
 /**
  * Class Tag
@@ -41,7 +42,13 @@ public static function prepareQuery(mixed $source, array $arguments, ?string $fi
         }
 
         foreach ($arguments as $key => $value) {
-            $query->$key($value);
+            try {
+                $query->$key($value);
+            } catch (UnknownMethodException $e) {
+                if ($value !== null) {
+                    throw $e;
+                }
+            }
         }
 
         $pairs = GqlHelper::extractAllowedEntitiesFromSchema('read');

diff --git a/src/gql/resolvers/elements/User.php b/src/gql/resolvers/elements/User.php
@@ -15,6 +15,7 @@
 use craft\helpers\ArrayHelper;
 use craft\helpers\Gql as GqlHelper;
 use Illuminate\Support\Collection;
+use yii\base\UnknownMethodException;
 
 /**
  * Class User
@@ -66,7 +67,13 @@ public static function prepareQuery(mixed $source, array $arguments, ?string $fi
         }
 
         foreach ($arguments as $key => $value) {
-            $query->$key($value);
+            try {
+                $query->$key($value);
+            } catch (UnknownMethodException $e) {
+                if ($value !== null) {
+                    throw $e;
+                }
+            }
         }
 
         if (!GqlHelper::canQueryUsers()) {