IBX-8534: Dropped ContentService::loadRelations usage (#72)

* IBX-8534: Dropped ContentService::loadRelations usage * Dropped ContentTypeService argument from service definition
ibexa · Oct 23, 2024 · 564ea4e · 564ea4e
1 parent f715567
commit 564ea4e
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 22 deletions.
diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon
@@ -605,11 +605,6 @@ parameters:
 			count: 1
 			path: src/lib/Resolver/ContentResolver.php
 
-		-
-			message: "#^Method Ibexa\\\\GraphQL\\\\Resolver\\\\ContentResolver\\:\\:findContentRelations\\(\\) should return array\\<Ibexa\\\\Contracts\\\\Core\\\\Repository\\\\Values\\\\Content\\\\Relation\\> but returns iterable\\<Ibexa\\\\Contracts\\\\Core\\\\Repository\\\\Values\\\\Content\\\\Relation\\>\\.$#"
-			count: 1
-			path: src/lib/Resolver/ContentResolver.php
-
 		-
 			message: "#^Method Ibexa\\\\GraphQL\\\\Resolver\\\\ContentResolver\\:\\:findContentReverseRelations\\(\\) has no return type specified\\.$#"
 			count: 1
@@ -655,11 +650,6 @@ parameters:
 			count: 1
 			path: src/lib/Resolver/ContentResolver.php
 
-		-
-			message: "#^Property Ibexa\\\\GraphQL\\\\Resolver\\\\ContentResolver\\:\\:\\$contentTypeService is never read, only written\\.$#"
-			count: 1
-			path: src/lib/Resolver/ContentResolver.php
-
 		-
 			message: "#^Method Ibexa\\\\GraphQL\\\\Resolver\\\\ContentThumbnailResolver\\:\\:resolveContentThumbnail\\(\\) return type has no value type specified in iterable type array\\.$#"
 			count: 1

diff --git a/src/bundle/Resources/config/services/resolvers.yaml b/src/bundle/Resources/config/services/resolvers.yaml
@@ -27,7 +27,6 @@ services:
         arguments:
             $contentService: '@ibexa.siteaccessaware.service.content'
             $searchService: '@ibexa.siteaccessaware.service.search'
-            $contentTypeService: '@ibexa.siteaccessaware.service.content_type'
 
     Ibexa\GraphQL\Resolver\DomainContentResolver:
         tags:

diff --git a/src/lib/Resolver/ContentResolver.php b/src/lib/Resolver/ContentResolver.php
@@ -8,10 +8,11 @@
 namespace Ibexa\GraphQL\Resolver;
 
 use Ibexa\Contracts\Core\Repository\ContentService;
-use Ibexa\Contracts\Core\Repository\ContentTypeService;
 use Ibexa\Contracts\Core\Repository\SearchService;
 use Ibexa\Contracts\Core\Repository\Values\Content\ContentInfo;
 use Ibexa\Contracts\Core\Repository\Values\Content\Query;
+use Ibexa\Contracts\Core\Repository\Values\Content\Relation;
+use Ibexa\Contracts\Core\Repository\Values\Content\RelationList\RelationListItemInterface;
 use Ibexa\Contracts\Core\Repository\Values\Content\Search\SearchHit;
 use Ibexa\Contracts\Core\Repository\Values\Content\VersionInfo;
 
@@ -30,16 +31,10 @@ class ContentResolver
      */
     private $searchService;
 
-    /**
-     * @var \Ibexa\Contracts\Core\Repository\ContentTypeService
-     */
-    private $contentTypeService;
-
-    public function __construct(ContentService $contentService, SearchService $searchService, ContentTypeService $contentTypeService)
+    public function __construct(ContentService $contentService, SearchService $searchService)
     {
         $this->contentService = $contentService;
         $this->searchService = $searchService;
-        $this->contentTypeService = $contentTypeService;
     }
 
     public function findContentByType($contentTypeId)
@@ -63,9 +58,12 @@ static function (SearchHit $searchHit) {
      */
     public function findContentRelations(ContentInfo $contentInfo, $version = null)
     {
-        return $this->contentService->loadRelations(
-            $this->contentService->loadVersionInfo($contentInfo, $version)
-        );
+        return array_filter(array_map(
+            static fn (RelationListItemInterface $relationListItem): ?Relation => $relationListItem->getRelation(),
+            $this->contentService->loadRelationList(
+                $this->contentService->loadVersionInfo($contentInfo, $version)
+            )->items
+        ));
     }
 
     public function findContentReverseRelations(ContentInfo $contentInfo)