IBX-8536: Replaced deprecated graphql methods (#31)

* IBX-8536: Replaced deprecated graphql methods * Dropped deprecated interface * Dropped deprecated factory method * Cleanup constructor * fix cs * fixed spec
ibexa · Oct 23, 2024 · 87c5596 · 87c5596
1 parent cfc6043
commit 87c5596
Show file tree

Hide file tree

Showing 6 changed files with 4 additions and 50 deletions.
diff --git a/spec/GraphQL/ContentQueryFieldDefinitionMapperSpec.php b/spec/GraphQL/ContentQueryFieldDefinitionMapperSpec.php
@@ -34,7 +34,7 @@ public function let(
             ->willReturn($contentType);
 
         $nameHelper
-            ->domainContentName($contentType)
+            ->itemName($contentType)
             ->willReturn(self::GRAPHQL_TYPE);
 
         $this->beConstructedWith($innerMapper, $nameHelper, $contentTypeService, self::FIELD_TYPE_IDENTIFIER);

diff --git a/spec/QueryFieldServiceSpec.php b/spec/QueryFieldServiceSpec.php
@@ -8,7 +8,6 @@
 namespace spec\Ibexa\FieldTypeQuery;
 
 use Ibexa\Contracts\Core\Repository\ContentTypeService;
-use Ibexa\Contracts\Core\Repository\LocationService;
 use Ibexa\Contracts\Core\Repository\SearchService;
 use Ibexa\Contracts\Core\Repository\Values\Content\ContentInfo;
 use Ibexa\Contracts\Core\Repository\Values\Content\Query as ApiContentQuery;
@@ -39,7 +38,6 @@ class QueryFieldServiceSpec extends ObjectBehavior
     public function let(
         SearchService $searchService,
         ContentTypeService $contentTypeService,
-        LocationService $locationService,
         QueryTypeRegistry $queryTypeRegistry,
         QueryType $queryType
     ) {
@@ -51,22 +49,17 @@ public function let(
             'param2' => 'value2',
         ];
 
-        $location = new Values\Content\Location([
-            'id' => self::LOCATION_ID,
-        ]);
-
         $contentTypeWithPagination = $this->getContentType($parameters);
         $contentTypeService->loadContentType(self::CONTENT_TYPE_ID)->willReturn($contentTypeWithPagination);
 
         $contentTypeWithoutPagination = $this->getContentType($parameters, false, 10);
         $contentTypeService->loadContentType(self::CONTENT_TYPE_ID_WITHOUT_PAGINATION)->willReturn($contentTypeWithoutPagination);
 
-        $locationService->loadLocation(self::LOCATION_ID)->willReturn($location);
         $queryTypeRegistry->getQueryType(self::QUERY_TYPE_IDENTIFIER)->willReturn($queryType);
         $queryType->getQuery(Argument::any())->willReturn(new ApiQuery());
         // @todo this should fail. It does not.
         $searchService->findContent(Argument::any())->willReturn($this->searchResult);
-        $this->beConstructedWith($searchService, $contentTypeService, $locationService, $queryTypeRegistry);
+        $this->beConstructedWith($searchService, $contentTypeService, $queryTypeRegistry);
     }
 
     public function it_is_initializable()

diff --git a/src/lib/GraphQL/ContentQueryFieldDefinitionMapper.php b/src/lib/GraphQL/ContentQueryFieldDefinitionMapper.php
@@ -95,14 +95,14 @@ protected function getFieldTypeIdentifier(): string
 
     private function nameValueType($typeIdentifier): string
     {
-        return $this->nameHelper->domainContentName(
+        return $this->nameHelper->itemName(
             $this->contentTypeService->loadContentTypeByIdentifier($typeIdentifier)
         );
     }
 
     private function nameValueConnectionType($typeIdentifier): string
     {
-        return $this->nameHelper->domainContentConnection(
+        return $this->nameHelper->itemConnectionName(
             $this->contentTypeService->loadContentTypeByIdentifier($typeIdentifier)
         );
     }

diff --git a/src/lib/Persistence/Legacy/Content/FieldValue/Converter/QueryConverter.php b/src/lib/Persistence/Legacy/Content/FieldValue/Converter/QueryConverter.php
@@ -15,20 +15,6 @@
 
 class QueryConverter implements Converter
 {
-    /**
-     * Factory for current class.
-     *
-     * Note: Class should instead be configured as service if it gains dependencies.
-     *
-     * @deprecated since 6.8, will be removed in 7.x, use default constructor instead.
-     *
-     * @return \Ibexa\FieldTypeQuery\Persistence\Legacy\Content\FieldValue\Converter\QueryConverter
-     */
-    public static function create()
-    {
-        return new self();
-    }
-
     /**
      * Converts data from $value to $storageFieldValue.
      *

diff --git a/src/lib/QueryFieldPaginationService.php b/src/lib/QueryFieldPaginationService.php
diff --git a/src/lib/QueryFieldService.php b/src/lib/QueryFieldService.php
@@ -8,7 +8,6 @@
 namespace Ibexa\FieldTypeQuery;
 
 use Ibexa\Contracts\Core\Repository\ContentTypeService;
-use Ibexa\Contracts\Core\Repository\LocationService;
 use Ibexa\Contracts\Core\Repository\SearchService;
 use Ibexa\Contracts\Core\Repository\Values\Content\Content;
 use Ibexa\Contracts\Core\Repository\Values\Content\Location;
@@ -36,20 +35,13 @@ final class QueryFieldService implements QueryFieldServiceInterface, QueryFieldL
     /** @var \Ibexa\Contracts\Core\Repository\ContentTypeService */
     private $contentTypeService;
 
-    /**
-     * @var \Ibexa\Contracts\Core\Repository\LocationService
-     */
-    private $locationService;
-
     public function __construct(
         SearchService $searchService,
         ContentTypeService $contentTypeService,
-        LocationService $locationService,
         QueryTypeRegistry $queryTypeRegistry
     ) {
         $this->searchService = $searchService;
         $this->contentTypeService = $contentTypeService;
-        $this->locationService = $locationService;
         $this->queryTypeRegistry = $queryTypeRegistry;
     }