From e5245db2794aa9d508a0e9f9e38bc31a368b1309 Mon Sep 17 00:00:00 2001 From: Vidar Langseid Date: Fri, 7 Feb 2025 15:06:45 +0100 Subject: [PATCH 01/13] IBX-6773: Bookmarks for non-accessible contents cause exception --- phpstan-baseline.neon | 23 ++++++--- .../Persistence/Bookmark/Handler.php | 4 ++ .../Content/Query/Criterion/IsBookmarked.php | 42 ++++++++++++++++ .../Content/Query/SortClause/BookmarkId.php | 24 ++++++++++ src/lib/Persistence/Cache/BookmarkHandler.php | 4 ++ .../Persistence/Legacy/Bookmark/Gateway.php | 4 ++ .../Bookmark/Gateway/DoctrineDatabase.php | 4 ++ .../Bookmark/Gateway/ExceptionConversion.php | 8 ++++ .../Persistence/Legacy/Bookmark/Handler.php | 4 ++ .../Location/BookmarkQueryBuilder.php | 48 +++++++++++++++++++ .../Bookmark/IdSortClauseQueryBuilder.php | 31 ++++++++++++ src/lib/Repository/BookmarkService.php | 40 ++++++++++++---- src/lib/Repository/Repository.php | 3 +- .../Core/Repository/LocationServiceTest.php | 8 ++-- .../Location/BookmarkQueryBuilderTest.php | 47 ++++++++++++++++++ .../Repository/Service/Mock/BookmarkTest.php | 48 ++----------------- 16 files changed, 279 insertions(+), 63 deletions(-) create mode 100644 src/contracts/Repository/Values/Content/Query/Criterion/IsBookmarked.php create mode 100644 src/contracts/Repository/Values/Content/Query/SortClause/BookmarkId.php create mode 100644 src/lib/Persistence/Legacy/Filter/CriterionQueryBuilder/Location/BookmarkQueryBuilder.php create mode 100644 src/lib/Persistence/Legacy/Filter/SortClauseQueryBuilder/Bookmark/IdSortClauseQueryBuilder.php create mode 100644 tests/lib/Persistence/Legacy/Filter/CriterionQueryBuilder/Location/BookmarkQueryBuilderTest.php diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon index 0898cbd88d..896cb1f8d3 100644 --- a/phpstan-baseline.neon +++ b/phpstan-baseline.neon @@ -21954,6 +21954,17 @@ parameters: count: 1 path: src/lib/Persistence/Legacy/Filter/CriterionQueryBuilder/Location/DepthQueryBuilder.php + - + message: "#^Cannot access offset 0 on array\\\\|bool\\|float\\|int\\|string\\.$#" + count: 1 + path: src/lib/Persistence/Legacy/Filter/CriterionQueryBuilder/Location/BookmarkQueryBuilder.php + + - + message: '#^Method Ibexa\\Core\\Persistence\\Legacy\\Filter\\CriterionQueryBuilder\\Location\\BookmarkQueryBuilder\:\:buildQueryConstraint\(\) never returns null so it can be removed from the return type\.$#' + identifier: return.unusedType + count: 1 + path: src/lib/Persistence/Legacy/Filter/CriterionQueryBuilder/Location/BookmarkQueryBuilder.php + - message: '#^Parameter \#2 \$criterionValue of method Ibexa\\Contracts\\Core\\Persistence\\Filter\\Doctrine\\FilteringQueryBuilder\:\:buildOperatorBasedCriterionConstraint\(\) expects array, array\\|bool\|float\|int\|string given\.$#' identifier: argument.type @@ -22374,6 +22385,12 @@ parameters: count: 1 path: src/lib/Persistence/Legacy/Filter/Handler/LocationFilteringHandler.php + - + message: '#^PHPDoc tag @var with type Ibexa\\Contracts\\Core\\Repository\\Values\\Content\\Query\\SortClause is not subtype of native type Ibexa\\Contracts\\Core\\Repository\\Values\\Filter\\FilteringSortClause\.$#' + identifier: varTag.nativeType + count: 1 + path: src/lib/Persistence/Legacy/Filter/SortClauseQueryBuilder/Bookmark/IdSortClauseQueryBuilder.php + - message: '#^PHPDoc tag @var with type Ibexa\\Contracts\\Core\\Repository\\Values\\Content\\Query\\SortClause is not subtype of native type Ibexa\\Contracts\\Core\\Repository\\Values\\Filter\\FilteringSortClause\.$#' identifier: varTag.nativeType @@ -69774,12 +69791,6 @@ parameters: count: 1 path: tests/lib/Repository/Service/Mock/BookmarkTest.php - - - message: '#^Method Ibexa\\Tests\\Core\\Repository\\Service\\Mock\\BookmarkTest\:\:testLoadBookmarksEmptyList\(\) has no return type specified\.$#' - identifier: missingType.return - count: 1 - path: tests/lib/Repository/Service/Mock/BookmarkTest.php - - message: '#^Method Ibexa\\Tests\\Core\\Repository\\Service\\Mock\\BookmarkTest\:\:testLocationShouldBeBookmarked\(\) has no return type specified\.$#' identifier: missingType.return diff --git a/src/contracts/Persistence/Bookmark/Handler.php b/src/contracts/Persistence/Bookmark/Handler.php index f9ef1a1cae..714d85a736 100644 --- a/src/contracts/Persistence/Bookmark/Handler.php +++ b/src/contracts/Persistence/Bookmark/Handler.php @@ -50,6 +50,8 @@ public function loadUserIdsByLocation(Location $location): array; /** * Loads bookmarks owned by user. * + * @deprecated The "Handler::loadUserBookmarks()" method is deprecated, will be removed in 6.0.0. Use "LocationService::find()" and "Criterion\IsBookmarked" instead. + * * @param int $userId * @param int $offset the start offset for paging * @param int $limit the number of bookmarked locations returned @@ -61,6 +63,8 @@ public function loadUserBookmarks(int $userId, int $offset = 0, int $limit = -1) /** * Count bookmarks owned by user. * + * @deprecated The "Handler::countUserBookmarks()" method is deprecated, will be removed in 6.0.0. Use "LocationService::count()" and "Criterion\IsBookmarked" instead. + * * @param int $userId * * @return int diff --git a/src/contracts/Repository/Values/Content/Query/Criterion/IsBookmarked.php b/src/contracts/Repository/Values/Content/Query/Criterion/IsBookmarked.php new file mode 100644 index 0000000000..5ce8b9709c --- /dev/null +++ b/src/contracts/Repository/Values/Content/Query/Criterion/IsBookmarked.php @@ -0,0 +1,42 @@ +joinOnce( + 'location', + DoctrineDatabase::TABLE_BOOKMARKS, + 'bookmark', + 'location.node_id = bookmark.node_id' + ); + + /** @var \Ibexa\Contracts\Core\Repository\Values\Content\Query\Criterion\IsBookmarked $criterion */ + return $queryBuilder->expr()->eq( + 'bookmark.user_id', + $queryBuilder->createNamedParameter( + (int)$criterion->value[0], + ParameterType::INTEGER + ) + ); + } +} diff --git a/src/lib/Persistence/Legacy/Filter/SortClauseQueryBuilder/Bookmark/IdSortClauseQueryBuilder.php b/src/lib/Persistence/Legacy/Filter/SortClauseQueryBuilder/Bookmark/IdSortClauseQueryBuilder.php new file mode 100644 index 0000000000..50e85f0858 --- /dev/null +++ b/src/lib/Persistence/Legacy/Filter/SortClauseQueryBuilder/Bookmark/IdSortClauseQueryBuilder.php @@ -0,0 +1,31 @@ +addSelect('bookmark.id'); + $queryBuilder->addOrderBy('bookmark.id', $sortClause->direction); + } +} diff --git a/src/lib/Repository/BookmarkService.php b/src/lib/Repository/BookmarkService.php index a74c79d5cb..1ee28c7989 100644 --- a/src/lib/Repository/BookmarkService.php +++ b/src/lib/Repository/BookmarkService.php @@ -9,14 +9,20 @@ namespace Ibexa\Core\Repository; use Exception; -use Ibexa\Contracts\Core\Persistence\Bookmark\Bookmark; use Ibexa\Contracts\Core\Persistence\Bookmark\CreateStruct; use Ibexa\Contracts\Core\Persistence\Bookmark\Handler as BookmarkHandler; use Ibexa\Contracts\Core\Repository\BookmarkService as BookmarkServiceInterface; +use Ibexa\Contracts\Core\Repository\Exceptions\BadStateException; use Ibexa\Contracts\Core\Repository\Repository as RepositoryInterface; use Ibexa\Contracts\Core\Repository\Values\Bookmark\BookmarkList; use Ibexa\Contracts\Core\Repository\Values\Content\Location; +use Ibexa\Contracts\Core\Repository\Values\Content\Query; +use Ibexa\Contracts\Core\Repository\Values\Content\Query\Criterion; +use Ibexa\Contracts\Core\Repository\Values\Content\Query\SortClause; +use Ibexa\Contracts\Core\Repository\Values\Filter\Filter; use Ibexa\Core\Base\Exceptions\InvalidArgumentException; +use Psr\Log\LoggerInterface; +use Psr\Log\NullLogger; class BookmarkService implements BookmarkServiceInterface { @@ -26,16 +32,20 @@ class BookmarkService implements BookmarkServiceInterface /** @var \Ibexa\Contracts\Core\Persistence\Bookmark\Handler */ protected $bookmarkHandler; + /** @var \Psr\Log\LoggerInterface */ + private $logger; + /** * BookmarkService constructor. * * @param \Ibexa\Contracts\Core\Repository\Repository $repository * @param \Ibexa\Contracts\Core\Persistence\Bookmark\Handler $bookmarkHandler */ - public function __construct(RepositoryInterface $repository, BookmarkHandler $bookmarkHandler) + public function __construct(RepositoryInterface $repository, BookmarkHandler $bookmarkHandler, LoggerInterface $logger = null) { $this->repository = $repository; $this->bookmarkHandler = $bookmarkHandler; + $this->logger = $logger ?? new NullLogger(); } /** @@ -97,16 +107,26 @@ public function loadBookmarks(int $offset = 0, int $limit = 25): BookmarkList { $currentUserId = $this->getCurrentUserId(); - $list = new BookmarkList(); - $list->totalCount = $this->bookmarkHandler->countUserBookmarks($currentUserId); - if ($list->totalCount > 0) { - $bookmarks = $this->bookmarkHandler->loadUserBookmarks($currentUserId, $offset, $limit); - - $list->items = array_map(function (Bookmark $bookmark) { - return $this->repository->getLocationService()->loadLocation($bookmark->locationId); - }, $bookmarks); + $filter = new Filter(); + try { + $filter + ->withCriterion(new Criterion\IsBookmarked($currentUserId)) + ->withSortClause(new SortClause\BookmarkId(Query::SORT_DESC)) + ->sliceBy($limit, $offset); + + $result = $this->repository->getlocationService()->find($filter, []); + } catch (BadStateException $e) { + $this->logger->debug($e->getMessage(), [ + 'exception' => $e, + ]); + + return new BookmarkList(); } + $list = new BookmarkList(); + $list->totalCount = $result->totalCount; + $list->items = $result->locations; + return $list; } diff --git a/src/lib/Repository/Repository.php b/src/lib/Repository/Repository.php index fa165c2222..81fccd268d 100644 --- a/src/lib/Repository/Repository.php +++ b/src/lib/Repository/Repository.php @@ -608,7 +608,8 @@ public function getBookmarkService(): BookmarkServiceInterface if ($this->bookmarkService === null) { $this->bookmarkService = new BookmarkService( $this, - $this->persistenceHandler->bookmarkHandler() + $this->persistenceHandler->bookmarkHandler(), + $this->logger ); } diff --git a/tests/integration/Core/Repository/LocationServiceTest.php b/tests/integration/Core/Repository/LocationServiceTest.php index 350347bda4..dc38cdb5f3 100644 --- a/tests/integration/Core/Repository/LocationServiceTest.php +++ b/tests/integration/Core/Repository/LocationServiceTest.php @@ -1968,6 +1968,7 @@ public function testBookmarksAreSwappedAfterSwapLocation() $mediaLocationId = $this->generateId('location', 43); $demoDesignLocationId = $this->generateId('location', 56); + $contactUsLocationId = $this->generateId('location', 60); /* BEGIN: Use Case */ $locationService = $repository->getLocationService(); @@ -1975,6 +1976,7 @@ public function testBookmarksAreSwappedAfterSwapLocation() $mediaLocation = $locationService->loadLocation($mediaLocationId); $demoDesignLocation = $locationService->loadLocation($demoDesignLocationId); + $contactUsLocation = $locationService->loadLocation($contactUsLocationId); // Bookmark locations $bookmarkService->createBookmark($mediaLocation); @@ -1983,13 +1985,13 @@ public function testBookmarksAreSwappedAfterSwapLocation() $beforeSwap = $bookmarkService->loadBookmarks(); // Swaps the content referred to by the locations - $locationService->swapLocation($mediaLocation, $demoDesignLocation); + $locationService->swapLocation($demoDesignLocation, $contactUsLocation); $afterSwap = $bookmarkService->loadBookmarks(); /* END: Use Case */ - $this->assertEquals($beforeSwap->items[0]->id, $afterSwap->items[1]->id); - $this->assertEquals($beforeSwap->items[1]->id, $afterSwap->items[0]->id); + $this->assertEquals($contactUsLocationId, $afterSwap->items[0]->id); + $this->assertEquals($beforeSwap->items[1]->id, $afterSwap->items[1]->id); } /** diff --git a/tests/lib/Persistence/Legacy/Filter/CriterionQueryBuilder/Location/BookmarkQueryBuilderTest.php b/tests/lib/Persistence/Legacy/Filter/CriterionQueryBuilder/Location/BookmarkQueryBuilderTest.php new file mode 100644 index 0000000000..b632ac35b2 --- /dev/null +++ b/tests/lib/Persistence/Legacy/Filter/CriterionQueryBuilder/Location/BookmarkQueryBuilderTest.php @@ -0,0 +1,47 @@ +}> + * + * @throws \Ibexa\Contracts\Core\Repository\Exceptions\InvalidCriterionArgumentException + */ + public function getFilteringCriteriaQueryData(): iterable + { + yield 'Bookmarks locations for user_id=14' => [ + new Criterion\IsBookmarked(14), + 'bookmark.user_id = :dcValue1', + ['dcValue1' => 14], + ]; + + yield 'Bookmarks locations for user_id=14 OR user_id=7' => [ + new Criterion\LogicalOr( + [ + new Criterion\IsBookmarked(14), + new Criterion\IsBookmarked(7), + ] + ), + '(bookmark.user_id = :dcValue1) OR (bookmark.user_id = :dcValue2)', + ['dcValue1' => 14, 'dcValue2' => 7], + ]; + } + + protected function getCriterionQueryBuilders(): iterable + { + return [new BookmarkQueryBuilder()]; + } +} diff --git a/tests/lib/Repository/Service/Mock/BookmarkTest.php b/tests/lib/Repository/Service/Mock/BookmarkTest.php index 536a0c2390..876dc4a8e7 100644 --- a/tests/lib/Repository/Service/Mock/BookmarkTest.php +++ b/tests/lib/Repository/Service/Mock/BookmarkTest.php @@ -15,6 +15,7 @@ use Ibexa\Contracts\Core\Repository\LocationService; use Ibexa\Contracts\Core\Repository\PermissionResolver; use Ibexa\Contracts\Core\Repository\Values\Content\ContentInfo; +use Ibexa\Contracts\Core\Repository\Values\Content\LocationList; use Ibexa\Core\Repository\BookmarkService; use Ibexa\Core\Repository\Values\Content\Location; use Ibexa\Core\Repository\Values\User\UserReference; @@ -220,28 +221,13 @@ public function testLoadBookmarks() $expectedItems = array_map(function ($locationId) { return $this->createLocation($locationId); }, range(1, $expectedTotalCount)); - - $this->bookmarkHandler - ->expects($this->once()) - ->method('countUserBookmarks') - ->with(self::CURRENT_USER_ID) - ->willReturn($expectedTotalCount); - - $this->bookmarkHandler - ->expects($this->once()) - ->method('loadUserBookmarks') - ->with(self::CURRENT_USER_ID, $offset, $limit) - ->willReturn(array_map(static function ($locationId) { - return new Bookmark(['locationId' => $locationId]); - }, range(1, $expectedTotalCount))); + $locationList = new LocationList(['totalCount' => $expectedTotalCount, 'locations' => $expectedItems]); $locationServiceMock = $this->createMock(LocationService::class); $locationServiceMock - ->expects($this->exactly($expectedTotalCount)) - ->method('loadLocation') - ->willReturnCallback(function ($locationId) { - return $this->createLocation($locationId); - }); + ->expects(self::once()) + ->method('find') + ->willReturn($locationList); $repository = $this->getRepositoryMock(); $repository @@ -255,27 +241,6 @@ public function testLoadBookmarks() $this->assertEquals($expectedItems, $bookmarks->items); } - /** - * @covers \Ibexa\Contracts\Core\Repository\BookmarkService::loadBookmarks - */ - public function testLoadBookmarksEmptyList() - { - $this->bookmarkHandler - ->expects($this->once()) - ->method('countUserBookmarks') - ->with(self::CURRENT_USER_ID) - ->willReturn(0); - - $this->bookmarkHandler - ->expects($this->never()) - ->method('loadUserBookmarks'); - - $bookmarks = $this->createBookmarkService()->loadBookmarks(0, 10); - - $this->assertEquals(0, $bookmarks->totalCount); - $this->assertEmpty($bookmarks->items); - } - /** * @covers \Ibexa\Contracts\Core\Repository\BookmarkService::isBookmarked */ @@ -290,9 +255,6 @@ public function testLocationShouldNotBeBookmarked() $this->assertFalse($this->createBookmarkService()->isBookmarked($this->createLocation(self::LOCATION_ID))); } - /** - * @covers \Ibexa\Contracts\Core\Repository\BookmarkService::isBookmarked - */ public function testLocationShouldBeBookmarked() { $this->bookmarkHandler From f01505114d1dbc3b514de8dd0699d0090d7bb426 Mon Sep 17 00:00:00 2001 From: Vidar Langseid Date: Tue, 24 Feb 2026 08:44:42 +0100 Subject: [PATCH 02/13] Fixed PHPStan error for URLAliasService --- phpstan-baseline.neon | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon index 896cb1f8d3..1b086b3810 100644 --- a/phpstan-baseline.neon +++ b/phpstan-baseline.neon @@ -17766,12 +17766,6 @@ parameters: count: 1 path: src/lib/Persistence/Cache/UserPreferenceHandler.php - - - message: '#^Return type \(Doctrine\\ORM\\Mapping\\ClassMetadataFactory\) of method Ibexa\\Core\\Persistence\\Doctrine\\SiteAccessAwareEntityManager\:\:getMetadataFactory\(\) should be compatible with return type \(Doctrine\\Persistence\\Mapping\\ClassMetadataFactory\\>\) of method Doctrine\\Persistence\\ObjectManager\:\:getMetadataFactory\(\)$#' - identifier: method.childReturnType - count: 2 - path: src/lib/Persistence/Doctrine/SiteAccessAwareEntityManager.php - - message: '#^Property Ibexa\\Core\\Persistence\\FieldTypeRegistry\:\:\$coreFieldTypes \(array\\) does not accept array\\.$#' identifier: assign.propertyType @@ -25457,6 +25451,12 @@ parameters: count: 1 path: src/lib/Repository/TrashService.php + - + message: '#^Class Ibexa\\Contracts\\Core\\Persistence\\Content\\UrlAlias referenced with incorrect case\: Ibexa\\Contracts\\Core\\Persistence\\Content\\URLAlias\.$#' + identifier: class.nameCase + count: 2 + path: src/lib/Repository/URLAliasService.php + - message: '#^Method Ibexa\\Core\\Repository\\URLAliasService\:\:choosePrioritizedLanguageCode\(\) has parameter \$entries with no value type specified in iterable type array\.$#' identifier: missingType.iterableValue From 0bf56492e49b8b5ed9f5642f06da530583456b47 Mon Sep 17 00:00:00 2001 From: Vidar Langseid Date: Tue, 24 Feb 2026 09:19:54 +0100 Subject: [PATCH 03/13] fixup! IBX-6773: Bookmarks for non-accessible contents cause exception - PHPStand and BookmarkQueryBuilder --- phpstan-baseline.neon | 11 ----------- .../Location/BookmarkQueryBuilder.php | 13 +++++++++++-- 2 files changed, 11 insertions(+), 13 deletions(-) diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon index 1b086b3810..5aa6c1a233 100644 --- a/phpstan-baseline.neon +++ b/phpstan-baseline.neon @@ -21948,17 +21948,6 @@ parameters: count: 1 path: src/lib/Persistence/Legacy/Filter/CriterionQueryBuilder/Location/DepthQueryBuilder.php - - - message: "#^Cannot access offset 0 on array\\\\|bool\\|float\\|int\\|string\\.$#" - count: 1 - path: src/lib/Persistence/Legacy/Filter/CriterionQueryBuilder/Location/BookmarkQueryBuilder.php - - - - message: '#^Method Ibexa\\Core\\Persistence\\Legacy\\Filter\\CriterionQueryBuilder\\Location\\BookmarkQueryBuilder\:\:buildQueryConstraint\(\) never returns null so it can be removed from the return type\.$#' - identifier: return.unusedType - count: 1 - path: src/lib/Persistence/Legacy/Filter/CriterionQueryBuilder/Location/BookmarkQueryBuilder.php - - message: '#^Parameter \#2 \$criterionValue of method Ibexa\\Contracts\\Core\\Persistence\\Filter\\Doctrine\\FilteringQueryBuilder\:\:buildOperatorBasedCriterionConstraint\(\) expects array, array\\|bool\|float\|int\|string given\.$#' identifier: argument.type diff --git a/src/lib/Persistence/Legacy/Filter/CriterionQueryBuilder/Location/BookmarkQueryBuilder.php b/src/lib/Persistence/Legacy/Filter/CriterionQueryBuilder/Location/BookmarkQueryBuilder.php index 994f89a55b..bf8f8712b9 100644 --- a/src/lib/Persistence/Legacy/Filter/CriterionQueryBuilder/Location/BookmarkQueryBuilder.php +++ b/src/lib/Persistence/Legacy/Filter/CriterionQueryBuilder/Location/BookmarkQueryBuilder.php @@ -27,7 +27,7 @@ public function accepts(FilteringCriterion $criterion): bool public function buildQueryConstraint( FilteringQueryBuilder $queryBuilder, FilteringCriterion $criterion - ): ?string { + ): string { $queryBuilder ->joinOnce( 'location', @@ -37,10 +37,19 @@ public function buildQueryConstraint( ); /** @var \Ibexa\Contracts\Core\Repository\Values\Content\Query\Criterion\IsBookmarked $criterion */ + $value = $criterion->value; + + if (\is_array($value)) { + if (!isset($value[0])) { + throw new \InvalidArgumentException('IsBookmarked criterion value must contain userId at index 0.'); + } + $value = $value[0]; + } + return $queryBuilder->expr()->eq( 'bookmark.user_id', $queryBuilder->createNamedParameter( - (int)$criterion->value[0], + (int)$value, ParameterType::INTEGER ) ); From 117d9e24fb6367eb5633964e36148b9c7ff0bd48 Mon Sep 17 00:00:00 2001 From: Vidar Langseid Date: Tue, 24 Feb 2026 09:38:07 +0100 Subject: [PATCH 04/13] fixup! IBX-6773: Bookmarks for non-accessible contents cause exception - PHPStand and Bookmark\IdSortClauseQueryBuilder --- phpstan-baseline.neon | 6 ------ .../Bookmark/IdSortClauseQueryBuilder.php | 9 ++++++++- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon index 5aa6c1a233..6180787a47 100644 --- a/phpstan-baseline.neon +++ b/phpstan-baseline.neon @@ -22368,12 +22368,6 @@ parameters: count: 1 path: src/lib/Persistence/Legacy/Filter/Handler/LocationFilteringHandler.php - - - message: '#^PHPDoc tag @var with type Ibexa\\Contracts\\Core\\Repository\\Values\\Content\\Query\\SortClause is not subtype of native type Ibexa\\Contracts\\Core\\Repository\\Values\\Filter\\FilteringSortClause\.$#' - identifier: varTag.nativeType - count: 1 - path: src/lib/Persistence/Legacy/Filter/SortClauseQueryBuilder/Bookmark/IdSortClauseQueryBuilder.php - - message: '#^PHPDoc tag @var with type Ibexa\\Contracts\\Core\\Repository\\Values\\Content\\Query\\SortClause is not subtype of native type Ibexa\\Contracts\\Core\\Repository\\Values\\Filter\\FilteringSortClause\.$#' identifier: varTag.nativeType diff --git a/src/lib/Persistence/Legacy/Filter/SortClauseQueryBuilder/Bookmark/IdSortClauseQueryBuilder.php b/src/lib/Persistence/Legacy/Filter/SortClauseQueryBuilder/Bookmark/IdSortClauseQueryBuilder.php index 50e85f0858..1a0151f3dd 100644 --- a/src/lib/Persistence/Legacy/Filter/SortClauseQueryBuilder/Bookmark/IdSortClauseQueryBuilder.php +++ b/src/lib/Persistence/Legacy/Filter/SortClauseQueryBuilder/Bookmark/IdSortClauseQueryBuilder.php @@ -24,7 +24,14 @@ public function buildQuery( FilteringQueryBuilder $queryBuilder, FilteringSortClause $sortClause ): void { - /** @var \Ibexa\Contracts\Core\Repository\Values\Content\Query\SortClause $sortClause */ + if (!$sortClause instanceof BookmarkId) { + throw new \InvalidArgumentException(sprintf( + 'Expected %s, got %s', + BookmarkId::class, + get_class($sortClause), + )); + } + /** @var \Ibexa\Contracts\Core\Repository\Values\Content\Query\SortClause\BookmarkId $sortClause */ $queryBuilder->addSelect('bookmark.id'); $queryBuilder->addOrderBy('bookmark.id', $sortClause->direction); } From 3837c204bed2794f1def6a9a82f7cc9e24be6da6 Mon Sep 17 00:00:00 2001 From: Vidar Langseid Date: Tue, 24 Feb 2026 09:51:07 +0100 Subject: [PATCH 05/13] fixup! IBX-6773: Bookmarks for non-accessible contents cause exception - Added more Strict typing --- .../Values/Content/Query/Criterion/IsBookmarked.php | 10 +--------- src/lib/Repository/BookmarkService.php | 9 +++------ 2 files changed, 4 insertions(+), 15 deletions(-) diff --git a/src/contracts/Repository/Values/Content/Query/Criterion/IsBookmarked.php b/src/contracts/Repository/Values/Content/Query/Criterion/IsBookmarked.php index 5ce8b9709c..1f14b5e726 100644 --- a/src/contracts/Repository/Values/Content/Query/Criterion/IsBookmarked.php +++ b/src/contracts/Repository/Values/Content/Query/Criterion/IsBookmarked.php @@ -20,15 +20,7 @@ */ final class IsBookmarked extends Criterion implements FilteringCriterion { - /** - * Creates a new IsBookmarked criterion. - * - * @param int $value user id for which bookmarked locations must be matched against - * - * @throws \InvalidArgumentException if a non numeric id is given - * @throws \InvalidArgumentException if the value type doesn't match the operator - */ - public function __construct($value) + public function __construct(int $value) { parent::__construct(null, null, $value); } diff --git a/src/lib/Repository/BookmarkService.php b/src/lib/Repository/BookmarkService.php index 1ee28c7989..9a38e61018 100644 --- a/src/lib/Repository/BookmarkService.php +++ b/src/lib/Repository/BookmarkService.php @@ -26,14 +26,11 @@ class BookmarkService implements BookmarkServiceInterface { - /** @var \Ibexa\Contracts\Core\Repository\Repository */ - protected $repository; + protected RepositoryInterface $repository; - /** @var \Ibexa\Contracts\Core\Persistence\Bookmark\Handler */ - protected $bookmarkHandler; + protected BookmarkHandler $bookmarkHandler; - /** @var \Psr\Log\LoggerInterface */ - private $logger; + private LoggerInterface $logger; /** * BookmarkService constructor. From 7dfe142a0d17abd1bfb603e5272213c256a9b264 Mon Sep 17 00:00:00 2001 From: Vidar Langseid Date: Tue, 24 Feb 2026 09:53:39 +0100 Subject: [PATCH 06/13] Update tests/lib/Persistence/Legacy/Filter/CriterionQueryBuilder/Location/BookmarkQueryBuilderTest.php Co-authored-by: Konrad Oboza --- .../Location/BookmarkQueryBuilderTest.php | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/tests/lib/Persistence/Legacy/Filter/CriterionQueryBuilder/Location/BookmarkQueryBuilderTest.php b/tests/lib/Persistence/Legacy/Filter/CriterionQueryBuilder/Location/BookmarkQueryBuilderTest.php index b632ac35b2..8d62573154 100644 --- a/tests/lib/Persistence/Legacy/Filter/CriterionQueryBuilder/Location/BookmarkQueryBuilderTest.php +++ b/tests/lib/Persistence/Legacy/Filter/CriterionQueryBuilder/Location/BookmarkQueryBuilderTest.php @@ -8,7 +8,6 @@ namespace Ibexa\Tests\Core\Persistence\Legacy\Filter\CriterionQueryBuilder\Location; -use Generator; use Ibexa\Contracts\Core\Repository\Values\Content\Query\Criterion as Criterion; use Ibexa\Core\Persistence\Legacy\Filter\CriterionQueryBuilder\Location\BookmarkQueryBuilder; use Ibexa\Tests\Core\Persistence\Legacy\Filter\BaseCriterionVisitorQueryBuilderTestCase; @@ -16,7 +15,7 @@ final class BookmarkQueryBuilderTest extends BaseCriterionVisitorQueryBuilderTestCase { /** - * @return Generator}> + * @return iterable}> * * @throws \Ibexa\Contracts\Core\Repository\Exceptions\InvalidCriterionArgumentException */ From 648ac3ed7b47c40bd217a62e05685284b813fe78 Mon Sep 17 00:00:00 2001 From: Andrew Longosz Date: Fri, 27 Feb 2026 21:03:38 +0100 Subject: [PATCH 07/13] [PHPStan] Aligned baseline with the upstream changes --- phpstan-baseline.neon | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon index 6180787a47..f7eb5f4584 100644 --- a/phpstan-baseline.neon +++ b/phpstan-baseline.neon @@ -17766,6 +17766,12 @@ parameters: count: 1 path: src/lib/Persistence/Cache/UserPreferenceHandler.php + - + message: '#^Return type \(Doctrine\\ORM\\Mapping\\ClassMetadataFactory\) of method Ibexa\\Core\\Persistence\\Doctrine\\SiteAccessAwareEntityManager\:\:getMetadataFactory\(\) should be compatible with return type \(Doctrine\\Persistence\\Mapping\\ClassMetadataFactory\\>\) of method Doctrine\\Persistence\\ObjectManager\:\:getMetadataFactory\(\)$#' + identifier: method.childReturnType + count: 2 + path: src/lib/Persistence/Doctrine/SiteAccessAwareEntityManager.php + - message: '#^Property Ibexa\\Core\\Persistence\\FieldTypeRegistry\:\:\$coreFieldTypes \(array\\) does not accept array\\.$#' identifier: assign.propertyType @@ -25434,12 +25440,6 @@ parameters: count: 1 path: src/lib/Repository/TrashService.php - - - message: '#^Class Ibexa\\Contracts\\Core\\Persistence\\Content\\UrlAlias referenced with incorrect case\: Ibexa\\Contracts\\Core\\Persistence\\Content\\URLAlias\.$#' - identifier: class.nameCase - count: 2 - path: src/lib/Repository/URLAliasService.php - - message: '#^Method Ibexa\\Core\\Repository\\URLAliasService\:\:choosePrioritizedLanguageCode\(\) has parameter \$entries with no value type specified in iterable type array\.$#' identifier: missingType.iterableValue From ba26848cefbbb1f1fbe1a6bcb7db7877792a60ba Mon Sep 17 00:00:00 2001 From: Vidar Langseid Date: Tue, 10 Mar 2026 10:39:03 +0100 Subject: [PATCH 08/13] Apply suggestions from code review Co-authored-by: Konrad Oboza --- src/lib/Repository/BookmarkService.php | 2 +- tests/integration/Core/Repository/LocationServiceTest.php | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/lib/Repository/BookmarkService.php b/src/lib/Repository/BookmarkService.php index 9a38e61018..b432aa2356 100644 --- a/src/lib/Repository/BookmarkService.php +++ b/src/lib/Repository/BookmarkService.php @@ -111,7 +111,7 @@ public function loadBookmarks(int $offset = 0, int $limit = 25): BookmarkList ->withSortClause(new SortClause\BookmarkId(Query::SORT_DESC)) ->sliceBy($limit, $offset); - $result = $this->repository->getlocationService()->find($filter, []); + $result = $this->repository->getLocationService()->find($filter, []); } catch (BadStateException $e) { $this->logger->debug($e->getMessage(), [ 'exception' => $e, diff --git a/tests/integration/Core/Repository/LocationServiceTest.php b/tests/integration/Core/Repository/LocationServiceTest.php index dc38cdb5f3..ef4e505c1f 100644 --- a/tests/integration/Core/Repository/LocationServiceTest.php +++ b/tests/integration/Core/Repository/LocationServiceTest.php @@ -1990,8 +1990,8 @@ public function testBookmarksAreSwappedAfterSwapLocation() $afterSwap = $bookmarkService->loadBookmarks(); /* END: Use Case */ - $this->assertEquals($contactUsLocationId, $afterSwap->items[0]->id); - $this->assertEquals($beforeSwap->items[1]->id, $afterSwap->items[1]->id); + self::assertEquals($contactUsLocationId, $afterSwap->items[0]->id); + self::assertEquals($beforeSwap->items[1]->id, $afterSwap->items[1]->id); } /** From 5fd0eb2a7b56042d07bda4a65ab53f04723a3772 Mon Sep 17 00:00:00 2001 From: Vidar Langseid Date: Tue, 10 Mar 2026 12:57:56 +0100 Subject: [PATCH 09/13] Added integration test for using Criterion\IsBookmarked and LocationService::count() --- .../Core/Repository/BookmarkServiceTest.php | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/tests/integration/Core/Repository/BookmarkServiceTest.php b/tests/integration/Core/Repository/BookmarkServiceTest.php index b4d1542d59..15887de5f1 100644 --- a/tests/integration/Core/Repository/BookmarkServiceTest.php +++ b/tests/integration/Core/Repository/BookmarkServiceTest.php @@ -10,6 +10,8 @@ use Ibexa\Contracts\Core\Repository\Exceptions\InvalidArgumentException; use Ibexa\Contracts\Core\Repository\Values\Bookmark\BookmarkList; +use Ibexa\Contracts\Core\Repository\Values\Content\Query\Criterion; +use Ibexa\Contracts\Core\Repository\Values\Filter\Filter; /** * Test case for the BookmarkService. @@ -150,6 +152,21 @@ public function testLoadBookmarks() return $location->id; }, $bookmarks->items)); } + + /** + * @covers \Ibexa\Contracts\Core\Repository\BookmarkService::loadBookmarks + */ + public function testCountBookmarks(): void + { + $repository = $this->getRepository(); + + $filter = new Filter(); + $filter + ->withCriterion(new Criterion\IsBookmarked(14)); + $count = $repository->getLocationService()->count($filter, []); + + $this->assertEquals($count, 5); + } } class_alias(BookmarkServiceTest::class, 'eZ\Publish\API\Repository\Tests\BookmarkServiceTest'); From 993e850a2dee062ebdcf60ed5e8097349c954e83 Mon Sep 17 00:00:00 2001 From: Vidar Langseid Date: Tue, 10 Mar 2026 13:05:39 +0100 Subject: [PATCH 10/13] fixup! Added integration test for using Criterion\IsBookmarked and LocationService::count() --- tests/integration/Core/Repository/BookmarkServiceTest.php | 3 --- 1 file changed, 3 deletions(-) diff --git a/tests/integration/Core/Repository/BookmarkServiceTest.php b/tests/integration/Core/Repository/BookmarkServiceTest.php index 15887de5f1..8bb43a8912 100644 --- a/tests/integration/Core/Repository/BookmarkServiceTest.php +++ b/tests/integration/Core/Repository/BookmarkServiceTest.php @@ -153,9 +153,6 @@ public function testLoadBookmarks() }, $bookmarks->items)); } - /** - * @covers \Ibexa\Contracts\Core\Repository\BookmarkService::loadBookmarks - */ public function testCountBookmarks(): void { $repository = $this->getRepository(); From e436267f0720b2970cd6affffa0cb83418a8c7f9 Mon Sep 17 00:00:00 2001 From: Vidar Langseid Date: Tue, 10 Mar 2026 13:59:26 +0100 Subject: [PATCH 11/13] fixup! Added integration test for using Criterion\IsBookmarked and LocationService::count() --- phpstan-baseline.neon | 6 ------ tests/integration/Core/Repository/BookmarkServiceTest.php | 7 +++---- 2 files changed, 3 insertions(+), 10 deletions(-) diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon index f7eb5f4584..3e632f4226 100644 --- a/phpstan-baseline.neon +++ b/phpstan-baseline.neon @@ -32430,12 +32430,6 @@ parameters: count: 1 path: tests/integration/Core/Repository/BaseURLServiceTest.php - - - message: '#^Call to method PHPUnit\\Framework\\Assert\:\:assertInstanceOf\(\) with ''Ibexa\\\\Contracts\\\\Core\\\\Repository\\\\Values\\\\Bookmark\\\\BookmarkList'' and Ibexa\\Contracts\\Core\\Repository\\Values\\Bookmark\\BookmarkList will always evaluate to true\.$#' - identifier: method.alreadyNarrowedType - count: 1 - path: tests/integration/Core/Repository/BookmarkServiceTest.php - - message: '#^Method Ibexa\\Tests\\Integration\\Core\\Repository\\BookmarkServiceTest\:\:testCreateBookmark\(\) has no return type specified\.$#' identifier: missingType.return diff --git a/tests/integration/Core/Repository/BookmarkServiceTest.php b/tests/integration/Core/Repository/BookmarkServiceTest.php index 8bb43a8912..36624cb1e6 100644 --- a/tests/integration/Core/Repository/BookmarkServiceTest.php +++ b/tests/integration/Core/Repository/BookmarkServiceTest.php @@ -145,10 +145,9 @@ public function testLoadBookmarks() $bookmarks = $repository->getBookmarkService()->loadBookmarks(1, 3); /* END: Use Case */ - $this->assertInstanceOf(BookmarkList::class, $bookmarks); - $this->assertEquals($bookmarks->totalCount, 5); + self::assertEquals(5, $bookmarks->totalCount); // Assert bookmarks order: recently added should be first - $this->assertEquals([15, 13, 12], array_map(static function ($location) { + self::assertEquals([15, 13, 12], array_map(static function ($location) { return $location->id; }, $bookmarks->items)); } @@ -162,7 +161,7 @@ public function testCountBookmarks(): void ->withCriterion(new Criterion\IsBookmarked(14)); $count = $repository->getLocationService()->count($filter, []); - $this->assertEquals($count, 5); + $this->assertEquals(5, $count); } } From d9b18bc0574f45ce064e3647257c8ab58ec9978c Mon Sep 17 00:00:00 2001 From: Vidar Langseid Date: Tue, 10 Mar 2026 14:28:18 +0100 Subject: [PATCH 12/13] fixup! fixup! Added integration test for using Criterion\IsBookmarked and LocationService::count() --- tests/integration/Core/Repository/BookmarkServiceTest.php | 1 - 1 file changed, 1 deletion(-) diff --git a/tests/integration/Core/Repository/BookmarkServiceTest.php b/tests/integration/Core/Repository/BookmarkServiceTest.php index 36624cb1e6..8f714daaeb 100644 --- a/tests/integration/Core/Repository/BookmarkServiceTest.php +++ b/tests/integration/Core/Repository/BookmarkServiceTest.php @@ -9,7 +9,6 @@ namespace Ibexa\Tests\Integration\Core\Repository; use Ibexa\Contracts\Core\Repository\Exceptions\InvalidArgumentException; -use Ibexa\Contracts\Core\Repository\Values\Bookmark\BookmarkList; use Ibexa\Contracts\Core\Repository\Values\Content\Query\Criterion; use Ibexa\Contracts\Core\Repository\Values\Filter\Filter; From 53437306715b644aadd878a3bf6f1124b54c0e56 Mon Sep 17 00:00:00 2001 From: Vidar Langseid Date: Tue, 10 Mar 2026 14:41:33 +0100 Subject: [PATCH 13/13] Apply suggestion from @konradoboza Co-authored-by: Konrad Oboza --- tests/integration/Core/Repository/BookmarkServiceTest.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/integration/Core/Repository/BookmarkServiceTest.php b/tests/integration/Core/Repository/BookmarkServiceTest.php index 8f714daaeb..4182d45d62 100644 --- a/tests/integration/Core/Repository/BookmarkServiceTest.php +++ b/tests/integration/Core/Repository/BookmarkServiceTest.php @@ -160,7 +160,7 @@ public function testCountBookmarks(): void ->withCriterion(new Criterion\IsBookmarked(14)); $count = $repository->getLocationService()->count($filter, []); - $this->assertEquals(5, $count); + self::assertEquals(5, $count); } }