Corrected CS

ibexa · Mar 4, 2024 · 1381a78 · 1381a78
1 parent d1affaa
commit 1381a78
Show file tree

Hide file tree

Showing 6 changed files with 3 additions and 27 deletions.
diff --git a/src/lib/Persistence/Cache/ContentHandler.php b/src/lib/Persistence/Cache/ContentHandler.php
@@ -518,9 +518,6 @@ public function loadRelations($sourceContentId, $sourceContentVersionNo = null,
         return $this->persistenceHandler->contentHandler()->loadRelations($sourceContentId, $sourceContentVersionNo, $type);
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function countRelations(int $sourceContentId, ?int $sourceContentVersionNo = null, ?int $type = null): int
     {
         $cacheItem = $this->cache->getItem(

diff --git a/src/lib/Persistence/Legacy/Content/Gateway.php b/src/lib/Persistence/Legacy/Content/Gateway.php
@@ -372,7 +372,7 @@ abstract public function countRelations(
     /**
      * Loads paginated data of related to/from $contentId.
      *
-     * @return array<mixed>
+     * @return array<array<string, mixed>>
      */
     abstract public function listRelations(
         int $contentId,

diff --git a/src/lib/Persistence/Legacy/Content/Gateway/DoctrineDatabase.php b/src/lib/Persistence/Legacy/Content/Gateway/DoctrineDatabase.php
@@ -1464,7 +1464,7 @@ public function countRelations(
                     'ezcontentobject_to.status = :status'
                 )
             )
-            ->where(
+            ->andWhere(
                 'l.from_contentobject_id = :content_id'
             )
             ->setParameter(
@@ -1533,7 +1533,7 @@ public function listRelations(
                     $expr->eq('ezcontentobject_to.status', ':status'),
                 )
             )
-            ->where(
+            ->andWhere(
                 'l.from_contentobject_id = :content_id'
             )
             ->setParameter(

diff --git a/src/lib/Persistence/Legacy/Content/Handler.php b/src/lib/Persistence/Legacy/Content/Handler.php
@@ -822,9 +822,6 @@ public function loadRelations($sourceContentId, $sourceContentVersionNo = null,
         );
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function countRelations(int $sourceContentId, ?int $sourceContentVersionNo = null, ?int $type = null): int
     {
         return $this->contentGateway->countRelations($sourceContentId, $sourceContentVersionNo, $type);

diff --git a/src/lib/Repository/ContentService.php b/src/lib/Repository/ContentService.php
@@ -2048,9 +2048,6 @@ protected function internalLoadRelations(APIVersionInfo $versionInfo): array
         return $relations;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function countRelations(APIVersionInfo $versionInfo): int
     {
         $function = 'versionread';

diff --git a/tests/integration/Core/Repository/ContentServiceTest.php b/tests/integration/Core/Repository/ContentServiceTest.php
@@ -3683,29 +3683,20 @@ public function testLoadRelationsSkipsDraftContent()
         );
     }
 
-    /**
-     * @covers \Ibexa\Contracts\Core\Repository\ContentService::countRelations
-     */
     public function testCountRelations(): void
     {
         $draft = $this->createContentWithRelations();
 
         self::assertEquals(2, $this->contentService->countRelations($draft->getVersionInfo()));
     }
 
-    /**
-     * @covers \Ibexa\Contracts\Core\Repository\ContentService::countRelations
-     */
     public function testCountRelationsReturnsZeroByDefault(): void
     {
         $draft = $this->createContentDraftVersion1();
 
         self::assertSame(0, $this->contentService->countRelations($draft->getVersionInfo()));
     }
 
-    /**
-     * @covers \Ibexa\Contracts\Core\Repository\ContentService::countRelations
-     */
     public function testCountRelationsForUnauthorizedUser(): void
     {
         $draft = $this->createContentWithRelations();
@@ -3715,9 +3706,6 @@ public function testCountRelationsForUnauthorizedUser(): void
         self::assertSame(0, $this->contentService->countRelations($draft->getVersionInfo()));
     }
 
-    /**
-     * @covers \Ibexa\Contracts\Core\Repository\ContentService::loadRelationList
-     */
     public function testLoadRelationList(): void
     {
         $draft = $this->createContentWithRelations();
@@ -3744,9 +3732,6 @@ public function testLoadRelationList(): void
         );
     }
 
-    /**
-     * @covers \Ibexa\Contracts\Core\Repository\ContentService::loadRelationList
-     */
     public function testLoadRelationListWithPagination(): void
     {
         $draft = $this->createContentWithRelations();
-Original file line number
+Diff line change
@@ Expand Up @@
             );
         }
-        /**
-         * {@inheritdoc}
-         */
         public function countRelations(int $sourceContentId, ?int $sourceContentVersionNo = null, ?int $type = null): int
         {
             return $this->contentGateway->countRelations($sourceContentId, $sourceContentVersionNo, $type);
@@ Expand Down @@