Remove deprecated loading Content relations by ID

netgen · Sep 16, 2020 · b0ac1fb · b0ac1fb
1 parent 6618485
commit b0ac1fb
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 158 deletions.
diff --git a/lib/API/RelationService.php b/lib/API/RelationService.php
@@ -12,8 +12,8 @@
 interface RelationService
 {
     /**
-     * Load single related Content from $fieldDefinitionIdentifier field in Content with given
-     * $contentId, optionally limited by a list of $contentTypeIdentifiers.
+     * Load single related Content from $fieldDefinitionIdentifier field in the given
+     * $content, optionally limited by a list of $contentTypeIdentifiers.
      *
      * @param \Netgen\EzPlatformSiteApi\API\Values\Content $content
      * @param string $fieldDefinitionIdentifier
@@ -25,14 +25,14 @@ interface RelationService
      * @return null|\Netgen\EzPlatformSiteApi\API\Values\Content
      */
     public function loadFieldRelation(
-        $content,
+        Content $content,
         string $fieldDefinitionIdentifier,
         array $contentTypeIdentifiers = []
     ): ?Content;
 
     /**
-     * Load all related Content from $fieldDefinitionIdentifier field in Content with given
-     * $contentId, optionally limited by a list of $contentTypeIdentifiers and $limit.
+     * Load all related Content from $fieldDefinitionIdentifier field in the given
+     * $content, optionally limited by a list of $contentTypeIdentifiers and $limit.
      *
      * @param \Netgen\EzPlatformSiteApi\API\Values\Content $content
      * @param string $fieldDefinitionIdentifier
@@ -45,7 +45,7 @@ public function loadFieldRelation(
      * @return \Netgen\EzPlatformSiteApi\API\Values\Content[]
      */
     public function loadFieldRelations(
-        $content,
+        Content $content,
         string $fieldDefinitionIdentifier,
         array $contentTypeIdentifiers = [],
         ?int $limit = null

diff --git a/lib/Core/Site/RelationService.php b/lib/Core/Site/RelationService.php
@@ -51,7 +51,7 @@ public function __construct(
      * @throws \eZ\Publish\API\Repository\Exceptions\InvalidArgumentException
      */
     public function loadFieldRelation(
-        $content,
+        Content $content,
         string $fieldDefinitionIdentifier,
         array $contentTypeIdentifiers = []
     ): ?Content {
@@ -70,20 +70,11 @@ public function loadFieldRelation(
      * @throws \eZ\Publish\API\Repository\Exceptions\InvalidArgumentException
      */
     public function loadFieldRelations(
-        $content,
+        Content $content,
         string $fieldDefinitionIdentifier,
         array $contentTypeIdentifiers = [],
         ?int $limit = null
     ): array {
-        if (!$content instanceof Content) {
-            @trigger_error(
-                'Using loadFieldRelations() with Content ID as the first argument is deprecated since version 3.5, and will be removed in 4.0. Provide Content instance instead.',
-                E_USER_DEPRECATED
-            );
-
-            $content = $this->site->getLoadService()->loadContent($content);
-        }
-
         $field = $content->getField($fieldDefinitionIdentifier);
         $relationResolver = $this->relationResolverRegistry->get($field->fieldTypeIdentifier);
 

diff --git a/tests/lib/Integration/RelationServiceTest.php b/tests/lib/Integration/RelationServiceTest.php
@@ -33,142 +33,6 @@ public function testLoadFieldRelation(): void
     {
         [$identifier, $testApiContent, $testRelationId] = $this->prepareTestContent();
 
-        $relationService = $this->getSite()->getRelationService();
-        $content = $relationService->loadFieldRelation($testApiContent->id, $identifier);
-
-        $this->assertInstanceOf(Content::class, $content);
-        $this->assertEquals($testRelationId, $content->id);
-    }
-
-    /**
-     * @throws \ErrorException
-     * @throws \eZ\Publish\API\Repository\Exceptions\BadStateException
-     * @throws \eZ\Publish\API\Repository\Exceptions\ContentFieldValidationException
-     * @throws \eZ\Publish\API\Repository\Exceptions\ContentTypeFieldDefinitionValidationException
-     * @throws \eZ\Publish\API\Repository\Exceptions\ContentValidationException
-     * @throws \eZ\Publish\API\Repository\Exceptions\InvalidArgumentException
-     * @throws \eZ\Publish\API\Repository\Exceptions\NotFoundException
-     * @throws \eZ\Publish\API\Repository\Exceptions\UnauthorizedException
-     */
-    public function testLoadFieldRelations(): void
-    {
-        [$identifier, , , $testApiContent, $testRelationIds] = $this->prepareTestContent();
-
-        $relationService = $this->getSite()->getRelationService();
-        $contentItems = $relationService->loadFieldRelations($testApiContent->id, $identifier);
-
-        $this->assertSameSize($testRelationIds, $contentItems);
-
-        foreach ($testRelationIds as $index => $relationId) {
-            $content = $contentItems[$index];
-            $this->assertInstanceOf(Content::class, $content);
-            $this->assertEquals($relationId, $content->id);
-        }
-    }
-
-    /**
-     * @throws \ErrorException
-     * @throws \eZ\Publish\API\Repository\Exceptions\BadStateException
-     * @throws \eZ\Publish\API\Repository\Exceptions\ContentFieldValidationException
-     * @throws \eZ\Publish\API\Repository\Exceptions\ContentTypeFieldDefinitionValidationException
-     * @throws \eZ\Publish\API\Repository\Exceptions\ContentValidationException
-     * @throws \eZ\Publish\API\Repository\Exceptions\InvalidArgumentException
-     * @throws \eZ\Publish\API\Repository\Exceptions\NotFoundException
-     * @throws \eZ\Publish\API\Repository\Exceptions\UnauthorizedException
-     */
-    public function testLoadFieldRelationsWithTypeFilter(): void
-    {
-        [$identifier, , , $testApiContent, $testRelationIds] = $this->prepareTestContent();
-
-        $relationService = $this->getSite()->getRelationService();
-        $contentItems = $relationService->loadFieldRelations($testApiContent->id, $identifier, ['landing_page']);
-
-        $this->assertCount(1, $contentItems);
-
-        $this->assertInstanceOf(Content::class, $contentItems[0]);
-        $this->assertEquals($testRelationIds[0], $contentItems[0]->id);
-    }
-
-    /**
-     * @throws \ErrorException
-     * @throws \eZ\Publish\API\Repository\Exceptions\BadStateException
-     * @throws \eZ\Publish\API\Repository\Exceptions\ContentFieldValidationException
-     * @throws \eZ\Publish\API\Repository\Exceptions\ContentTypeFieldDefinitionValidationException
-     * @throws \eZ\Publish\API\Repository\Exceptions\ContentValidationException
-     * @throws \eZ\Publish\API\Repository\Exceptions\InvalidArgumentException
-     * @throws \eZ\Publish\API\Repository\Exceptions\NotFoundException
-     * @throws \eZ\Publish\API\Repository\Exceptions\UnauthorizedException
-     */
-    public function testLoadFieldRelationsWithLimit(): void
-    {
-        [$identifier, , , $testApiContent, $testRelationIds] = $this->prepareTestContent();
-
-        $relationService = $this->getSite()->getRelationService();
-        $contentItems = $relationService->loadFieldRelations($testApiContent->id, $identifier, [], 1);
-
-        $this->assertCount(1, $contentItems);
-
-        $this->assertInstanceOf(Content::class, $contentItems[0]);
-        $this->assertEquals($testRelationIds[0], $contentItems[0]->id);
-    }
-
-    /**
-     * @throws \ErrorException
-     * @throws \eZ\Publish\API\Repository\Exceptions\BadStateException
-     * @throws \eZ\Publish\API\Repository\Exceptions\ContentFieldValidationException
-     * @throws \eZ\Publish\API\Repository\Exceptions\ContentTypeFieldDefinitionValidationException
-     * @throws \eZ\Publish\API\Repository\Exceptions\ContentValidationException
-     * @throws \eZ\Publish\API\Repository\Exceptions\InvalidArgumentException
-     * @throws \eZ\Publish\API\Repository\Exceptions\NotFoundException
-     * @throws \eZ\Publish\API\Repository\Exceptions\UnauthorizedException
-     */
-    public function testLoadFieldRelationsWithTypeFilterAndLimit(): void
-    {
-        [$identifier, , , $testApiContent, $testRelationIds] = $this->prepareTestContent();
-
-        $relationService = $this->getSite()->getRelationService();
-        $contentItems = $relationService->loadFieldRelations($testApiContent->id, $identifier, ['feedback_form'], 1);
-
-        $this->assertCount(1, $contentItems);
-
-        $this->assertInstanceOf(Content::class, $contentItems[0]);
-        $this->assertEquals($testRelationIds[1], $contentItems[0]->id);
-    }
-
-    /**
-     * @throws \ErrorException
-     * @throws \eZ\Publish\API\Repository\Exceptions\BadStateException
-     * @throws \eZ\Publish\API\Repository\Exceptions\ContentFieldValidationException
-     * @throws \eZ\Publish\API\Repository\Exceptions\ContentTypeFieldDefinitionValidationException
-     * @throws \eZ\Publish\API\Repository\Exceptions\ContentValidationException
-     * @throws \eZ\Publish\API\Repository\Exceptions\InvalidArgumentException
-     * @throws \eZ\Publish\API\Repository\Exceptions\NotFoundException
-     * @throws \eZ\Publish\API\Repository\Exceptions\UnauthorizedException
-     */
-    public function testLoadFieldRelationsForNonexistentField(): void
-    {
-        [, , , $testApiContent] = $this->prepareTestContent();
-
-        $relationService = $this->getSite()->getRelationService();
-        $contentItems = $relationService->loadFieldRelations($testApiContent->id, 'nonexistent');
-
-        $this->assertCount(0, $contentItems);
-    }
-
-    /**
-     * @throws \ErrorException
-     * @throws \eZ\Publish\API\Repository\Exceptions\BadStateException
-     * @throws \eZ\Publish\API\Repository\Exceptions\ContentFieldValidationException
-     * @throws \eZ\Publish\API\Repository\Exceptions\ContentTypeFieldDefinitionValidationException
-     * @throws \eZ\Publish\API\Repository\Exceptions\ContentValidationException
-     * @throws \eZ\Publish\API\Repository\Exceptions\InvalidArgumentException
-     * @throws \eZ\Publish\API\Repository\Exceptions\NotFoundException
-     * @throws \eZ\Publish\API\Repository\Exceptions\UnauthorizedException
-     */
-    public function testLoadFieldRelationWithContent(): void
-    {
-        [$identifier, $testApiContent, $testRelationId] = $this->prepareTestContent();
-
         $relationService = $this->getSite()->getRelationService();
         $loadService = $this->getSite()->getLoadService();
         $testSiteContent = $loadService->loadContent($testApiContent->id);
@@ -188,7 +52,7 @@ public function testLoadFieldRelationWithContent(): void
      * @throws \eZ\Publish\API\Repository\Exceptions\NotFoundException
      * @throws \eZ\Publish\API\Repository\Exceptions\UnauthorizedException
      */
-    public function testLoadFieldRelationsWithContent(): void
+    public function testLoadFieldRelations(): void
     {
         [$identifier, , , $testApiContent, $testRelationIds] = $this->prepareTestContent();
 
@@ -216,7 +80,7 @@ public function testLoadFieldRelationsWithContent(): void
      * @throws \eZ\Publish\API\Repository\Exceptions\NotFoundException
      * @throws \eZ\Publish\API\Repository\Exceptions\UnauthorizedException
      */
-    public function testLoadFieldRelationsWithTypeFilterWithContent(): void
+    public function testLoadFieldRelationsWithTypeFilter(): void
     {
         [$identifier, , , $testApiContent, $testRelationIds] = $this->prepareTestContent();
 
@@ -241,7 +105,7 @@ public function testLoadFieldRelationsWithTypeFilterWithContent(): void
      * @throws \eZ\Publish\API\Repository\Exceptions\NotFoundException
      * @throws \eZ\Publish\API\Repository\Exceptions\UnauthorizedException
      */
-    public function testLoadFieldRelationsWithLimitWithContent(): void
+    public function testLoadFieldRelationsWithLimit(): void
     {
         [$identifier, , , $testApiContent, $testRelationIds] = $this->prepareTestContent();
 
@@ -266,7 +130,7 @@ public function testLoadFieldRelationsWithLimitWithContent(): void
      * @throws \eZ\Publish\API\Repository\Exceptions\NotFoundException
      * @throws \eZ\Publish\API\Repository\Exceptions\UnauthorizedException
      */
-    public function testLoadFieldRelationsWithTypeFilterAndLimitWithContent(): void
+    public function testLoadFieldRelationsWithTypeFilterAndLimit(): void
     {
         [$identifier, , , $testApiContent, $testRelationIds] = $this->prepareTestContent();
 
@@ -291,7 +155,7 @@ public function testLoadFieldRelationsWithTypeFilterAndLimitWithContent(): void
      * @throws \eZ\Publish\API\Repository\Exceptions\NotFoundException
      * @throws \eZ\Publish\API\Repository\Exceptions\UnauthorizedException
      */
-    public function testLoadFieldRelationsForNonexistentFieldWithContent(): void
+    public function testLoadFieldRelationsForNonexistentField(): void
     {
         [, , , $testApiContent] = $this->prepareTestContent();