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

ezsystems · Jun 7, 2024 · 023111b · 023111b
1 parent ddca556
commit 023111b
Show file tree

Hide file tree

Showing 11 changed files with 21 additions and 21 deletions.
diff --git a/...lues/Content/Query/Criterion/Bookmark.php → .../Content/Query/Criterion/IsBookmarked.php b/...lues/Content/Query/Criterion/Bookmark.php → .../Content/Query/Criterion/IsBookmarked.php
@@ -19,10 +19,10 @@
  * Supported operators:
  * - EQ: matches against a unique user id
  */
-class Bookmark extends Criterion implements FilteringCriterion
+class IsBookmarked extends Criterion implements FilteringCriterion
 {
     /**
-     * Creates a new Bookmark criterion.
+     * Creates a new IsBookmarked criterion.
      *
      * @param int $value UserID for which bookmarked locations must be matched against
      *

diff --git a/eZ/Publish/API/Repository/Values/Content/Query/SortClause/BookmarkId.php b/eZ/Publish/API/Repository/Values/Content/Query/SortClause/BookmarkId.php
@@ -13,7 +13,7 @@
 use eZ\Publish\SPI\Repository\Values\Filter\FilteringSortClause;
 
 /**
- * Sets sort direction on the bookmark id for a location query containing a Bookmark criterion.
+ * Sets sort direction on the Bookmark ID for a location query containing a IsBookmarked criterion.
  */
 class BookmarkId extends SortClause implements FilteringSortClause
 {

diff --git a/eZ/Publish/Core/Persistence/Cache/BookmarkHandler.php b/eZ/Publish/Core/Persistence/Cache/BookmarkHandler.php
@@ -85,7 +85,7 @@ function (Bookmark $bookmark) {
     }
 
     /**
-     * @deprecated Please use LocationService::find() and Criterion\Bookmark instead.
+     * @deprecated Please use LocationService::find() and Criterion\IsBookmarked instead.
      *
      * {@inheritdoc}
      */
@@ -101,7 +101,7 @@ public function loadUserBookmarks(int $userId, int $offset = 0, int $limit = -1)
     }
 
     /**
-     * @deprecated Please use LocationService::count() and Criterion\Bookmark instead.
+     * @deprecated Please use LocationService::count() and Criterion\IsBookmarked instead.
      *
      * {@inheritdoc}
      */

diff --git a/eZ/Publish/Core/Persistence/Legacy/Bookmark/Gateway.php b/eZ/Publish/Core/Persistence/Legacy/Bookmark/Gateway.php
@@ -44,7 +44,7 @@ abstract public function loadBookmarkDataByUserIdAndLocationId(int $userId, arra
     /**
      * Load data for all bookmarks owned by given $userId.
      *
-     * @deprecated Please use LocationService::find() and Criterion\Bookmark instead.
+     * @deprecated Please use LocationService::find() and Criterion\IsBookmarked instead.
      *
      * @param int $userId ID of user
      * @param int $offset Offset to start listing from, 0 by default
@@ -57,7 +57,7 @@ abstract public function loadUserBookmarks(int $userId, int $offset = 0, int $li
     /**
      * Count bookmarks owned by given $userId.
      *
-     * @deprecated Please use LocationService::count() and Criterion\Bookmark instead.
+     * @deprecated Please use LocationService::count() and Criterion\IsBookmarked instead.
      *
      * @param int $userId ID of user
      *

diff --git a/eZ/Publish/Core/Persistence/Legacy/Bookmark/Gateway/DoctrineDatabase.php b/eZ/Publish/Core/Persistence/Legacy/Bookmark/Gateway/DoctrineDatabase.php
@@ -101,7 +101,7 @@ public function loadBookmarkDataByUserIdAndLocationId(int $userId, array $locati
     }
 
     /**
-     * @deprecated Please use LocationService::find() and Criterion\Bookmark instead.
+     * @deprecated Please use LocationService::find() and Criterion\IsBookmarked instead.
      *
      * {@inheritdoc}
      */
@@ -125,7 +125,7 @@ public function loadUserBookmarks(int $userId, int $offset = 0, int $limit = -1)
     }
 
     /**
-     * @deprecated Please use LocationService::count() and Criterion\Bookmark instead.
+     * @deprecated Please use LocationService::count() and Criterion\IsBookmarked instead.
      *
      * {@inheritdoc}
      */

diff --git a/eZ/Publish/Core/Persistence/Legacy/Bookmark/Gateway/ExceptionConversion.php b/eZ/Publish/Core/Persistence/Legacy/Bookmark/Gateway/ExceptionConversion.php
@@ -57,7 +57,7 @@ public function loadBookmarkDataByUserIdAndLocationId(int $userId, array $locati
     }
 
     /**
-     * @deprecated Please use LocationService::find() and Criterion\Bookmark instead.
+     * @deprecated Please use LocationService::find() and Criterion\IsBookmarked instead.
      *
      * @param int $userId
      * @param int $offset
@@ -75,7 +75,7 @@ public function loadUserBookmarks(int $userId, int $offset = 0, int $limit = -1)
     }
 
     /**
-     * @deprecated Please use LocationService::count() and Criterion\Bookmark instead.
+     * @deprecated Please use LocationService::count() and Criterion\IsBookmarked instead.
      *
      * @param int $userId
      *

diff --git a/eZ/Publish/Core/Persistence/Legacy/Bookmark/Handler.php b/eZ/Publish/Core/Persistence/Legacy/Bookmark/Handler.php
@@ -74,7 +74,7 @@ public function loadByUserIdAndLocationId(int $userId, array $locationIds): arra
     }
 
     /**
-     * @deprecated Please use LocationService::find() and Criterion\Bookmark instead.
+     * @deprecated Please use LocationService::find() and Criterion\IsBookmarked instead.
      *
      * {@inheritdoc}
      */
@@ -86,7 +86,7 @@ public function loadUserBookmarks(int $userId, int $offset = 0, int $limit = -1)
     }
 
     /**
-     * @deprecated Please use LocationService::count() and Criterion\Bookmark instead.
+     * @deprecated Please use LocationService::count() and Criterion\IsBookmarked instead.
      *
      * {@inheritdoc}
      */

diff --git a/...sh/Core/Persistence/Legacy/Filter/CriterionQueryBuilder/Location/BookmarkQueryBuilder.php b/...sh/Core/Persistence/Legacy/Filter/CriterionQueryBuilder/Location/BookmarkQueryBuilder.php
@@ -9,7 +9,7 @@
 namespace eZ\Publish\Core\Persistence\Legacy\Filter\CriterionQueryBuilder\Location;
 
 use Doctrine\DBAL\ParameterType;
-use eZ\Publish\API\Repository\Values\Content\Query\Criterion\Bookmark;
+use eZ\Publish\API\Repository\Values\Content\Query\Criterion\IsBookmarked;
 use eZ\Publish\Core\Persistence\Legacy\Bookmark\Gateway\DoctrineDatabase;
 use eZ\Publish\SPI\Persistence\Filter\Doctrine\FilteringQueryBuilder;
 use eZ\Publish\SPI\Repository\Values\Filter\FilteringCriterion;
@@ -21,7 +21,7 @@ final class BookmarkQueryBuilder extends BaseLocationCriterionQueryBuilder
 {
     public function accepts(FilteringCriterion $criterion): bool
     {
-        return $criterion instanceof Bookmark;
+        return $criterion instanceof IsBookmarked;
     }
 
     public function buildQueryConstraint(

diff --git a/...rsistence/Legacy/Tests/Filter/CriterionQueryBuilder/Location/BookmarkQueryBuilderTest.php b/...rsistence/Legacy/Tests/Filter/CriterionQueryBuilder/Location/BookmarkQueryBuilderTest.php
@@ -21,16 +21,16 @@ final class BookmarkQueryBuilderTest extends BaseCriterionVisitorQueryBuilderTes
     public function getFilteringCriteriaQueryData(): iterable
     {
         yield 'Bookmarks locations for user_id=14' => [
-            new Criterion\Bookmark(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\Bookmark(14),
-                    new Criterion\Bookmark(7),
+                    new Criterion\IsBookmarked(14),
+                    new Criterion\IsBookmarked(7),
                 ]
             ),
             '(bookmark.user_id = :dcValue1) OR (bookmark.user_id = :dcValue2)',

diff --git a/eZ/Publish/Core/Repository/BookmarkService.php b/eZ/Publish/Core/Repository/BookmarkService.php
@@ -103,7 +103,7 @@ public function loadBookmarks(int $offset = 0, int $limit = 25): BookmarkList
         $filter = new Filter();
         try {
             $filter
-                ->withCriterion(new Criterion\Bookmark($currentUserId))
+                ->withCriterion(new Criterion\IsBookmarked($currentUserId))
                 ->withSortClause(new SortClause\BookmarkId(Query::SORT_DESC))
                 ->sliceBy($limit, $offset);
 

diff --git a/eZ/Publish/SPI/Persistence/Bookmark/Handler.php b/eZ/Publish/SPI/Persistence/Bookmark/Handler.php
@@ -41,7 +41,7 @@ public function loadByUserIdAndLocationId(int $userId, array $locationIds): arra
     /**
      * Loads bookmarks owned by user.
      *
-     * @deprecated Please use LocationService::find() and Criterion\Bookmark instead.
+     * @deprecated Please use LocationService::find() and Criterion\IsBookmarked instead.
      *
      * @param int $userId
      * @param int $offset the start offset for paging
@@ -54,7 +54,7 @@ public function loadUserBookmarks(int $userId, int $offset = 0, int $limit = -1)
     /**
      * Count bookmarks owned by user.
      *
-     * @deprecated Please use LocationService::count() and Criterion\Bookmark instead.
+     * @deprecated Please use LocationService::count() and Criterion\IsBookmarked instead.
      *
      * @param int $userId
      *