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

vidarl · vidarl · commit 023111bb3534 · 2024-06-07T06:58:26.000+02:00
diff --git a/eZ/Publish/API/Repository/Values/Content/Query/Criterion/IsBookmarked.php b/eZ/Publish/API/Repository/Values/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/eZ/Publish/Core/Persistence/Legacy/Filter/CriterionQueryBuilder/Location/BookmarkQueryBuilder.php b/eZ/Publish/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/eZ/Publish/Core/Persistence/Legacy/Tests/Filter/CriterionQueryBuilder/Location/BookmarkQueryBuilderTest.php b/eZ/Publish/Core/Persistence/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
      *

Original file line number	Diff line number	Diff line change
`@@ -19,10 +19,10 @@`
`19`	`19`	`* Supported operators:`
`20`	`20`	`* - EQ: matches against a unique user id`
`21`	`21`	`*/`
`22`		`-class Bookmark extends Criterion implements FilteringCriterion`
	`22`	`+class IsBookmarked extends Criterion implements FilteringCriterion`
`23`	`23`	`{`
`24`	`24`	`/**`
`25`		`- * Creates a new Bookmark criterion.`
	`25`	`+ * Creates a new IsBookmarked criterion.`
`26`	`26`	`*`
`27`	`27`	`* @param int $value UserID for which bookmarked locations must be matched against`
`28`	`28`	`*`
Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@`
`13`	`13`	`use eZ\Publish\SPI\Repository\Values\Filter\FilteringSortClause;`
`14`	`14`
`15`	`15`	`/**`
`16`		`- * Sets sort direction on the bookmark id for a location query containing a Bookmark criterion.`
	`16`	`+ * Sets sort direction on the Bookmark ID for a location query containing a IsBookmarked criterion.`
`17`	`17`	`*/`
`18`	`18`	`class BookmarkId extends SortClause implements FilteringSortClause`
`19`	`19`	`{`
Original file line number	Diff line number	Diff line change
`@@ -85,7 +85,7 @@ function (Bookmark $bookmark) {`
`85`	`85`	`}`
`86`	`86`
`87`	`87`	`/**`
`88`		`- * @deprecated Please use LocationService::find() and Criterion\Bookmark instead.`
	`88`	`+ * @deprecated Please use LocationService::find() and Criterion\IsBookmarked instead.`
`89`	`89`	`*`
`90`	`90`	`* {@inheritdoc}`
`91`	`91`	`*/`
`@@ -101,7 +101,7 @@ public function loadUserBookmarks(int $userId, int $offset = 0, int $limit = -1)`
`101`	`101`	`}`
`102`	`102`
`103`	`103`	`/**`
`104`		`- * @deprecated Please use LocationService::count() and Criterion\Bookmark instead.`
	`104`	`+ * @deprecated Please use LocationService::count() and Criterion\IsBookmarked instead.`
`105`	`105`	`*`
`106`	`106`	`* {@inheritdoc}`
`107`	`107`	`*/`
Original file line number	Diff line number	Diff line change
`@@ -44,7 +44,7 @@ abstract public function loadBookmarkDataByUserIdAndLocationId(int $userId, arra`
`44`	`44`	`/**`
`45`	`45`	`* Load data for all bookmarks owned by given $userId.`
`46`	`46`	`*`
`47`		`- * @deprecated Please use LocationService::find() and Criterion\Bookmark instead.`
	`47`	`+ * @deprecated Please use LocationService::find() and Criterion\IsBookmarked instead.`
`48`	`48`	`*`
`49`	`49`	`* @param int $userId ID of user`
`50`	`50`	`* @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`
`57`	`57`	`/**`
`58`	`58`	`* Count bookmarks owned by given $userId.`
`59`	`59`	`*`
`60`		`- * @deprecated Please use LocationService::count() and Criterion\Bookmark instead.`
	`60`	`+ * @deprecated Please use LocationService::count() and Criterion\IsBookmarked instead.`
`61`	`61`	`*`
`62`	`62`	`* @param int $userId ID of user`
`63`	`63`	`*`
Original file line number	Diff line number	Diff line change
`@@ -57,7 +57,7 @@ public function loadBookmarkDataByUserIdAndLocationId(int $userId, array $locati`
`57`	`57`	`}`
`58`	`58`
`59`	`59`	`/**`
`60`		`- * @deprecated Please use LocationService::find() and Criterion\Bookmark instead.`
	`60`	`+ * @deprecated Please use LocationService::find() and Criterion\IsBookmarked instead.`
`61`	`61`	`*`
`62`	`62`	`* @param int $userId`
`63`	`63`	`* @param int $offset`
`@@ -75,7 +75,7 @@ public function loadUserBookmarks(int $userId, int $offset = 0, int $limit = -1)`
`75`	`75`	`}`
`76`	`76`
`77`	`77`	`/**`
`78`		`- * @deprecated Please use LocationService::count() and Criterion\Bookmark instead.`
	`78`	`+ * @deprecated Please use LocationService::count() and Criterion\IsBookmarked instead.`
`79`	`79`	`*`
`80`	`80`	`* @param int $userId`
`81`	`81`	`*`
Original file line number	Diff line number	Diff line change
`@@ -74,7 +74,7 @@ public function loadByUserIdAndLocationId(int $userId, array $locationIds): arra`
`74`	`74`	`}`
`75`	`75`
`76`	`76`	`/**`
`77`		`- * @deprecated Please use LocationService::find() and Criterion\Bookmark instead.`
	`77`	`+ * @deprecated Please use LocationService::find() and Criterion\IsBookmarked instead.`
`78`	`78`	`*`
`79`	`79`	`* {@inheritdoc}`
`80`	`80`	`*/`
`@@ -86,7 +86,7 @@ public function loadUserBookmarks(int $userId, int $offset = 0, int $limit = -1)`
`86`	`86`	`}`
`87`	`87`
`88`	`88`	`/**`
`89`		`- * @deprecated Please use LocationService::count() and Criterion\Bookmark instead.`
	`89`	`+ * @deprecated Please use LocationService::count() and Criterion\IsBookmarked instead.`
`90`	`90`	`*`
`91`	`91`	`* {@inheritdoc}`
`92`	`92`	`*/`
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@`
`9`	`9`	`namespace eZ\Publish\Core\Persistence\Legacy\Filter\CriterionQueryBuilder\Location;`
`10`	`10`
`11`	`11`	`use Doctrine\DBAL\ParameterType;`
`12`		`-use eZ\Publish\API\Repository\Values\Content\Query\Criterion\Bookmark;`
	`12`	`+use eZ\Publish\API\Repository\Values\Content\Query\Criterion\IsBookmarked;`
`13`	`13`	`use eZ\Publish\Core\Persistence\Legacy\Bookmark\Gateway\DoctrineDatabase;`
`14`	`14`	`use eZ\Publish\SPI\Persistence\Filter\Doctrine\FilteringQueryBuilder;`
`15`	`15`	`use eZ\Publish\SPI\Repository\Values\Filter\FilteringCriterion;`
`@@ -21,7 +21,7 @@ final class BookmarkQueryBuilder extends BaseLocationCriterionQueryBuilder`
`21`	`21`	`{`
`22`	`22`	`public function accepts(FilteringCriterion $criterion): bool`
`23`	`23`	`{`
`24`		`- return $criterion instanceof Bookmark;`
	`24`	`+ return $criterion instanceof IsBookmarked;`
`25`	`25`	`}`
`26`	`26`
`27`	`27`	`public function buildQueryConstraint(`
Original file line number	Diff line number	Diff line change
`@@ -21,16 +21,16 @@ final class BookmarkQueryBuilderTest extends BaseCriterionVisitorQueryBuilderTes`
`21`	`21`	`public function getFilteringCriteriaQueryData(): iterable`
`22`	`22`	`{`
`23`	`23`	`yield 'Bookmarks locations for user_id=14' => [`
`24`		`- new Criterion\Bookmark(14),`
	`24`	`+ new Criterion\IsBookmarked(14),`
`25`	`25`	`'bookmark.user_id = :dcValue1',`
`26`	`26`	`['dcValue1' => 14],`
`27`	`27`	`];`
`28`	`28`
`29`	`29`	`yield 'Bookmarks locations for user_id=14 OR user_id=7' => [`
`30`	`30`	`new Criterion\LogicalOr(`
`31`	`31`	`[`
`32`		`- new Criterion\Bookmark(14),`
`33`		`- new Criterion\Bookmark(7),`
	`32`	`+ new Criterion\IsBookmarked(14),`
	`33`	`+ new Criterion\IsBookmarked(7),`
`34`	`34`	`]`
`35`	`35`	`),`
`36`	`36`	`'(bookmark.user_id = :dcValue1) OR (bookmark.user_id = :dcValue2)',`
Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,7 @@ public function loadByUserIdAndLocationId(int $userId, array $locationIds): arra`
`41`	`41`	`/**`
`42`	`42`	`* Loads bookmarks owned by user.`
`43`	`43`	`*`
`44`		`- * @deprecated Please use LocationService::find() and Criterion\Bookmark instead.`
	`44`	`+ * @deprecated Please use LocationService::find() and Criterion\IsBookmarked instead.`
`45`	`45`	`*`
`46`	`46`	`* @param int $userId`
`47`	`47`	`* @param int $offset the start offset for paging`
`@@ -54,7 +54,7 @@ public function loadUserBookmarks(int $userId, int $offset = 0, int $limit = -1)`
`54`	`54`	`/**`
`55`	`55`	`* Count bookmarks owned by user.`
`56`	`56`	`*`
`57`		`- * @deprecated Please use LocationService::count() and Criterion\Bookmark instead.`
	`57`	`+ * @deprecated Please use LocationService::count() and Criterion\IsBookmarked instead.`
`58`	`58`	`*`
`59`	`59`	`* @param int $userId`
`60`	`60`	`*`