IBX10186 CS fixup

Ryan Lee · Ryan Lee · commit fa1ee68cbfd9 · 2025-06-21T01:05:26.000+01:00
diff --git a/src/contracts/Persistence/Content/Location/Handler.php b/src/contracts/Persistence/Content/Location/Handler.php
@@ -113,7 +113,7 @@ public function copySubtree($sourceId, $destinationParentId);
     /**
      * @param int|null $limit
      */
-    public function getSubtreeSize(string $path, /* ?int $limit = null */): int;
+    public function getSubtreeSize(string $path /* ?int $limit = null */): int;
 
     /**
      * Moves location identified by $sourceId into new parent identified by $destinationParentId.
diff --git a/src/contracts/Persistence/Filter/Content/Handler.php b/src/contracts/Persistence/Filter/Content/Handler.php
@@ -26,7 +26,7 @@ public function find(Filter $filter): iterable;
      * @param \Ibexa\Contracts\Core\Repository\Values\Filter\Filter $filter
      * @param int|null $limit
      */
-    public function count(Filter $filter, /* ?int $limit = null */): int;
+    public function count(Filter $filter /* ?int $limit = null */): int;
 }
 
 class_alias(Handler::class, 'eZ\Publish\SPI\Persistence\Filter\Content\Handler');
diff --git a/src/contracts/Persistence/Filter/Location/Handler.php b/src/contracts/Persistence/Filter/Location/Handler.php
@@ -26,7 +26,7 @@ public function find(Filter $filter): iterable;
      * @param \Ibexa\Contracts\Core\Repository\Values\Filter\Filter $filter
      * @param int|null $limit
      */
-    public function count(Filter $filter, /* ?int $limit = null */): int;
+    public function count(Filter $filter /* ?int $limit = null */): int;
 }
 
 class_alias(Handler::class, 'eZ\Publish\SPI\Persistence\Filter\Location\Handler');
diff --git a/src/contracts/Repository/ContentService.php b/src/contracts/Repository/ContentService.php
@@ -547,7 +547,7 @@ public function find(Filter $filter, ?array $languages = null): ContentList;
      * @param int|null $limit If set, the count will be limited to first $limit items found.
      *        In some cases it can significantly speed up a count operation for more complex filters.
      */
-    public function count(Filter $filter, ?array $languages = null, /* ?int $limit = null */): int;
+    public function count(Filter $filter, ?array $languages = null /* ?int $limit = null */): int;
 }
 
 class_alias(ContentService::class, 'eZ\Publish\API\Repository\ContentService');
diff --git a/src/contracts/Repository/Decorator/ContentServiceDecorator.php b/src/contracts/Repository/Decorator/ContentServiceDecorator.php
@@ -292,6 +292,7 @@ public function find(Filter $filter, ?array $languages = null): ContentList
     public function count(Filter $filter, ?array $languages = null /* ?int $limit = null */): int
     {
         $limit = func_num_args() > 2 ? func_get_arg(2) : null;
+
         return $this->innerService->count($filter, $languages, $limit);
     }
 }
diff --git a/src/contracts/Repository/Decorator/LocationServiceDecorator.php b/src/contracts/Repository/Decorator/LocationServiceDecorator.php
@@ -88,6 +88,7 @@ public function loadParentLocationsForDraftContent(
     public function getLocationChildCount(Location $location /* ?int $limit = null */): int
     {
         $limit = func_num_args() > 1 ? func_get_arg(1) : null;
+
         return $this->innerService->getLocationChildCount($location, $limit);
     }
 
@@ -97,6 +98,7 @@ public function getLocationChildCount(Location $location /* ?int $limit = null *
     public function getSubtreeSize(Location $location /* ?int $limit = null */): int
     {
         $limit = func_num_args() > 1 ? func_get_arg(1) : null;
+
         return $this->innerService->getSubtreeSize($location, $limit);
     }
 
@@ -174,6 +176,7 @@ public function find(Filter $filter, ?array $languages = null): LocationList
     public function count(Filter $filter, ?array $languages = null /* ?int $limit = null */): int
     {
         $limit = func_num_args() > 2 ? func_get_arg(2) : null;
+
         return $this->innerService->count($filter, $languages, $limit);
     }
 }
diff --git a/src/contracts/Repository/LocationService.php b/src/contracts/Repository/LocationService.php
@@ -131,7 +131,7 @@ public function getLocationChildCount(Location $location /* ?int $limit = null *
      * Return the subtree size of a given location.
      *
      * Warning! This method is not permission aware by design.
-     * 
+     *
      * @param int|null $limit
      */
     public function getSubtreeSize(Location $location /* ?int $limit = null */): int;
@@ -280,7 +280,7 @@ public function find(Filter $filter, ?array $languages = null): LocationList;
      * @param int|null $limit If set, the count will be limited to first $limit items found.
      *        In some cases it can significantly speed up a count operation for more complex filters.
      */
-    public function count(Filter $filter, ?array $languages = null, /* ?int $limit = null */): int;
+    public function count(Filter $filter, ?array $languages = null /* ?int $limit = null */): int;
 }
 
 class_alias(LocationService::class, 'eZ\Publish\API\Repository\LocationService');
diff --git a/src/lib/Persistence/Cache/LocationHandler.php b/src/lib/Persistence/Cache/LocationHandler.php
@@ -259,8 +259,8 @@ public function copySubtree($sourceId, $destinationParentId, $newOwnerId = null)
     /**
      * {@inheritdoc}
      */
-    public function getSubtreeSize(string $path, /* ?int $limit = null */): int
-    {   
+    public function getSubtreeSize(string $path /* ?int $limit = null */): int
+    {
         $limit = func_num_args() > 1 ? func_get_arg(1) : null;
         $this->logger->logCall(__METHOD__, [
             'path' => $path,
diff --git a/src/lib/Persistence/Legacy/Content/Location/Gateway/DoctrineDatabase.php b/src/lib/Persistence/Legacy/Content/Location/Gateway/DoctrineDatabase.php
@@ -51,7 +51,7 @@ final class DoctrineDatabase extends Gateway
     /** @var \Ibexa\Core\Search\Legacy\Content\Common\Gateway\SortClauseConverter */
     private $trashSortClauseConverter;
 
-    /** @var Ibexa\Core\Persistence\Legacy\Filter\Query\LimitedCountQueryBuilder */
+    /** @var \Ibexa\Core\Persistence\Legacy\Filter\Query\LimitedCountQueryBuilder */
     private $limitedCountQueryBuilder;
 
     /**
diff --git a/src/lib/Persistence/Legacy/Filter/Gateway/Content/Doctrine/DoctrineGateway.php b/src/lib/Persistence/Legacy/Filter/Gateway/Content/Doctrine/DoctrineGateway.php
@@ -8,7 +8,6 @@
 
 namespace Ibexa\Core\Persistence\Legacy\Filter\Gateway\Content\Doctrine;
 
-use Ibexa\Core\Persistence\Legacy\Filter\Query\LimitedCountQueryBuilder;
 use function array_filter;
 use Doctrine\DBAL\Connection;
 use Doctrine\DBAL\DBALException;
@@ -23,6 +22,7 @@
 use Ibexa\Core\Persistence\Legacy\Content\Gateway as ContentGateway;
 use Ibexa\Core\Persistence\Legacy\Content\Location\Gateway as LocationGateway;
 use Ibexa\Core\Persistence\Legacy\Filter\Gateway\Gateway;
+use Ibexa\Core\Persistence\Legacy\Filter\Query\LimitedCountQueryBuilder;
 use function iterator_to_array;
 use function sprintf;
 use Traversable;
@@ -69,7 +69,7 @@ final class DoctrineGateway implements Gateway
     /** @var \Ibexa\Contracts\Core\Persistence\Filter\SortClauseVisitor */
     private $sortClauseVisitor;
 
-    /** @var Ibexa\Core\Persistence\Legacy\Filter\Query\LimitedCountQueryBuilder */
+    /** @var \Ibexa\Core\Persistence\Legacy\Filter\Query\LimitedCountQueryBuilder */
     private $limitedCountQueryBuilder;
 
     public function __construct(
diff --git a/src/lib/Persistence/Legacy/Filter/Gateway/Location/Doctrine/DoctrineGateway.php b/src/lib/Persistence/Legacy/Filter/Gateway/Location/Doctrine/DoctrineGateway.php
@@ -65,7 +65,7 @@ public function count(FilteringCriterion $criterion, ?int $limit = null): int
         $query = $this->buildQuery($criterion);
 
         $query->select($this->getDatabasePlatform()->getCountExpression('DISTINCT location.node_id'));
-        
+
         $query = $this->limitedCountQueryBuilder->wrap(
             $query,
             'location.node_id',
diff --git a/src/lib/Persistence/Legacy/Filter/Query/LimitedCountQueryBuilder.php b/src/lib/Persistence/Legacy/Filter/Query/LimitedCountQueryBuilder.php
@@ -8,9 +8,7 @@
 
 namespace Ibexa\Core\Persistence\Legacy\Filter\Query;
 
-
 use Doctrine\DBAL\Connection;
-use Doctrine\DBAL\Exception;
 use Doctrine\DBAL\Query\QueryBuilder;
 use Ibexa\Core\Base\Exceptions\InvalidArgumentException;
 
@@ -23,15 +21,14 @@ final class LimitedCountQueryBuilder
     /**
      * @var \Doctrine\DBAL\Connection
      */
-    private  $connection;
+    private $connection;
 
     public function __construct(
         Connection $connection,
     ) {
         $this->connection = $connection;
     }
 
-
     /**
      * Takes a QueryBuilder and wraps it in a count query with a limit if a limit is provided.
      * This performs the following transformation to the passed query.
@@ -40,8 +37,9 @@ public function __construct(
      * SELECT COUNT(*) FROM (SELECT DISTINCT someField FROM XXX WHERE YYY LIMIT N) AS csub;.
      *
      * @phpstan-param positive-int $limit
-     * @throws InvalidArgumentException
-     * @throws Exception
+     *
+     * @throws \Ibexa\Core\Base\Exceptions\InvalidArgumentException
+     * @throws \Doctrine\DBAL\Exception
      */
     public function wrap(
         QueryBuilder $queryBuilder,
@@ -52,7 +50,7 @@ public function wrap(
             return $queryBuilder;
         }
 
-        if($limit <= 0) {
+        if ($limit <= 0) {
             throw new InvalidArgumentException('$limit', 'Limit must be greater than 0');
         }
 
diff --git a/src/lib/Repository/ContentService.php b/src/lib/Repository/ContentService.php
@@ -2712,9 +2712,9 @@ public function find(Filter $filter, ?array $languages = null): ContentList
 
         return new ContentList($contentItemsIterator->getTotalCount(), $contentItems);
     }
-    
+
     /**
-     * @param null|int $limit
+     * @param int|null $limit
      */
     public function count(Filter $filter, ?array $languages = null /*?int $limit = null */): int
     {
diff --git a/src/lib/Repository/LocationService.php b/src/lib/Repository/LocationService.php
@@ -950,7 +950,7 @@ public function find(Filter $filter, ?array $languages = null): LocationList
     }
 
     /**
-     * @param null|int $limit
+     * @param int|null $limit
      */
     public function count(Filter $filter, ?array $languages = null /* ?int $limit = null */): int
     {
diff --git a/src/lib/Repository/SiteAccessAware/ContentService.php b/src/lib/Repository/SiteAccessAware/ContentService.php
@@ -298,11 +298,12 @@ public function find(Filter $filter, ?array $languages = null): ContentList
     }
 
     /**
-     * @param null|int $limit
+     * @param int|null $limit
      */
-    public function count(Filter $filter, ?array $languages = null, /*?int $limit = null */): int
+    public function count(Filter $filter, ?array $languages = null /*?int $limit = null */): int
     {
         $limit = func_num_args() > 2 ? func_get_arg(2) : null;
+
         return $this->service->count(
             $filter,
             $this->languageResolver->getPrioritizedLanguages($languages),
diff --git a/src/lib/Repository/SiteAccessAware/LocationService.php b/src/lib/Repository/SiteAccessAware/LocationService.php
@@ -107,15 +107,17 @@ public function loadParentLocationsForDraftContent(VersionInfo $versionInfo, ?ar
     public function getLocationChildCount(Location $location /* ?int $limit = null */): int
     {
         $limit = func_num_args() > 1 ? func_get_arg(1) : null;
+
         return $this->service->getLocationChildCount($location, $limit);
     }
 
     /**
      * @param int|null $limit
      */
-    public function getSubtreeSize(Location $location, /* ?int $limit = null */): int
+    public function getSubtreeSize(Location $location /* ?int $limit = null */): int
     {
         $limit = func_num_args() > 1 ? func_get_arg(1) : null;
+
         return $this->service->getSubtreeSize($location, $limit);
     }
 
@@ -203,6 +205,7 @@ public function find(Filter $filter, ?array $languages = null): LocationList
     public function count(Filter $filter, ?array $languages = null /* ?int $limit = null */): int
     {
         $limit = func_num_args() > 2 ? func_get_arg(2) : null;
+
         return $this->service->count(
             $filter,
             $this->languageResolver->getPrioritizedLanguages($languages),
diff --git a/tests/lib/Persistence/Legacy/Filter/Query/LimitedCountQueryBuilderTest.php b/tests/lib/Persistence/Legacy/Filter/Query/LimitedCountQueryBuilderTest.php
@@ -10,19 +10,19 @@
 
 use Doctrine\DBAL\Connection;
 use Doctrine\DBAL\Platforms\AbstractPlatform;
-use Doctrine\DBAL\Query\QueryBuilder;
 use eZ\Publish\Core\Base\Exceptions\InvalidArgumentException;
 use eZ\Publish\Core\Persistence\Legacy\Tests\TestCase;
 use Ibexa\Core\Persistence\Legacy\Filter\Query\LimitedCountQueryBuilder;
 
 /**
  * @covers \Ibexa\Core\Persistence\Legacy\Filter\Query\LimitedCountQueryBuilder
  */
-
 class LimitedCountQueryBuilderTest extends TestCase
 {
     private Connection $connectionMock;
+
     private AbstractPlatform $platformMock;
+
     private LimitedCountQueryBuilder $limitedCountQueryBuilder;
 
     protected function setUp(): void
@@ -74,11 +74,5 @@ public function testWrapWrapsQueryBuilderCorrectly(): void
 
         $expectedSql = 'SELECT COUNT(*) FROM (SELECT someField FROM someTable WHERE someCondition = :condition LIMIT 10) csub';
         $this->assertEquals($expectedSql, $wrappedQueryBuilder->getSQL());
-
-        
-
-        
     }
-
-    
-}
+}

Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@ public function find(Filter $filter): iterable;`
`26`	`26`	`* @param \Ibexa\Contracts\Core\Repository\Values\Filter\Filter $filter`
`27`	`27`	`* @param int\|null $limit`
`28`	`28`	`*/`
`29`		`- public function count(Filter $filter, /* ?int $limit = null */): int;`
	`29`	`+ public function count(Filter $filter /* ?int $limit = null */): int;`
`30`	`30`	`}`
`31`	`31`
`32`	`32`	`class_alias(Handler::class, 'eZ\Publish\SPI\Persistence\Filter\Content\Handler');`
Original file line number	Diff line number	Diff line change
`@@ -547,7 +547,7 @@ public function find(Filter $filter, ?array $languages = null): ContentList;`
`547`	`547`	`* @param int\|null $limit If set, the count will be limited to first $limit items found.`
`548`	`548`	`* In some cases it can significantly speed up a count operation for more complex filters.`
`549`	`549`	`*/`
`550`		`- public function count(Filter $filter, ?array $languages = null, /* ?int $limit = null */): int;`
	`550`	`+ public function count(Filter $filter, ?array $languages = null /* ?int $limit = null */): int;`
`551`	`551`	`}`
`552`	`552`
`553`	`553`	`class_alias(ContentService::class, 'eZ\Publish\API\Repository\ContentService');`
Original file line number	Diff line number	Diff line change
`@@ -292,6 +292,7 @@ public function find(Filter $filter, ?array $languages = null): ContentList`
`292`	`292`	`public function count(Filter $filter, ?array $languages = null /* ?int $limit = null */): int`
`293`	`293`	`{`
`294`	`294`	`$limit = func_num_args() > 2 ? func_get_arg(2) : null;`
	`295`	`+`
`295`	`296`	`return $this->innerService->count($filter, $languages, $limit);`
`296`	`297`	`}`
`297`	`298`	`}`
Original file line number	Diff line number	Diff line change
`@@ -88,6 +88,7 @@ public function loadParentLocationsForDraftContent(`
`88`	`88`	`public function getLocationChildCount(Location $location /* ?int $limit = null */): int`
`89`	`89`	`{`
`90`	`90`	`$limit = func_num_args() > 1 ? func_get_arg(1) : null;`
	`91`	`+`
`91`	`92`	`return $this->innerService->getLocationChildCount($location, $limit);`
`92`	`93`	`}`
`93`	`94`
`@@ -97,6 +98,7 @@ public function getLocationChildCount(Location $location /* ?int $limit = null *`
`97`	`98`	`public function getSubtreeSize(Location $location /* ?int $limit = null */): int`
`98`	`99`	`{`
`99`	`100`	`$limit = func_num_args() > 1 ? func_get_arg(1) : null;`
	`101`	`+`
`100`	`102`	`return $this->innerService->getSubtreeSize($location, $limit);`
`101`	`103`	`}`
`102`	`104`
`@@ -174,6 +176,7 @@ public function find(Filter $filter, ?array $languages = null): LocationList`
`174`	`176`	`public function count(Filter $filter, ?array $languages = null /* ?int $limit = null */): int`
`175`	`177`	`{`
`176`	`178`	`$limit = func_num_args() > 2 ? func_get_arg(2) : null;`
	`179`	`+`
`177`	`180`	`return $this->innerService->count($filter, $languages, $limit);`
`178`	`181`	`}`
`179`	`182`	`}`