Thiemo Mättig (WMDE) has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/223286

Change subject: Fix outdated LogicException messages in API modules
......................................................................

Fix outdated LogicException messages in API modules

Change-Id: I16d13912fda069571ee8e07ebba22b65d995c191
---
M repo/includes/api/EditEntity.php
M repo/includes/api/EntityLoadingHelper.php
M repo/includes/api/FormatSnakValue.php
M repo/includes/api/MergeItems.php
M repo/includes/api/SetClaim.php
5 files changed, 5 insertions(+), 5 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase 
refs/changes/86/223286/1

diff --git a/repo/includes/api/EditEntity.php b/repo/includes/api/EditEntity.php
index 38105e0..ce27551 100644
--- a/repo/includes/api/EditEntity.php
+++ b/repo/includes/api/EditEntity.php
@@ -155,7 +155,7 @@
                        $this->errorReporter->dieError( "No such entity type: 
'$entityType'", 'no-such-entity-type' );
                }
 
-               throw new LogicException( 'ApiBase::dieUsage did not throw a 
UsageException' );
+               throw new LogicException( 'ApiErrorReporter::dieError did not 
throw an exception' );
        }
 
        /**
diff --git a/repo/includes/api/EntityLoadingHelper.php 
b/repo/includes/api/EntityLoadingHelper.php
index 508ef71..ba9213c 100644
--- a/repo/includes/api/EntityLoadingHelper.php
+++ b/repo/includes/api/EntityLoadingHelper.php
@@ -76,7 +76,7 @@
                        $this->errorReporter->dieException( $ex, 
'cant-load-entity-content' );
                }
 
-               throw new LogicException( 'ApiErrorReporter::dieError did not 
throw a UsageException' );
+               throw new LogicException( 'ApiErrorReporter::dieException did 
not throw a UsageException' );
        }
 
 }
diff --git a/repo/includes/api/FormatSnakValue.php 
b/repo/includes/api/FormatSnakValue.php
index e9c379b..419be58 100644
--- a/repo/includes/api/FormatSnakValue.php
+++ b/repo/includes/api/FormatSnakValue.php
@@ -143,7 +143,7 @@
                        $this->errorReporter->dieException( $ex, 'baddatavalue' 
);
                }
 
-               throw new LogicException( 'ApiErrorReporter::dieUsage did not 
throw a UsageException' );
+               throw new LogicException( 'ApiErrorReporter::dieException did 
not throw a UsageException' );
        }
 
        /**
diff --git a/repo/includes/api/MergeItems.php b/repo/includes/api/MergeItems.php
index d275101..c366504 100644
--- a/repo/includes/api/MergeItems.php
+++ b/repo/includes/api/MergeItems.php
@@ -108,7 +108,7 @@
                        return new ItemId( $value );
                } catch ( InvalidArgumentException $ex ) {
                        $this->errorReporter->dieError( $ex->getMessage(), 
'invalid-entity-id' );
-                       throw new LogicException( 'ErrorReporter::dieError did 
not throw an exception' );
+                       throw new LogicException( 'ApiErrorReporter::dieError 
did not throw an exception' );
                }
        }
 
diff --git a/repo/includes/api/SetClaim.php b/repo/includes/api/SetClaim.php
index 07b4233..834a61e 100644
--- a/repo/includes/api/SetClaim.php
+++ b/repo/includes/api/SetClaim.php
@@ -167,7 +167,7 @@
                }
 
                // Note: since dieUsage() never returns, this should be 
unreachable!
-               throw new LogicException( 'ApiBase::dieUsage did not throw a 
UsageException' );
+               throw new LogicException( 'ApiErrorReporter::dieError did not 
throw an exception' );
        }
 
        /**

-- 
To view, visit https://gerrit.wikimedia.org/r/223286
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I16d13912fda069571ee8e07ebba22b65d995c191
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Thiemo Mättig (WMDE) <thiemo.maet...@wikimedia.de>

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to