jenkins-bot has submitted this change and it was merged.
Change subject: Fix throws tags with multiple exceptions
......................................................................
Fix throws tags with multiple exceptions
Change-Id: Ife9896aa94ca340ac2e8c90c5a2469cb516893da
---
M lib/includes/store/EntityRevisionLookup.php
M lib/includes/store/sql/WikiPageEntityRevisionLookup.php
M lib/tests/phpunit/MockRepository.php
3 files changed, 6 insertions(+), 3 deletions(-)
Approvals:
Jonas Kress (WMDE): Looks good to me, approved
jenkins-bot: Verified
diff --git a/lib/includes/store/EntityRevisionLookup.php
b/lib/includes/store/EntityRevisionLookup.php
index 52e45cd..897f8f3 100644
--- a/lib/includes/store/EntityRevisionLookup.php
+++ b/lib/includes/store/EntityRevisionLookup.php
@@ -45,7 +45,8 @@
* to indicate that the latest revision is required.
LATEST_FROM_MASTER would force the
* revision to be determined from the canonical master database.
*
- * @throws StorageException|RevisionedUnresolvedRedirectException
+ * @throws RevisionedUnresolvedRedirectException
+ * @throws StorageException
* @return EntityRevision|null
*/
public function getEntityRevision( EntityId $entityId, $revisionId =
self::LATEST_FROM_SLAVE );
diff --git a/lib/includes/store/sql/WikiPageEntityRevisionLookup.php
b/lib/includes/store/sql/WikiPageEntityRevisionLookup.php
index bc9a1a6..0f14087 100644
--- a/lib/includes/store/sql/WikiPageEntityRevisionLookup.php
+++ b/lib/includes/store/sql/WikiPageEntityRevisionLookup.php
@@ -56,7 +56,8 @@
* @param EntityId $entityId
* @param int|string $revisionId The desired revision id, or
LATEST_FROM_SLAVE or LATEST_FROM_MASTER.
*
- * @throws StorageException|RevisionedUnresolvedRedirectException
+ * @throws RevisionedUnresolvedRedirectException
+ * @throws StorageException
* @return EntityRevision|null
*/
public function getEntityRevision( EntityId $entityId, $revisionId =
self::LATEST_FROM_SLAVE ) {
diff --git a/lib/tests/phpunit/MockRepository.php
b/lib/tests/phpunit/MockRepository.php
index 38f0ea7..c7fe75b 100644
--- a/lib/tests/phpunit/MockRepository.php
+++ b/lib/tests/phpunit/MockRepository.php
@@ -126,7 +126,8 @@
* @param EntityId $entityId
* @param int|string $revisionId The desired revision id, or
LATEST_FROM_SLAVE or LATEST_FROM_MASTER.
*
- * @throws StorageException|RevisionedUnresolvedRedirectException
+ * @throws RevisionedUnresolvedRedirectException
+ * @throws StorageException
* @return EntityRevision|null
*/
public function getEntityRevision( EntityId $entityId, $revisionId =
self::LATEST_FROM_SLAVE ) {
--
To view, visit https://gerrit.wikimedia.org/r/242829
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ife9896aa94ca340ac2e8c90c5a2469cb516893da
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Thiemo Mättig (WMDE) <[email protected]>
Gerrit-Reviewer: Hoo man <[email protected]>
Gerrit-Reviewer: Jonas Kress (WMDE) <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
