fixup! IBX-6773: Bookmarks for non-accessible contents cause exceptio…

…n - Changed to ibexa namespace for new classes
ezsystems · Jun 25, 2024 · fabbe47 · fabbe47
1 parent 6091d1d
commit fabbe47
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 9 deletions.
diff --git a/.../Content/Query/Criterion/IsBookmarked.php → .../Content/Query/Criterion/IsBookmarked.php b/.../Content/Query/Criterion/IsBookmarked.php → .../Content/Query/Criterion/IsBookmarked.php
@@ -6,7 +6,7 @@
  */
 declare(strict_types=1);
 
-namespace eZ\Publish\API\Repository\Values\Content\Query\Criterion;
+namespace Ibexa\Contracts\Core\Repository\Values\Content\Query\Criterion;
 
 use eZ\Publish\API\Repository\Values\Content\Query\Criterion;
 use eZ\Publish\API\Repository\Values\Content\Query\Criterion\Operator\Specifications;

diff --git a/...s/Content/Query/SortClause/BookmarkId.php → ...s/Content/Query/SortClause/BookmarkId.php b/...s/Content/Query/SortClause/BookmarkId.php → ...s/Content/Query/SortClause/BookmarkId.php
@@ -6,7 +6,7 @@
  */
 declare(strict_types=1);
 
-namespace eZ\Publish\API\Repository\Values\Content\Query\SortClause;
+namespace Ibexa\Contracts\Core\Repository\Values\Content\Query\SortClause;
 
 use eZ\Publish\API\Repository\Values\Content\Query;
 use eZ\Publish\API\Repository\Values\Content\Query\SortClause;

diff --git a/...Builder/Location/BookmarkQueryBuilder.php → ...Builder/Location/BookmarkQueryBuilder.php b/...Builder/Location/BookmarkQueryBuilder.php → ...Builder/Location/BookmarkQueryBuilder.php
@@ -6,13 +6,14 @@
  */
 declare(strict_types=1);
 
-namespace eZ\Publish\Core\Persistence\Legacy\Filter\CriterionQueryBuilder\Location;
+namespace Ibexa\Core\Persistence\Legacy\Filter\CriterionQueryBuilder\Location;
 
 use Doctrine\DBAL\ParameterType;
-use eZ\Publish\API\Repository\Values\Content\Query\Criterion\IsBookmarked;
 use eZ\Publish\Core\Persistence\Legacy\Bookmark\Gateway\DoctrineDatabase;
+use eZ\Publish\Core\Persistence\Legacy\Filter\CriterionQueryBuilder\Location\BaseLocationCriterionQueryBuilder;
 use eZ\Publish\SPI\Persistence\Filter\Doctrine\FilteringQueryBuilder;
 use eZ\Publish\SPI\Repository\Values\Filter\FilteringCriterion;
+use Ibexa\Contracts\Core\Repository\Values\Content\Query\Criterion\IsBookmarked;
 
 /**
  * @internal for internal use by Repository Filtering

diff --git a/...der/Location/BookmarkQueryBuilderTest.php → ...der/Location/BookmarkQueryBuilderTest.php b/...der/Location/BookmarkQueryBuilderTest.php → ...der/Location/BookmarkQueryBuilderTest.php
@@ -6,11 +6,12 @@
  */
 declare(strict_types=1);
 
-namespace eZ\Publish\Core\Persistence\Legacy\Tests\Filter\CriterionQueryBuilder\Location;
+namespace Ibexa\Tests\Core\Persistence\Legacy\Filter\CriterionQueryBuilder\Location;
 
-use eZ\Publish\API\Repository\Values\Content\Query\Criterion;
-use eZ\Publish\Core\Persistence\Legacy\Filter\CriterionQueryBuilder\Location\BookmarkQueryBuilder;
+use eZ\Publish\API\Repository\Values\Content\Query\Criterion as EzCriterion;
 use eZ\Publish\Core\Persistence\Legacy\Tests\Filter\BaseCriterionVisitorQueryBuilderTestCase;
+use Ibexa\Contracts\Core\Repository\Values\Content\Query\Criterion;
+use Ibexa\Core\Persistence\Legacy\Filter\CriterionQueryBuilder\Location\BookmarkQueryBuilder;
 
 final class BookmarkQueryBuilderTest extends BaseCriterionVisitorQueryBuilderTestCase
 {
@@ -23,7 +24,7 @@ public function getFilteringCriteriaQueryData(): iterable
         ];
 
         yield 'Bookmarks locations for user_id=14 OR user_id=7' => [
-            new Criterion\LogicalOr(
+            new EzCriterion\LogicalOr(
                 [
                     new Criterion\IsBookmarked(14),
                     new Criterion\IsBookmarked(7),

diff --git a/...der/Bookmark/IdSortClauseQueryBuilder.php → ...der/Bookmark/IdSortClauseQueryBuilder.php b/...der/Bookmark/IdSortClauseQueryBuilder.php → ...der/Bookmark/IdSortClauseQueryBuilder.php
@@ -6,7 +6,7 @@
  */
 declare(strict_types=1);
 
-namespace eZ\Publish\Core\Persistence\Legacy\Filter\SortClauseQueryBuilder\Bookmark;
+namespace Ibexa\Core\Persistence\Legacy\Filter\SortClauseQueryBuilder\Bookmark;
 
 use eZ\Publish\API\Repository\Values\Content\Query\SortClause\BookmarkId;
 use eZ\Publish\SPI\Persistence\Filter\Doctrine\FilteringQueryBuilder;