Move from helper to Repository namespace + unit tests

src/bundle/Core/Resources/config/helpers.yml

@@ -65,7 +65,3 @@ services:
     Ibexa\Bundle\Core\SiteAccess\Config\IOConfigResolver:
         arguments:
             $complexConfigProcessor: '@Ibexa\Bundle\Core\SiteAccess\Config\ComplexConfigProcessor'
-
-    Ibexa\Core\Helper\RelationListHelper:
-        arguments:
-            $contentService: '@ibexa.api.service.content'

src/contracts/Repository/ContentService/RelationListFacade.php

@@ -0,0 +1,22 @@
+<?php
+
+/**
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
+ * @license For full copyright and license information view LICENSE file distributed with this source code.
+ */
+declare(strict_types=1);
+
+namespace Ibexa\Contracts\Core\Repository\ContentService;
+
+use Ibexa\Contracts\Core\Repository\Values\Content\VersionInfo;
+
+/**
+ * @internal
+ */
+interface RelationListFacade
+{
+    /**
+     * @return \Ibexa\Contracts\Core\Repository\Values\Content\Relation[]
+     */
+    public function getRelations(VersionInfo $versionInfo): iterable;
+}

src/lib/Helper/RelationListHelper.php → src/lib/Repository/ContentService/RelationListFacade.php

@@ -6,24 +6,24 @@
  */
 declare(strict_types=1);
 
-namespace Ibexa\Core\Helper;
+namespace Ibexa\Core\Repository\ContentService;
 
 use Ibexa\Contracts\Core\Repository\ContentService;
 use Ibexa\Contracts\Core\Repository\Iterator\BatchIterator;
 use Ibexa\Contracts\Core\Repository\Iterator\BatchIteratorAdapter\RelationListIteratorAdapter;
 use Ibexa\Contracts\Core\Repository\Values\Content\VersionInfo;
 
-final class RelationListHelper
+final class RelationListFacade implements ContentService\RelationListFacade
 {
     public function __construct(
         private readonly ContentService $contentService
     ) {
     }
 
     /**
-     * @return \Ibexa\Core\Repository\Values\Content\Relation[]
+     * @return \Ibexa\Contracts\Core\Repository\Values\Content\Relation[]
      */
-    public function getRelations(VersionInfo $versionInfo): array
+    public function getRelations(VersionInfo $versionInfo): iterable
     {
         $relationListIterator = new BatchIterator(
             new RelationListIteratorAdapter(
@@ -32,16 +32,12 @@ public function getRelations(VersionInfo $versionInfo): array
             )
         );
 
-        $relations = [];
         /** @var \Ibexa\Contracts\Core\Repository\Values\Content\RelationList\RelationListItemInterface $relationListItem */
         foreach ($relationListIterator as $relationListItem) {
             if ($relationListItem->hasRelation()) {
-                /** @var \Ibexa\Core\Repository\Values\Content\Relation $relation */
-                $relation = $relationListItem->getRelation();
-                $relations[] = $relation;
+                /** @var \Ibexa\Contracts\Core\Repository\Values\Content\Relation $relation */
+                yield $relationListItem->getRelation();
             }
         }
-
-        return $relations;
     }
 }

src/lib/Resources/settings/repository/inner.yml

@@ -272,3 +272,9 @@ services:
 
     Ibexa\Core\Repository\Validator\TargetContentValidatorInterface:
         alias: Ibexa\Core\Repository\Validator\TargetContentValidator
+
+    Ibexa\Contracts\Core\Repository\ContentService\RelationListFacade: '@Ibexa\Core\Repository\ContentService\RelationListFacade'
+
+    Ibexa\Core\Repository\ContentService\RelationListFacade:
+        arguments:
+            $contentService: '@ibexa.api.service.content'

tests/lib/Repository/ContentService/RelationListFacadeTest.php

@@ -0,0 +1,98 @@
+<?php
+
+/**
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
+ * @license For full copyright and license information view LICENSE file distributed with this source code.
+ */
+declare(strict_types=1);
+
+namespace Ibexa\Tests\Core\Repository\ContentService;
+
+use Ibexa\Contracts\Core\Repository\ContentService;
+use Ibexa\Contracts\Core\Repository\Values\Content\Relation;
+use Ibexa\Contracts\Core\Repository\Values\Content\RelationList;
+use Ibexa\Contracts\Core\Repository\Values\Content\RelationList\RelationListItemInterface;
+use Ibexa\Contracts\Core\Repository\Values\Content\VersionInfo;
+use Ibexa\Core\Repository\ContentService\RelationListFacade;
+use PHPUnit\Framework\TestCase;
+
+final class RelationListFacadeTest extends TestCase
+{
+    private ContentService $contentService;
+
+    private RelationListFacade $relationListFacade;
+
+    private VersionInfo $versionInfo;
+
+    protected function setUp(): void
+    {
+        $this->contentService = $this->createMock(ContentService::class);
+        $this->versionInfo = $this->createMock(VersionInfo::class);
+        $this->relationListFacade = new RelationListFacade($this->contentService);
+    }
+
+    public function testGetRelationsReturnsEmptyIteratorWhenNoRelations(): void
+    {
+        $relationList = $this->createMock(RelationList::class);
+        $relationList->method('getIterator')
+            ->willReturn(new \ArrayIterator([]));
+
+        $this->contentService->expects(self::once())
+            ->method('loadRelationList')
+            ->with($this->versionInfo)
+            ->willReturn($relationList);
+
+        $result = iterator_to_array($this->relationListFacade->getRelations($this->versionInfo));
+
+        self::assertEmpty($result);
+    }
+
+    public function testGetRelationsIgnoresItemsWithoutRelations(): void
+    {
+        $relationListItem = $this->createMock(RelationListItemInterface::class);
+        $relationListItem
+            ->expects(self::any())
+            ->method('hasRelation')
+            ->willReturn(false);
+
+        $relationList = $this->createMock(RelationList::class);
+        $relationList->method('getIterator')
+            ->willReturn(new \ArrayIterator([$relationListItem]));
+
+        $this->contentService->expects(self::once())
+            ->method('loadRelationList')
+            ->with($this->versionInfo)
+            ->willReturn($relationList);
+
+        $result = iterator_to_array($this->relationListFacade->getRelations($this->versionInfo));
+
+        self::assertEmpty($result);
+    }
+
+    public function testGetRelationsYieldsRelationsWhenPresent(): void
+    {
+        $relation = $this->createMock(Relation::class);
+
+        $relationListItem = $this->createMock(RelationListItemInterface::class);
+        $relationListItem->expects(self::any())
+            ->method('hasRelation')
+            ->willReturn(true);
+        $relationListItem->expects(self::any())
+            ->method('getRelation')
+            ->willReturn($relation);
+
+        $relationList = $this->createMock(RelationList::class);
+        $relationList->method('getIterator')
+            ->willReturn(new \ArrayIterator([$relationListItem]));
+
+        $this->contentService->expects(self::once())
+            ->method('loadRelationList')
+            ->with($this->versionInfo)
+            ->willReturn($relationList);
+
+        $result = iterator_to_array($this->relationListFacade->getRelations($this->versionInfo));
+
+        self::assertCount(1, $result);
+        self::assertSame($relation, $result[0]);
+    }
+}