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

vidarl · vidarl · commit 9c9b56e58a24 · 2024-06-26T15:15:29.000+02:00
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\IsBookmarked instead.
+     * @deprecated The "BookmarkHandler::loadUserBookmarks()" method is deprecated, will be removed in 5.0.0. 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\IsBookmarked instead.
+     * @deprecated The "BookmarkHandler::countUserBookmarks()" method is deprecated, will be removed in 5.0.0. 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\IsBookmarked instead.
+     * @deprecated Gateway::loadUserBookmarks()" method is deprecated, will be removed in 5.0.0. 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\IsBookmarked instead.
+     * @deprecated The "Gateway::countUserBookmarks()" method is deprecated, will be removed in 5.0.0. 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\IsBookmarked instead.
+     * @deprecated The "DoctrineDatabase::loadUserBookmarks()" method is deprecated, will be removed in 5.0.0. 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\IsBookmarked instead.
+     * @deprecated The "DoctrineDatabase::countUserBookmarks()" method is deprecated, will be removed in 5.0.0. 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\IsBookmarked instead.
+     * @deprecated The "ExceptionConversion::loadUserBookmarks()" method is deprecated, will be removed in 5.0.0. Use "LocationService::find()" and "Criterion\IsBookmarked" instead.
      *
      * @return array
      */
@@ -71,7 +71,7 @@ public function loadUserBookmarks(int $userId, int $offset = 0, int $limit = -1)
     }
 
     /**
-     * @deprecated Please use LocationService::count() and Criterion\IsBookmarked instead.
+     * @deprecated The "ExceptionConversion::countUserBookmarks()" method is deprecated, will be removed in 5.0.0. Use "LocationService::count()" and "Criterion\IsBookmarked" instead.
      */
     public function countUserBookmarks(int $userId): int
     {
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\IsBookmarked instead.
+     * @deprecated The "Handler::loadUserBookmarks()" method is deprecated, will be removed in 5.0.0. 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\IsBookmarked instead.
+     * @deprecated The "Handler::countUserBookmarks()" method is deprecated, will be removed in 5.0.0. Use "LocationService::count()" and "Criterion\IsBookmarked" instead.
      *
      * {@inheritdoc}
      */
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\IsBookmarked instead.
+     * @deprecated The "Handler::loadUserBookmarks()" method is deprecated, will be removed in 5.0.0. 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\IsBookmarked instead.
+     * @deprecated The "Handler::countUserBookmarks()" method is deprecated, will be removed in 5.0.0. Use "LocationService::count()" and "Criterion\IsBookmarked" instead.
      *
      * @param int $userId
      *

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\IsBookmarked instead.`
	`88`	`+ * @deprecated The "BookmarkHandler::loadUserBookmarks()" method is deprecated, will be removed in 5.0.0. 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\IsBookmarked instead.`
	`104`	`+ * @deprecated The "BookmarkHandler::countUserBookmarks()" method is deprecated, will be removed in 5.0.0. 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\IsBookmarked instead.`
	`47`	`+ * @deprecated Gateway::loadUserBookmarks()" method is deprecated, will be removed in 5.0.0. 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\IsBookmarked instead.`
	`60`	`+ * @deprecated The "Gateway::countUserBookmarks()" method is deprecated, will be removed in 5.0.0. 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\IsBookmarked instead.`
	`60`	`+ * @deprecated The "ExceptionConversion::loadUserBookmarks()" method is deprecated, will be removed in 5.0.0. Use "LocationService::find()" and "Criterion\IsBookmarked" instead.`
`61`	`61`	`*`
`62`	`62`	`* @return array`
`63`	`63`	`*/`
`@@ -71,7 +71,7 @@ public function loadUserBookmarks(int $userId, int $offset = 0, int $limit = -1)`
`71`	`71`	`}`
`72`	`72`
`73`	`73`	`/**`
`74`		`- * @deprecated Please use LocationService::count() and Criterion\IsBookmarked instead.`
	`74`	`+ * @deprecated The "ExceptionConversion::countUserBookmarks()" method is deprecated, will be removed in 5.0.0. Use "LocationService::count()" and "Criterion\IsBookmarked" instead.`
`75`	`75`	`*/`
`76`	`76`	`public function countUserBookmarks(int $userId): int`
`77`	`77`	`{`
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\IsBookmarked instead.`
	`77`	`+ * @deprecated The "Handler::loadUserBookmarks()" method is deprecated, will be removed in 5.0.0. 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\IsBookmarked instead.`
	`89`	`+ * @deprecated The "Handler::countUserBookmarks()" method is deprecated, will be removed in 5.0.0. Use "LocationService::count()" and "Criterion\IsBookmarked" instead.`
`90`	`90`	`*`
`91`	`91`	`* {@inheritdoc}`
`92`	`92`	`*/`
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\IsBookmarked instead.`
	`44`	`+ * @deprecated The "Handler::loadUserBookmarks()" method is deprecated, will be removed in 5.0.0. 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\IsBookmarked instead.`
	`57`	`+ * @deprecated The "Handler::countUserBookmarks()" method is deprecated, will be removed in 5.0.0. Use "LocationService::count()" and "Criterion\IsBookmarked" instead.`
`58`	`58`	`*`
`59`	`59`	`* @param int $userId`
`60`	`60`	`*`