ibexa · ryanolee · Jun 19, 2025 · Jun 19, 2025 · Jun 20, 2025 · Jun 20, 2025
diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon
@@ -6492,6 +6492,12 @@ parameters:
 			count: 1
 			path: src/contracts/Persistence/Content/VersionInfo.php
 
+		-
+			message: '#^PHPDoc tag @param references unknown parameter\: \$limit$#'
+			identifier: parameter.notFound
+			count: 1
+			path: src/contracts/Persistence/Filter/Content/Handler.php
+
 		-
 			message: '#^Method Ibexa\\Contracts\\Core\\Persistence\\Filter\\Doctrine\\FilteringQueryBuilder\:\:buildOperatorBasedCriterionConstraint\(\) has parameter \$criterionValue with no value type specified in iterable type array\.$#'
 			identifier: missingType.iterableValue
@@ -6522,6 +6528,12 @@ parameters:
 			count: 1
 			path: src/contracts/Persistence/Filter/LazyListIterator.php
 
+		-
+			message: '#^PHPDoc tag @param references unknown parameter\: \$limit$#'
+			identifier: parameter.notFound
+			count: 1
+			path: src/contracts/Persistence/Filter/Location/Handler.php
+
 		-
 			message: '#^Method Ibexa\\Contracts\\Core\\Persistence\\Handler\:\:beginTransaction\(\) has no return type specified\.$#'
 			identifier: missingType.return
@@ -6678,6 +6690,18 @@ parameters:
 			count: 1
 			path: src/contracts/Repository/ContentService.php
 
+		-
+			message: '#^PHPDoc tag @param references unknown parameter\: \$limit$#'
+			identifier: parameter.notFound
+			count: 1
+			path: src/contracts/Repository/ContentService.php
+
+		-
+			message: '#^Method Ibexa\\Contracts\\Core\\Repository\\ContentService\:\:count\(\) invoked with 3 parameters, 1\-2 required\.$#'
+			identifier: arguments.count
+			count: 1
+			path: src/contracts/Repository/Decorator/ContentServiceDecorator.php
+
 		-
 			message: '#^Method Ibexa\\Contracts\\Core\\Repository\\Decorator\\ContentServiceDecorator\:\:validate\(\) has parameter \$context with no value type specified in iterable type array\.$#'
 			identifier: missingType.iterableValue
@@ -6690,12 +6714,42 @@ parameters:
 			count: 1
 			path: src/contracts/Repository/Decorator/ContentServiceDecorator.php
 
+		-
+			message: '#^PHPDoc tag @param references unknown parameter\: \$limit$#'
+			identifier: parameter.notFound
+			count: 1
+			path: src/contracts/Repository/Decorator/ContentServiceDecorator.php
+
 		-
 			message: '#^Method Ibexa\\Contracts\\Core\\Repository\\Decorator\\LocationServiceDecorator\:\:loadLocationList\(\) has parameter \$locationIds with no value type specified in iterable type array\.$#'
 			identifier: missingType.iterableValue
 			count: 1
 			path: src/contracts/Repository/Decorator/LocationServiceDecorator.php
 
+		-
+			message: '#^Method Ibexa\\Contracts\\Core\\Repository\\LocationService\:\:count\(\) invoked with 3 parameters, 1\-2 required\.$#'
+			identifier: arguments.count
+			count: 1
+			path: src/contracts/Repository/Decorator/LocationServiceDecorator.php
+
+		-
+			message: '#^Method Ibexa\\Contracts\\Core\\Repository\\LocationService\:\:getLocationChildCount\(\) invoked with 2 parameters, 1 required\.$#'
+			identifier: arguments.count
+			count: 1
+			path: src/contracts/Repository/Decorator/LocationServiceDecorator.php
+
+		-
+			message: '#^Method Ibexa\\Contracts\\Core\\Repository\\LocationService\:\:getSubtreeSize\(\) invoked with 2 parameters, 1 required\.$#'
+			identifier: arguments.count
+			count: 1
+			path: src/contracts/Repository/Decorator/LocationServiceDecorator.php
+
+		-
+			message: '#^PHPDoc tag @param references unknown parameter\: \$limit$#'
+			identifier: parameter.notFound
+			count: 3
+			path: src/contracts/Repository/Decorator/LocationServiceDecorator.php
+
 		-
 			message: '#^Method Ibexa\\Contracts\\Core\\Repository\\Decorator\\SearchServiceDecorator\:\:suggest\(\) has no return type specified\.$#'
 			identifier: missingType.return
@@ -8280,6 +8334,12 @@ parameters:
 			count: 1
 			path: src/contracts/Repository/LocationService.php
 
+		-
+			message: '#^PHPDoc tag @param references unknown parameter\: \$limit$#'
+			identifier: parameter.notFound
+			count: 3
+			path: src/contracts/Repository/LocationService.php
+
 		-
 			message: '#^PHPDoc tag @param for parameter \$objectStateGroupId with type mixed is not subtype of native type int\.$#'
 			identifier: parameter.phpDocType
@@ -17478,6 +17538,12 @@ parameters:
 			count: 1
 			path: src/lib/Persistence/Cache/LocationHandler.php
 
+		-
+			message: '#^Method Ibexa\\Contracts\\Core\\Persistence\\Content\\Location\\Handler\:\:getSubtreeSize\(\) invoked with 2 parameters, 1 required\.$#'
+			identifier: arguments.count
+			count: 1
+			path: src/lib/Persistence/Cache/LocationHandler.php
+
 		-
 			message: '#^Method Ibexa\\Core\\Persistence\\Cache\\LocationHandler\:\:changeMainLocation\(\) has no return type specified\.$#'
 			identifier: missingType.return
@@ -24234,6 +24300,12 @@ parameters:
 			count: 1
 			path: src/lib/Repository/ContentService.php
 
+		-
+			message: '#^Method Ibexa\\Contracts\\Core\\Persistence\\Filter\\Content\\Handler\:\:count\(\) invoked with 2 parameters, 1 required\.$#'
+			identifier: arguments.count
+			count: 1
+			path: src/lib/Repository/ContentService.php
+
 		-
 			message: '#^Method Ibexa\\Core\\Repository\\ContentService\:\:__construct\(\) has parameter \$settings with no value type specified in iterable type array\.$#'
 			identifier: missingType.iterableValue
@@ -24294,6 +24366,12 @@ parameters:
 			count: 1
 			path: src/lib/Repository/ContentService.php
 
+		-
+			message: '#^PHPDoc tag @param references unknown parameter\: \$limit$#'
+			identifier: parameter.notFound
+			count: 1
+			path: src/lib/Repository/ContentService.php
+
 		-
 			message: '#^PHPDoc tag @var has invalid value \(\$content \\Ibexa\\Core\\Repository\\Values\\Content\\Content\)\: Unexpected token "\$content", expected type at offset 9 on line 1$#'
 			identifier: phpDoc.parseError
@@ -24552,12 +24630,24 @@ parameters:
 			count: 1
 			path: src/lib/Repository/LocationService.php
 
+		-
+			message: '#^Method Ibexa\\Contracts\\Core\\Persistence\\Content\\Location\\Handler\:\:getSubtreeSize\(\) invoked with 2 parameters, 1 required\.$#'
+			identifier: arguments.count
+			count: 1
+			path: src/lib/Repository/LocationService.php
+
 		-
 			message: '#^Method Ibexa\\Contracts\\Core\\Persistence\\Content\\UrlAlias\\Handler\:\:publishUrlAliasForLocation\(\) invoked with 6 parameters, 4\-5 required\.$#'
 			identifier: arguments.count
 			count: 1
 			path: src/lib/Repository/LocationService.php
 
+		-
+			message: '#^Method Ibexa\\Contracts\\Core\\Persistence\\Filter\\Location\\Handler\:\:count\(\) invoked with 2 parameters, 1 required\.$#'
+			identifier: arguments.count
+			count: 1
+			path: src/lib/Repository/LocationService.php
+
 		-
 			message: '#^Method Ibexa\\Core\\Repository\\LocationService\:\:__construct\(\) has parameter \$settings with no value type specified in iterable type array\.$#'
 			identifier: missingType.iterableValue
@@ -24570,6 +24660,12 @@ parameters:
 			count: 1
 			path: src/lib/Repository/LocationService.php
 
+		-
+			message: '#^PHPDoc tag @param references unknown parameter\: \$limit$#'
+			identifier: parameter.notFound
+			count: 2
+			path: src/lib/Repository/LocationService.php
+
 		-
 			message: '#^Property Ibexa\\Core\\Repository\\LocationService\:\:\$repository \(Ibexa\\Core\\Repository\\Repository\) does not accept Ibexa\\Contracts\\Core\\Repository\\Repository\.$#'
 			identifier: assign.propertyType
@@ -25512,6 +25608,12 @@ parameters:
 			count: 1
 			path: src/lib/Repository/SettingService.php
 
+		-
+			message: '#^Method Ibexa\\Contracts\\Core\\Repository\\ContentService\:\:count\(\) invoked with 3 parameters, 1\-2 required\.$#'
+			identifier: arguments.count
+			count: 1
+			path: src/lib/Repository/SiteAccessAware/ContentService.php
+
 		-
 			message: '#^Method Ibexa\\Core\\Repository\\SiteAccessAware\\ContentService\:\:validate\(\) has parameter \$context with no value type specified in iterable type array\.$#'
 			identifier: missingType.iterableValue
@@ -25524,6 +25626,12 @@ parameters:
 			count: 1
 			path: src/lib/Repository/SiteAccessAware/ContentService.php
 
+		-
+			message: '#^PHPDoc tag @param references unknown parameter\: \$limit$#'
+			identifier: parameter.notFound
+			count: 1
+			path: src/lib/Repository/SiteAccessAware/ContentService.php
+
 		-
 			message: '#^Method Ibexa\\Core\\Repository\\SiteAccessAware\\Language\\AbstractLanguageResolver\:\:getPrioritizedLanguages\(\) has parameter \$forcedLanguages with no value type specified in iterable type array\.$#'
 			identifier: missingType.iterableValue
@@ -25542,12 +25650,36 @@ parameters:
 			count: 1
 			path: src/lib/Repository/SiteAccessAware/Language/LanguageResolver.php
 
+		-
+			message: '#^Method Ibexa\\Contracts\\Core\\Repository\\LocationService\:\:count\(\) invoked with 3 parameters, 1\-2 required\.$#'
+			identifier: arguments.count
+			count: 1
+			path: src/lib/Repository/SiteAccessAware/LocationService.php
+
+		-
+			message: '#^Method Ibexa\\Contracts\\Core\\Repository\\LocationService\:\:getLocationChildCount\(\) invoked with 2 parameters, 1 required\.$#'
+			identifier: arguments.count
+			count: 1
+			path: src/lib/Repository/SiteAccessAware/LocationService.php
+
+		-
+			message: '#^Method Ibexa\\Contracts\\Core\\Repository\\LocationService\:\:getSubtreeSize\(\) invoked with 2 parameters, 1 required\.$#'
+			identifier: arguments.count
+			count: 1
+			path: src/lib/Repository/SiteAccessAware/LocationService.php
+
 		-
 			message: '#^Method Ibexa\\Core\\Repository\\SiteAccessAware\\LocationService\:\:loadLocationList\(\) has parameter \$locationIds with no value type specified in iterable type array\.$#'
 			identifier: missingType.iterableValue
 			count: 1
 			path: src/lib/Repository/SiteAccessAware/LocationService.php
 
+		-
+			message: '#^PHPDoc tag @param references unknown parameter\: \$limit$#'
+			identifier: parameter.notFound
+			count: 2
+			path: src/lib/Repository/SiteAccessAware/LocationService.php
+
 		-
 			message: '#^Property Ibexa\\Core\\Repository\\SiteAccessAware\\Repository\:\:\$notificationService \(Ibexa\\Core\\Repository\\NotificationService\) does not accept Ibexa\\Core\\Repository\\SiteAccessAware\\NotificationService\.$#'
 			identifier: assign.propertyType
@@ -41823,7 +41955,7 @@ parameters:
 		-
 			message: '#^Cannot access property \$id on Ibexa\\Contracts\\Core\\Repository\\Values\\Content\\Location\|null\.$#'
 			identifier: property.nonObject
-			count: 11
+			count: 9
 			path: tests/integration/Core/Repository/LocationServiceTest.php
 
 		-
@@ -41832,6 +41964,18 @@ parameters:
 			count: 2
 			path: tests/integration/Core/Repository/LocationServiceTest.php
 
+		-
+			message: '#^Method Ibexa\\Contracts\\Core\\Repository\\LocationService\:\:getLocationChildCount\(\) invoked with 2 parameters, 1 required\.$#'
+			identifier: arguments.count
+			count: 1
+			path: tests/integration/Core/Repository/LocationServiceTest.php
+
+		-
+			message: '#^Method Ibexa\\Contracts\\Core\\Repository\\LocationService\:\:getSubtreeSize\(\) invoked with 2 parameters, 1 required\.$#'
+			identifier: arguments.count
+			count: 2
+			path: tests/integration/Core/Repository/LocationServiceTest.php
+
 		-
 			message: '#^Method Ibexa\\Tests\\Integration\\Core\\Repository\\LocationServiceTest\:\:assertAliasesBeforeCopy\(\) has no return type specified\.$#'
 			identifier: missingType.return
@@ -42030,12 +42174,6 @@ parameters:
 			count: 1
 			path: tests/integration/Core/Repository/LocationServiceTest.php
 
-		-
-			message: '#^Method Ibexa\\Tests\\Integration\\Core\\Repository\\LocationServiceTest\:\:testGetSubtreeSize\(\) should return Ibexa\\Contracts\\Core\\Repository\\Values\\Content\\Location but returns Ibexa\\Contracts\\Core\\Repository\\Values\\Content\\Location\|null\.$#'
-			identifier: return.type
-			count: 1
-			path: tests/integration/Core/Repository/LocationServiceTest.php
-
 		-
 			message: '#^Method Ibexa\\Tests\\Integration\\Core\\Repository\\LocationServiceTest\:\:testHideLocation\(\) has no return type specified\.$#'
 			identifier: missingType.return
@@ -42300,12 +42438,6 @@ parameters:
 			count: 1
 			path: tests/integration/Core/Repository/LocationServiceTest.php
 
-		-
-			message: '#^Parameter \#1 \$location of method Ibexa\\Contracts\\Core\\Repository\\LocationService\:\:getSubtreeSize\(\) expects Ibexa\\Contracts\\Core\\Repository\\Values\\Content\\Location, Ibexa\\Contracts\\Core\\Repository\\Values\\Content\\Location\|null given\.$#'
-			identifier: argument.type
-			count: 2
-			path: tests/integration/Core/Repository/LocationServiceTest.php
-
 		-
 			message: '#^Parameter \#1 \$location of method Ibexa\\Contracts\\Core\\Repository\\LocationService\:\:moveSubtree\(\) expects Ibexa\\Contracts\\Core\\Repository\\Values\\Content\\Location, Ibexa\\Contracts\\Core\\Repository\\Values\\Content\\Location\|null given\.$#'
 			identifier: argument.type
@@ -67170,6 +67302,12 @@ parameters:
 			count: 1
 			path: tests/lib/Persistence/Legacy/Filter/CriterionQueryBuilder/LogicalOperatorQueryBuilderQueryBuilderTest.php
 
+		-
+			message: '#^Parameter \#3 \$limit of method Ibexa\\Core\\Persistence\\Legacy\\Filter\\Query\\LimitedCountQueryBuilder\:\:wrap\(\) expects int\<1, max\>\|null, 0 given\.$#'
+			identifier: argument.type
+			count: 1
+			path: tests/lib/Persistence/Legacy/Filter/Query/LimitedCountQueryBuilderTest.php
+
 		-
 			message: '#^Call to an undefined method Ibexa\\Contracts\\Core\\Container\:\:get\(\)\.$#'
 			identifier: method.notFound
@@ -68970,6 +69108,12 @@ parameters:
 			count: 1
 			path: tests/lib/Repository/Decorator/LanguageServiceDecoratorTest.php
 
+		-
+			message: '#^Method Ibexa\\Contracts\\Core\\Repository\\LocationService\:\:getLocationChildCount\(\) invoked with 2 parameters, 1 required\.$#'
+			identifier: arguments.count
+			count: 1
+			path: tests/lib/Repository/Decorator/LocationServiceDecoratorTest.php
+
 		-
 			message: '#^Method Ibexa\\Tests\\Core\\Repository\\Decorator\\LocationServiceDecoratorTest\:\:testCopySubtreeDecorator\(\) has no return type specified\.$#'
 			identifier: missingType.return

diff --git a/src/contracts/Persistence/Content/Future/Repository/FutureContentService.php b/src/contracts/Persistence/Content/Future/Repository/FutureContentService.php
@@ -0,0 +1,23 @@
+<?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\Future\Repository;
+
+use Ibexa\Contracts\Core\Repository\ContentService;
+use Ibexa\Contracts\Core\Repository\Values\Filter\Filter;
+
+/**
+ * @internal Future version of ContentService to be released in Ibexa Core 5.0. Used to force value proxies to generate correct types. For internal use only.
+ */
+interface FutureContentService extends ContentService
+{
+    /**
+     * {@inheritDoc}
+     */
+    public function count(Filter $filter, ?array $languages = null, ?int $limit = null): int;
+}
diff --git a/src/contracts/Persistence/Content/Future/Repository/FutureLocationService.php b/src/contracts/Persistence/Content/Future/Repository/FutureLocationService.php
@@ -0,0 +1,34 @@
+<?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\Future\Repository;
+
+use Ibexa\Contracts\Core\Repository\LocationService;
+use Ibexa\Contracts\Core\Repository\Values\Content\Location;
+use Ibexa\Contracts\Core\Repository\Values\Filter\Filter;
+
+/**
+ * @internal Future version of LocationService to be released in Ibexa Core 5.0. Used to force value proxies to generate correct types. For internal use only.
+ */
+interface FutureLocationService extends LocationService
+{
+    /**
+     * {@inheritDoc}
+     */
+    public function getLocationChildCount(Location $location, ?int $limit = null): int;
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getSubtreeSize(Location $location, ?int $limit = null): int;
+
+    /**
+     * {@inheritDoc}
+     */
+    public function count(Filter $filter, ?array $languages = null, ?int $limit = null): int;
+}
diff --git a/src/contracts/Persistence/Content/Location/Handler.php b/src/contracts/Persistence/Content/Location/Handler.php
@@ -110,7 +110,11 @@ public function loadParentLocationsForDraftContent($contentId);
      */
     public function copySubtree($sourceId, $destinationParentId);
 
-    public function getSubtreeSize(string $path): int;
+    /**
+     * @param int|null $limit
+     */
+    // @phpstan-ignore parameter.notFound
+    public function getSubtreeSize(string $path /* ?int $limit = null */): int;
 
     /**
      * Moves location identified by $sourceId into new parent identified by $destinationParentId.