Skip to content

Commit fabbe47

Browse files
committed
fixup! IBX-6773: Bookmarks for non-accessible contents cause exception - Changed to ibexa namespace for new classes
1 parent 6091d1d commit fabbe47

File tree

5 files changed

+11
-9
lines changed

5 files changed

+11
-9
lines changed

eZ/Publish/API/Repository/Values/Content/Query/Criterion/IsBookmarked.php src/contracts/Repository/Values/Content/Query/Criterion/IsBookmarked.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
*/
77
declare(strict_types=1);
88

9-
namespace eZ\Publish\API\Repository\Values\Content\Query\Criterion;
9+
namespace Ibexa\Contracts\Core\Repository\Values\Content\Query\Criterion;
1010

1111
use eZ\Publish\API\Repository\Values\Content\Query\Criterion;
1212
use eZ\Publish\API\Repository\Values\Content\Query\Criterion\Operator\Specifications;

eZ/Publish/API/Repository/Values/Content/Query/SortClause/BookmarkId.php src/contracts/Repository/Values/Content/Query/SortClause/BookmarkId.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
*/
77
declare(strict_types=1);
88

9-
namespace eZ\Publish\API\Repository\Values\Content\Query\SortClause;
9+
namespace Ibexa\Contracts\Core\Repository\Values\Content\Query\SortClause;
1010

1111
use eZ\Publish\API\Repository\Values\Content\Query;
1212
use eZ\Publish\API\Repository\Values\Content\Query\SortClause;

eZ/Publish/Core/Persistence/Legacy/Filter/CriterionQueryBuilder/Location/BookmarkQueryBuilder.php src/lib/Persistence/Legacy/Filter/CriterionQueryBuilder/Location/BookmarkQueryBuilder.php

+3-2
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,14 @@
66
*/
77
declare(strict_types=1);
88

9-
namespace eZ\Publish\Core\Persistence\Legacy\Filter\CriterionQueryBuilder\Location;
9+
namespace Ibexa\Core\Persistence\Legacy\Filter\CriterionQueryBuilder\Location;
1010

1111
use Doctrine\DBAL\ParameterType;
12-
use eZ\Publish\API\Repository\Values\Content\Query\Criterion\IsBookmarked;
1312
use eZ\Publish\Core\Persistence\Legacy\Bookmark\Gateway\DoctrineDatabase;
13+
use eZ\Publish\Core\Persistence\Legacy\Filter\CriterionQueryBuilder\Location\BaseLocationCriterionQueryBuilder;
1414
use eZ\Publish\SPI\Persistence\Filter\Doctrine\FilteringQueryBuilder;
1515
use eZ\Publish\SPI\Repository\Values\Filter\FilteringCriterion;
16+
use Ibexa\Contracts\Core\Repository\Values\Content\Query\Criterion\IsBookmarked;
1617

1718
/**
1819
* @internal for internal use by Repository Filtering

eZ/Publish/Core/Persistence/Legacy/Tests/Filter/CriterionQueryBuilder/Location/BookmarkQueryBuilderTest.php tests/lib/Persistence/Legacy/Filter/CriterionQueryBuilder/Location/BookmarkQueryBuilderTest.php

+5-4
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,12 @@
66
*/
77
declare(strict_types=1);
88

9-
namespace eZ\Publish\Core\Persistence\Legacy\Tests\Filter\CriterionQueryBuilder\Location;
9+
namespace Ibexa\Tests\Core\Persistence\Legacy\Filter\CriterionQueryBuilder\Location;
1010

11-
use eZ\Publish\API\Repository\Values\Content\Query\Criterion;
12-
use eZ\Publish\Core\Persistence\Legacy\Filter\CriterionQueryBuilder\Location\BookmarkQueryBuilder;
11+
use eZ\Publish\API\Repository\Values\Content\Query\Criterion as EzCriterion;
1312
use eZ\Publish\Core\Persistence\Legacy\Tests\Filter\BaseCriterionVisitorQueryBuilderTestCase;
13+
use Ibexa\Contracts\Core\Repository\Values\Content\Query\Criterion;
14+
use Ibexa\Core\Persistence\Legacy\Filter\CriterionQueryBuilder\Location\BookmarkQueryBuilder;
1415

1516
final class BookmarkQueryBuilderTest extends BaseCriterionVisitorQueryBuilderTestCase
1617
{
@@ -23,7 +24,7 @@ public function getFilteringCriteriaQueryData(): iterable
2324
];
2425

2526
yield 'Bookmarks locations for user_id=14 OR user_id=7' => [
26-
new Criterion\LogicalOr(
27+
new EzCriterion\LogicalOr(
2728
[
2829
new Criterion\IsBookmarked(14),
2930
new Criterion\IsBookmarked(7),

eZ/Publish/Core/Persistence/Legacy/Filter/SortClauseQueryBuilder/Bookmark/IdSortClauseQueryBuilder.php vendor/ibexa/core/src/lib/Persistence/Legacy/Filter/SortClauseQueryBuilder/Bookmark/IdSortClauseQueryBuilder.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
*/
77
declare(strict_types=1);
88

9-
namespace eZ\Publish\Core\Persistence\Legacy\Filter\SortClauseQueryBuilder\Bookmark;
9+
namespace Ibexa\Core\Persistence\Legacy\Filter\SortClauseQueryBuilder\Bookmark;
1010

1111
use eZ\Publish\API\Repository\Values\Content\Query\SortClause\BookmarkId;
1212
use eZ\Publish\SPI\Persistence\Filter\Doctrine\FilteringQueryBuilder;

0 commit comments

Comments
 (0)