From e79dfd04e1f4ce5b24250005f2449a78e872c0c2 Mon Sep 17 00:00:00 2001 From: Vidar Langseid Date: Wed, 16 Sep 2026 15:11:33 +0200 Subject: [PATCH 1/2] Used bookmark gateway constants instead of hardcoded table and column names in tests --- tests/integration/Core/Repository/LocationServiceTest.php | 7 ++++--- .../Location/IsBookmarkedQueryBuilderTest.php | 6 ++++-- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/tests/integration/Core/Repository/LocationServiceTest.php b/tests/integration/Core/Repository/LocationServiceTest.php index a87338e808..3c5a0710d5 100644 --- a/tests/integration/Core/Repository/LocationServiceTest.php +++ b/tests/integration/Core/Repository/LocationServiceTest.php @@ -25,6 +25,7 @@ use Ibexa\Contracts\Core\Repository\Values\Content\Search\SearchHit; use Ibexa\Contracts\Core\Repository\Values\Content\URLAlias; use Ibexa\Contracts\Core\Repository\Values\User\Limitation\SubtreeLimitation; +use Ibexa\Core\Persistence\Legacy\Bookmark\Gateway\DoctrineDatabase; use Ibexa\Core\Persistence\Legacy\Content\Location\Gateway; use Ibexa\Core\Repository\Values\Content\ContentUpdateStruct; @@ -2412,11 +2413,11 @@ public function testDeleteLocationDeletesRelatedBookmarks() $connection = $this->getRawDatabaseConnection(); $query = $connection->createQueryBuilder(); $query - ->select('COUNT(id)') - ->from('ibexa_content_bookmark') + ->select('COUNT(' . DoctrineDatabase::COLUMN_ID . ')') + ->from(DoctrineDatabase::TABLE_BOOKMARKS) ->where( $query->expr()->eq( - 'node_id', + DoctrineDatabase::COLUMN_LOCATION_ID, $query->createNamedParameter($childLocation->getId(), ParameterType::INTEGER) ) ); diff --git a/tests/lib/Persistence/Legacy/Filter/CriterionQueryBuilder/Location/IsBookmarkedQueryBuilderTest.php b/tests/lib/Persistence/Legacy/Filter/CriterionQueryBuilder/Location/IsBookmarkedQueryBuilderTest.php index dcc45fc75c..8115804544 100644 --- a/tests/lib/Persistence/Legacy/Filter/CriterionQueryBuilder/Location/IsBookmarkedQueryBuilderTest.php +++ b/tests/lib/Persistence/Legacy/Filter/CriterionQueryBuilder/Location/IsBookmarkedQueryBuilderTest.php @@ -11,6 +11,7 @@ use Ibexa\Contracts\Core\Repository\PermissionResolver; use Ibexa\Contracts\Core\Repository\Values\Content\Query\Criterion as Criterion; use Ibexa\Contracts\Core\Repository\Values\User\UserReference; +use Ibexa\Core\Persistence\Legacy\Bookmark\Gateway\DoctrineDatabase; use Ibexa\Core\Persistence\Legacy\Filter\CriterionQueryBuilder\Location\IsBookmarkedQueryBuilder; use Ibexa\Tests\Core\Persistence\Legacy\Filter\BaseCriterionVisitorQueryBuilderTestCase; @@ -21,8 +22,9 @@ final class IsBookmarkedQueryBuilderTest extends BaseCriterionVisitorQueryBuilde { private const CURRENT_USER_ID = 14; - private const BOOKMARK_EXISTS_SUBQUERY = 'SELECT 1 FROM ibexa_content_bookmark bookmark WHERE ' - . '(bookmark.user_id = :dcValue%1$d) AND (bookmark.node_id = location.node_id)'; + private const BOOKMARK_EXISTS_SUBQUERY = 'SELECT 1 FROM ' . DoctrineDatabase::TABLE_BOOKMARKS . ' bookmark WHERE ' + . '(bookmark.' . DoctrineDatabase::COLUMN_USER_ID . ' = :dcValue%1$d)' + . ' AND (bookmark.' . DoctrineDatabase::COLUMN_LOCATION_ID . ' = location.node_id)'; /** * @return iterable}> From 03bbfdeca5fc8b7e8327dcc059de8208911a963e Mon Sep 17 00:00:00 2001 From: Vidar Langseid Date: Thu, 17 Sep 2026 10:55:52 +0200 Subject: [PATCH 2/2] Used content gateway constant instead of hardcoded content item table name in test --- .../Location/Bookmark/IdSortClauseQueryBuilderTest.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/lib/Persistence/Legacy/Filter/SortClauseQueryBuilder/Location/Bookmark/IdSortClauseQueryBuilderTest.php b/tests/lib/Persistence/Legacy/Filter/SortClauseQueryBuilder/Location/Bookmark/IdSortClauseQueryBuilderTest.php index f31817a6d2..f77fc37d85 100644 --- a/tests/lib/Persistence/Legacy/Filter/SortClauseQueryBuilder/Location/Bookmark/IdSortClauseQueryBuilderTest.php +++ b/tests/lib/Persistence/Legacy/Filter/SortClauseQueryBuilder/Location/Bookmark/IdSortClauseQueryBuilderTest.php @@ -15,6 +15,7 @@ use Ibexa\Contracts\Core\Repository\Values\Content\Query\SortClause\Location\Bookmark\Id; use Ibexa\Contracts\Core\Repository\Values\User\UserReference; use Ibexa\Core\Persistence\Legacy\Bookmark\Gateway\DoctrineDatabase; +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\SortClauseQueryBuilder\Location\Bookmark\IdSortClauseQueryBuilder; use PHPUnit\Framework\TestCase; @@ -28,7 +29,6 @@ final class IdSortClauseQueryBuilderTest extends TestCase private const BOOKMARK_ALIAS = 'ibexa_sort_bookmark'; private const CONTENT_LOCATION_ALIAS = 'ibexa_sort_location'; private const SORT_ALIAS = 'ibexa_filter_sort_bookmark_id'; - private const CONTENT_ITEM_TABLE = 'ezcontentobject'; /** * Location filtering: "location" is the FROM table, so the bookmarks table is joined @@ -185,7 +185,7 @@ private function createLocationFilteringQueryBuilder(): FilteringQueryBuilder ->from(LocationGateway::CONTENT_TREE_TABLE, 'location') ->join( 'location', - self::CONTENT_ITEM_TABLE, + ContentGateway::CONTENT_ITEM_TABLE, 'content', 'content.id = location.contentobject_id' ); @@ -203,7 +203,7 @@ private function createContentFilteringQueryBuilder(): FilteringQueryBuilder $queryBuilder = new FilteringQueryBuilder($this->createInMemoryConnection()); $queryBuilder ->select('content.id') - ->from(self::CONTENT_ITEM_TABLE, 'content'); + ->from(ContentGateway::CONTENT_ITEM_TABLE, 'content'); return $queryBuilder; }