Changed parameter name, made $args nullable

Author: Mateusz Dębiński

src/bundle/Resources/config/default_settings.yaml

@@ -1,6 +1,6 @@
 parameters:
   ibexa.graphql.schema.should.extend.ezurl: false
-  ibexa.graphql.schema.ezobjectrelationlist.enable_pagination: false
+  ibexa.graphql.schema.ibexa_object_relation_list.enable_pagination: false
   ibexa.graphql.schema.content.field_name.override:
     id: id_
   ibexa.graphql.schema.content.mapping.field_definition_type:

src/bundle/Resources/config/services/schema.yaml

@@ -43,7 +43,7 @@ services:
         arguments:
             $contentTypeService: '@ibexa.siteaccessaware.service.content_type'
             $innerMapper: '@Ibexa\GraphQL\Schema\Domain\Content\Mapper\FieldDefinition\RelationFieldDefinitionMapper.inner'
-            $enablePagination: '%ibexa.graphql.schema.ezobjectrelationlist.enable_pagination%'
+            $enablePagination: '%ibexa.graphql.schema.ibexa_object_relation_list.enable_pagination%'
 
     Ibexa\GraphQL\Schema\Domain\Content\Mapper\FieldDefinition\SelectionFieldDefinitionMapper:
         decorates: Ibexa\Contracts\GraphQL\Schema\Domain\Content\Mapper\FieldDefinition\FieldDefinitionMapper

src/lib/Resolver/RelationFieldResolver.php

@@ -7,6 +7,7 @@
 namespace Ibexa\GraphQL\Resolver;
 
 use GraphQL\Error\UserError;
+use Ibexa\Contracts\Core\Repository\Values\Content\Content;
 use Ibexa\Contracts\Core\Repository\Values\Content\Query;
 use Ibexa\Core\FieldType;
 use Ibexa\GraphQL\DataLoader\ContentLoader;
@@ -36,7 +37,7 @@ public function __construct(
         $this->enablePagination = $enablePagination;
     }
 
-    public function resolveRelationFieldValue(Field $field, $multiple = false, Argument $args)
+    public function resolveRelationFieldValue(Field $field, $multiple = false, ?Argument $args = null)
     {
         $destinationContentIds = $this->getContentIds($field);
 
@@ -49,13 +50,13 @@ public function resolveRelationFieldValue(Field $field, $multiple = false, Argum
         );
 
         if ($multiple) {
-            if (!$this->enablePagination) {
+            if (!$this->enablePagination || $args === null) {
                 $contentItems = $this->contentLoader->find($query);
 
                 return array_map(
-                    function ($contentId) use ($contentItems) {
+                    function (int $contentId) use ($contentItems) {
                         return $this->itemFactory->fromContent(
-                            $contentItems[array_search($contentId, array_column($contentItems, 'id'))]
+                            $contentItems[array_search($contentId, array_column($contentItems, 'id'), true)]
                         );
                     },
                     $destinationContentIds
@@ -68,7 +69,7 @@ function ($contentId) use ($contentItems) {
                 $contentItems = $this->contentLoader->find($query);
 
                 return array_map(
-                    function ($content) {
+                    function (Content $content) {
                         return $this->itemFactory->fromContent(
                             $content
                         );
@@ -103,11 +104,13 @@ private function getContentIds(Field $field): array
     {
         if ($field->value instanceof FieldType\RelationList\Value) {
             return $field->value->destinationContentIds;
-        } elseif ($field->value instanceof FieldType\Relation\Value) {
+        }
+
+        if ($field->value instanceof FieldType\Relation\Value) {
             return [$field->value->destinationContentId];
-        } else {
-            throw new UserError('\$field does not contain a RelationList or Relation Field value');
         }
+
+        throw new UserError('\$field does not contain a RelationList or Relation Field value');
     }
 }
 

src/lib/Schema/Domain/Content/Mapper/FieldDefinition/RelationFieldDefinitionMapper.php

@@ -58,7 +58,7 @@ public function mapToFieldValueType(FieldDefinition $fieldDefinition): ?string
                 @trigger_error(
                     'Disable pagination for ezobjectrelationlist has been deprecated since version 4.6 ' .
                     'and will be removed in version 5.0. To start receiving `RelationsConnection` instead of the deprecated ' .
-                    '`[' . $type . ']`, set the parameter `ibexa.graphql.schema.ezobjectrelationlist.enable_pagination` to `true`.',
+                    '`[' . $type . ']`, set the parameter `ibexa.graphql.schema.ibexa_object_relation_list.enable_pagination` to `true`.',
                     E_USER_DEPRECATED
                 );