IBX-11606: Bumped overblog/graphql-bundle and resolved deprecations (#98)

* IBX-11606: Bumped `overblog/graphql-bundle` and resolved deprecations

* loosen up constraint for PHP 7.4

* fixed registering resolvers

* fixed another deprecation

* [Composer] Ignored PKSA-7h5p-prw9-w5nr due to no alternatives

* cr remark

---------

Co-authored-by: Andrew Longosz <alongosz@users.noreply.github.com>

Author: konradoboza

composer.json

@@ -21,7 +21,7 @@
         "ibexa/rest": "~4.6.0@dev",
         "ibexa/fieldtype-richtext": "~4.6.0@dev",
         "lexik/jwt-authentication-bundle": "^2.8",
-        "overblog/graphql-bundle": "^0.14.2",
+        "overblog/graphql-bundle": "^0.14.4 || ^1.6.0",
         "erusev/parsedown": "^1.7",
         "symfony/dependency-injection": "^5.0",
         "symfony/http-kernel": "^5.0",
@@ -62,16 +62,18 @@
             "spec\\EzSystems\\EzPlatformGraphQL\\": "spec/EzSystems/EzPlatformGraphQL"
         }
     },
-    "conflict": {
-        "webonyx/graphql-php": ">= 15.0.0"
-    },
     "extra": {
         "branch-alias": {
             "dev-main": "4.6.x-dev"
         }
     },
     "config": {
-        "allow-plugins": false
+        "allow-plugins": false,
+        "audit": {
+            "ignore": {
+                "PKSA-7h5p-prw9-w5nr": "The affected version of 3rd party component is installed on PHP 7.4. There's no alternative supporting PHP 7.4. Consider upgrading to PHP 8"
+            }
+        }
     },
     "scripts": {
         "fix-cs": "php-cs-fixer fix --config=.php-cs-fixer.php -v --show-progress=dots",

spec/Schema/Domain/Content/Mapper/FieldDefinition/RelationFieldDefinitionMapperSpec.php

@@ -81,13 +81,13 @@ function it_delegates_the_field_definition_type_to_the_inner_mapper(FieldDefinit
     function it_maps_multi_selection_to_resolve_multiple()
     {
         $fieldDefinition = $this->createFieldDefinition(self::DEF_LIMIT_MULTI);
-        $this->mapToFieldValueResolver($fieldDefinition)->shouldReturn('@=resolver("RelationFieldValue", [field, true, args])');
+        $this->mapToFieldValueResolver($fieldDefinition)->shouldReturn('@=query("RelationFieldValue", field, true, args)');
     }
 
     function it_maps_single_selection_to_resolve_single()
     {
         $fieldDefinition = $this->createFieldDefinition(self::DEF_LIMIT_SINGLE);
-        $this->mapToFieldValueResolver($fieldDefinition)->shouldReturn('@=resolver("RelationFieldValue", [field, false, args])');
+        $this->mapToFieldValueResolver($fieldDefinition)->shouldReturn('@=query("RelationFieldValue", field, false, args)');
     }
 
     private function createFieldDefinition($selectionLimit = 0, $selectionContentTypes = [])

src/bundle/DependencyInjection/GraphQL/SchemaProvider.php

@@ -14,7 +14,7 @@ interface SchemaProvider
     /**
      * Returns the overblog graphql schema configuration.
      *
-     * @return array Array with the keys from overlog graphql config: query, mutation, resolver_maps...
+     * @return array Array with the keys from overblog graphql config: query, mutation, types...
      */
     public function getSchemaConfiguration();
 }

src/bundle/DependencyInjection/GraphQL/YamlSchemaProvider.php

@@ -6,8 +6,6 @@
  */
 namespace Ibexa\Bundle\GraphQL\DependencyInjection\GraphQL;
 
-use Ibexa\GraphQL\Resolver\Map\UploadMap;
-
 /**
  * Provides schema definitions.
  */
@@ -36,7 +34,6 @@ public function getSchemaConfiguration()
         return [
             'query' => $this->getQuerySchema(),
             'mutation' => $this->getMutationSchema(),
-            'resolver_maps' => [UploadMap::class],
             'types' => ['UntypedContent'],
         ];
     }

src/bundle/Resources/config/default_settings.yaml

@@ -48,7 +48,7 @@ parameters:
       input_type: ImageFieldInput
     ezimageasset:
       value_type: ImageFieldValue
-      value_resolver: 'resolver("DomainImageAssetFieldValue", [field])'
+      value_resolver: 'query("DomainImageAssetFieldValue", [field])'
     ezinteger:
       definition_type: IntegerFieldDefinition
       value_type: Int

src/bundle/Resources/config/graphql/Base.types.yaml

@@ -23,7 +23,7 @@ DateTime:
             format:
                 type: String
                 description: "Date formatted with a date() format"
-                resolve: "@=resolver('DateTimeFormat', [value, args])"
+                resolve: "@=query('DateTimeFormat', value, args)"
                 args:
                     pattern:
                         type: "String"

src/bundle/Resources/config/graphql/Content.types.yaml

@@ -12,25 +12,25 @@ Content:
             contentType:
                 type: "ContentType"
                 description: "The content type of the Content item."
-                resolve: "@=resolver('ContentTypeById', [value.contentTypeId])"
+                resolve: "@=query('ContentTypeById', value.contentTypeId)"
             name:
                 type: "String"
                 description: "The computed name (via name schema) in the main language of the Content item."
             section:
                 type: "Section"
                 description: "The section to which the Content object is assigned."
-                resolve: "@=resolver('SectionById', [value.sectionId])"
+                resolve: "@=query('SectionById', value.sectionId)"
             currentVersionNo:
                 type: "Int"
                 description: "Version number of the published version, or 1 for a newly created draft."
             currentVersion:
                 type: "Version"
                 description: "The currently published version"
-                resolve: "@=resolver('CurrentVersion', [value])"
+                resolve: "@=query('CurrentVersion', value)"
             versions:
                 type: "[Version]"
                 description: "All content versions."
-                resolve: "@=resolver('ContentVersions', [value.id])"
+                resolve: "@=query('ContentVersions', value.id)"
             published:
                 type: "Boolean"
                 description: "If the Content item has a published version."
@@ -40,7 +40,7 @@ Content:
             owner:
                 type: "User"
                 description: "The owner user of the Content object"
-                resolve: "@=resolver('UserById', [value.ownerId])"
+                resolve: "@=query('UserById', value.ownerId)"
             modificationDate:
                 type: DateTime
                 description: "Date the Content item was last modified on."
@@ -62,23 +62,23 @@ Content:
             mainLocation:
                 type: "Location"
                 description: "Content item's main location."
-                resolve: "@=resolver('LocationById', [value.mainLocationId])"
+                resolve: "@=query('LocationById', value.mainLocationId)"
             locations:
                 type: "[Location]"
                 description: "All the locations of the Content item"
-                resolve: "@=resolver('LocationsByContentId', [value.id])"
+                resolve: "@=query('LocationsByContentId', value.id)"
             relations:
                 type: "[ContentRelation]"
                 description: "Relations from this Content"
-                resolve: "@=resolver('ContentRelations', [value])"
+                resolve: "@=query('ContentRelations', value)"
             reverseRelations:
                 type: "[ContentRelation]"
                 description: "Relations to this Content"
-                resolve: "@=resolver('ContentReverseRelations', [value])"
+                resolve: "@=query('ContentReverseRelations', value)"
             states:
                 type: "[ObjectState]"
                 description: "Content States."
-                resolve: "@=resolver('ObjectStateByContentInfo', [value])"
+                resolve: "@=query('ObjectStateByContentInfo', value)"
 
 ContentRelation:
     type: "object"

src/bundle/Resources/config/graphql/ContentType.types.yaml

@@ -47,14 +47,14 @@ ContentType:
             creator:
                 type: "User"
                 description: "The user who created this content type."
-                resolve: "@=resolver('UserById', [value.creatorId])"
+                resolve: "@=query('UserById', value.creatorId)"
             modifierId:
                 type: "Int"
                 description: "The user id of the user which has last modified this content type"
             modifier:
                 type: "User"
                 description: "The user which has last modified this content type"
-                resolve: "@=resolver('UserById', [value.modifierId])"
+                resolve: "@=query('UserById', value.modifierId)"
             remoteId:
                 type: "String"
                 description: "A global unique id of the content type."
@@ -99,12 +99,12 @@ ContentTypeGroup:
                 type: "Int"
             creator:
                 type: "User"
-                resolve: "@=resolver('UserById', [value.creatorId])"
+                resolve: "@=query('UserById', value.creatorId)"
             modifierId:
                 type: "Int"
             modifier:
                 type: "User"
-                resolve: "@=resolver('UserById', [value.modifierId])"
+                resolve: "@=query('UserById', value.modifierId)"
             contentTypes:
                 type: "[ContentType]"
                 resolve: "@=query('ContentTypesFromGroup', {'groupId': value.id})"

src/bundle/Resources/config/graphql/DomainContent.types.yaml

@@ -29,7 +29,7 @@ DomainContent:
                 type: String
             _thumbnail:
                 type: Thumbnail
-        resolveType: "@=resolver('DomainContentType', [value])"
+        resolveType: "@=query('DomainContentType', value)"
 
 AbstractDomainContent:
     type: "object"
@@ -44,7 +44,7 @@ AbstractDomainContent:
             _type:
                 description: "The item's content type"
                 type: ContentType
-                resolve: '@=resolver("ContentTypeById", [value.contentInfo.contentTypeId])'
+                resolve: '@=query("ContentTypeById", value.contentInfo.contentTypeId)'
             _content:
                 description: 'Underlying content info item'
                 type: Content
@@ -57,19 +57,19 @@ AbstractDomainContent:
             _location:
                 description: 'Main location'
                 type: Location
-                resolve: '@=resolver("LocationById", [value.contentInfo.mainLocationId])'
+                resolve: '@=query("LocationById", value.contentInfo.mainLocationId)'
             _allLocations:
                 description: 'All the locations'
                 type: '[Location]'
-                resolve: '@=resolver("LocationsByContentId", [value.contentInfo.id])'
+                resolve: '@=query("LocationsByContentId", value.contentInfo.id)'
             _name:
                 description: "The content item's name, in the prioritized language(s), based on the object name pattern"
                 type: String
                 resolve: "@=value.getName()"
             _url:
                 description: "The content item's url alias, based on the main location."
                 type: String
-                resolve: "@=resolver('MainUrlAlias', [value])"
+                resolve: "@=query('MainUrlAlias', value)"
             _thumbnail:
                 type: Thumbnail
                 resolve: "@=query('Thumbnail', value.getThumbnail())"

src/bundle/Resources/config/graphql/Field.types.yaml

@@ -45,14 +45,14 @@ ImageFieldValue:
                     identifier:
                         type: "[ImageVariationIdentifier]!"
                         description: "One or more variation identifiers."
-                resolve: "@=resolver('ImageVariations', [value.value, args])"
+                resolve: "@=query('ImageVariations', value.value, args)"
             variation:
                 type: ImageVariation
                 args:
                     identifier:
                         type: ImageVariationIdentifier!
                         description: "A variation identifier."
-                resolve: "@=resolver('ImageVariation', [value.value, args])"
+                resolve: "@=query('ImageVariation', value.value, args)"
 
 ImageAdditionalData:
     type: object
@@ -139,7 +139,7 @@ DateFieldValue:
             formatted:
                 type: "String"
                 description: "Formatted date"
-                resolve: "@=resolver('DateTimeFormat', [args['format'], value.value])"
+                resolve: "@=query('DateTimeFormat', args['format'], value.value)"
                 args:
                     format:
                         type: String
@@ -248,15 +248,15 @@ RichTextFieldValue:
             plaintext:
                 type: "String"
                 description: "Plain text representation of the value, without tags. Warning: the text representation may not be perfect."
-                resolve: "@=resolver('RichTextXmlToPlainText', [value.xml])"
+                resolve: "@=query('RichTextXmlToPlainText', value.xml)"
             html5:
                 type: "String"
                 description: "HTML5 representation."
-                resolve: "@=resolver('RichTextXmlToHtml5', [value.xml])"
+                resolve: "@=query('RichTextXmlToHtml5', value.xml)"
             html5_edit:
                 type: "String"
                 description: "Editable HTML5 representation."
-                resolve: "@=resolver('RichTextXmlToHtml5Edit', [value.xml])"
+                resolve: "@=query('RichTextXmlToHtml5Edit', value.xml)"
 
 SelectionFieldValue:
     type: object