Addshore has uploaded a new change for review.
https://gerrit.wikimedia.org/r/96316
Change subject: Fix code that is lying to us!
......................................................................
Fix code that is lying to us!
Change-Id: I74d02d12ee1880467620e969ae32b7686493195a
---
M lib/includes/formatters/OutputFormatSnakFormatterFactory.php
M repo/includes/ClaimHtmlGenerator.php
M repo/includes/ClaimSummaryBuilder.php
M repo/includes/ContentRetriever.php
M repo/includes/EntityContentDiffView.php
M repo/includes/EntityView.php
M repo/includes/ItemDisambiguation.php
M repo/includes/MultiLangConstraintDetector.php
M repo/includes/WikibaseRepo.php
M repo/includes/specials/SpecialEntityData.php
M repo/includes/specials/SpecialItemDisambiguation.php
M repo/includes/specials/SpecialItemResolver.php
M repo/includes/specials/SpecialModifyEntity.php
M repo/includes/specials/SpecialSetAliases.php
M repo/includes/specials/SpecialSetLabel.php
15 files changed, 17 insertions(+), 32 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase
refs/changes/16/96316/1
diff --git a/lib/includes/formatters/OutputFormatSnakFormatterFactory.php
b/lib/includes/formatters/OutputFormatSnakFormatterFactory.php
index 56f1a72..1351c87 100644
--- a/lib/includes/formatters/OutputFormatSnakFormatterFactory.php
+++ b/lib/includes/formatters/OutputFormatSnakFormatterFactory.php
@@ -1,6 +1,7 @@
<?php
namespace Wikibase\Lib;
use InvalidArgumentException;
+use RuntimeException;
use ValueFormatters\FormatterOptions;
/**
@@ -22,7 +23,7 @@
* three parameters, this OutputFormatSnakFormatterFactory, a
format ID, and an FormatOptions object,
* and return an instance of SnakFormatter suitable for the
given output format.
*
- * @throws \InvalidArgumentException
+ * @throws InvalidArgumentException
*/
public function __construct( array $builders ) {
foreach ( $builders as $format => $builder ) {
@@ -45,12 +46,13 @@
* @param string $format Use the SnakFormatter::FORMAT_XXX constants.
* @param FormatterOptions $options
*
- * @throws \InvalidArgumentException
+ * @throws RuntimeException
+ * @throws InvalidArgumentException
* @return SnakFormatter
*/
public function getSnakFormatter( $format, FormatterOptions $options ) {
if ( !array_key_exists( $format, $this->builders ) ) {
- throw new \InvalidArgumentException( "Unsupported
format: $format" );
+ throw new InvalidArgumentException( "Unsupported
format: $format" );
}
//TODO: cache instances based on an option hash
@@ -58,7 +60,7 @@
$instance = call_user_func( $builder, $this, $format, $options
);
if( !( $instance instanceof SnakFormatter ) ) {
- throw new \RuntimeException( get_class( $instance ) . '
does not implement SnakFormatter' );
+ throw new RuntimeException( get_class( $instance ) . '
does not implement SnakFormatter' );
}
return $instance;
diff --git a/repo/includes/ClaimHtmlGenerator.php
b/repo/includes/ClaimHtmlGenerator.php
index dae57e9..e6653ad 100644
--- a/repo/includes/ClaimHtmlGenerator.php
+++ b/repo/includes/ClaimHtmlGenerator.php
@@ -2,10 +2,9 @@
namespace Wikibase;
-use Html;
-use Language;
-use MWException;
-use Wikibase\Lib\EntityIdFormatter;
+use DataValues\DataValue;
+use Wikibase\Lib\FormattingException;
+use Wikibase\Lib\PropertyNotFoundException;
use Wikibase\Lib\SnakFormatter;
/**
@@ -61,12 +60,9 @@
*
* @since 0.4
*
- * @param EntityContent $entity the entity related to the claim
* @param Claim $claim the claim to render
- * @param Language|null $lang the language to use for rendering. if not
given, the local
- * context will be used.
- * @param bool $editable whether editing is allowed (enabled edit links)
- * @param editSectionHtml has the html for the edit section
+ * @param null|string $editSectionHtml has the html for the edit section
+ *
* @return string
*/
public function getHtmlForClaim(
diff --git a/repo/includes/ClaimSummaryBuilder.php
b/repo/includes/ClaimSummaryBuilder.php
index 41ba9d5..07da8eb 100644
--- a/repo/includes/ClaimSummaryBuilder.php
+++ b/repo/includes/ClaimSummaryBuilder.php
@@ -2,17 +2,12 @@
namespace Wikibase;
-use DataValues\TimeValue;
use InvalidArgumentException;
-use Wikibase\Lib\SnakFormatter;
/**
* EditSummary-Builder for claim operations
*
* @since 0.4
- *
- * @file
- * @ingroup WikibaseRepo
*
* @licence GNU GPL v2+
* @author Tobias Gritschacher < tobias.gritschac...@wikimedia.de >
diff --git a/repo/includes/ContentRetriever.php
b/repo/includes/ContentRetriever.php
index 4d565b9..d3aff78 100644
--- a/repo/includes/ContentRetriever.php
+++ b/repo/includes/ContentRetriever.php
@@ -3,10 +3,10 @@
namespace Wikibase;
use Article;
+use Content;
use Revision;
use Title;
use WebRequest;
-use WikiPage;
/**
* Fetches content for a given Title / Article and request (diff or not diff)
diff --git a/repo/includes/EntityContentDiffView.php
b/repo/includes/EntityContentDiffView.php
index a1acfe4..2cc2fa5 100644
--- a/repo/includes/EntityContentDiffView.php
+++ b/repo/includes/EntityContentDiffView.php
@@ -36,7 +36,7 @@
protected $diffVisualizer;
/**
- * @var SnakValueFormatter
+ * @var SnakFormatter
*/
protected $snakValueFormatter;
diff --git a/repo/includes/EntityView.php b/repo/includes/EntityView.php
index 626075e..d4214f9 100644
--- a/repo/includes/EntityView.php
+++ b/repo/includes/EntityView.php
@@ -11,7 +11,6 @@
use MWException;
use FormatJson;
use User;
-use Wikibase\ClaimHtmlGenerator;
use Wikibase\DataModel\Entity\BasicEntityIdParser;
use Wikibase\DataModel\Entity\EntityIdParser;
use Wikibase\Lib\PropertyDataTypeLookup;
diff --git a/repo/includes/ItemDisambiguation.php
b/repo/includes/ItemDisambiguation.php
index 7b68dc4..bce172d 100644
--- a/repo/includes/ItemDisambiguation.php
+++ b/repo/includes/ItemDisambiguation.php
@@ -1,7 +1,7 @@
<?php
namespace Wikibase;
-use IContextSource, MWException;
+use IContextSource;
use Wikibase\Repo\WikibaseRepo;
/**
diff --git a/repo/includes/MultiLangConstraintDetector.php
b/repo/includes/MultiLangConstraintDetector.php
index 792a648..c61112e 100644
--- a/repo/includes/MultiLangConstraintDetector.php
+++ b/repo/includes/MultiLangConstraintDetector.php
@@ -80,9 +80,10 @@
*
* @param Entity $entity The Entity for which to check if there is any
conflict
* @param Status $status The status to which to add an error if there
is a violation
- * @param Diff|null $diff
+ * @param EntityDiff|null $diff
+ * @param array $limits
*/
- public function addConstraintChecks( Entity $entity, Status $status,
Diff $diff = null, array $limits = null ) {
+ public function addConstraintChecks( Entity $entity, Status $status,
EntityDiff $diff = null, array $limits = null ) {
global $wgLang;
$truncateLength = Settings::get( 'multilang-truncate-length' );
diff --git a/repo/includes/WikibaseRepo.php b/repo/includes/WikibaseRepo.php
index b156a75..9806a2e 100644
--- a/repo/includes/WikibaseRepo.php
+++ b/repo/includes/WikibaseRepo.php
@@ -4,7 +4,6 @@
use DataTypes\DataTypeFactory;
use DataValues\DataValueFactory;
-use Language;
use ValueFormatters\FormatterOptions;
use ValueParsers\ParserOptions;
use Wikibase\DataModel\Claim\ClaimGuidParser;
@@ -14,7 +13,6 @@
use Wikibase\EntityLookup;
use Wikibase\LanguageFallbackChainFactory;
use Wikibase\Lib\EntityIdFormatter;
-use Wikibase\Lib\EntityIdLabelFormatter;
use Wikibase\Lib\EntityIdLinkFormatter;
use Wikibase\Lib\EntityIdParser;
use Wikibase\Lib\EntityRetrievingDataTypeLookup;
diff --git a/repo/includes/specials/SpecialEntityData.php
b/repo/includes/specials/SpecialEntityData.php
index 9645c34..af1aed9 100644
--- a/repo/includes/specials/SpecialEntityData.php
+++ b/repo/includes/specials/SpecialEntityData.php
@@ -3,7 +3,6 @@
namespace Wikibase\Repo\Specials;
use HttpError;
-use Wikibase\EntityContentFactory;
use Wikibase\Lib\Specials\SpecialWikibasePage;
use Wikibase\LinkedData\EntityDataRequestHandler;
use Wikibase\LinkedData\EntityDataSerializationService;
diff --git a/repo/includes/specials/SpecialItemDisambiguation.php
b/repo/includes/specials/SpecialItemDisambiguation.php
index 12958cd..c93eb3a 100644
--- a/repo/includes/specials/SpecialItemDisambiguation.php
+++ b/repo/includes/specials/SpecialItemDisambiguation.php
@@ -4,7 +4,6 @@
use Html;
use Language;
-use Wikibase\EntityContentFactory;
use Wikibase\Item;
use Wikibase\ItemDisambiguation;
use Wikibase\Repo\WikibaseRepo;
diff --git a/repo/includes/specials/SpecialItemResolver.php
b/repo/includes/specials/SpecialItemResolver.php
index 2e328fb..307f4e6 100644
--- a/repo/includes/specials/SpecialItemResolver.php
+++ b/repo/includes/specials/SpecialItemResolver.php
@@ -4,7 +4,6 @@
use ValueFormatters\FormatterOptions;
use ValueFormatters\ValueFormatter;
-use \ValueFormatters\ValueFormatterFactory;
use Wikibase\EntityView;
use Wikibase\ItemContent;
use Wikibase\Lib\SnakFormatter;
diff --git a/repo/includes/specials/SpecialModifyEntity.php
b/repo/includes/specials/SpecialModifyEntity.php
index 505582b..f6baa3c 100644
--- a/repo/includes/specials/SpecialModifyEntity.php
+++ b/repo/includes/specials/SpecialModifyEntity.php
@@ -6,7 +6,6 @@
use UserInputException;
use Wikibase\DataModel\Entity\EntityIdParsingException;
use Wikibase\EditEntity;
-use Wikibase\EntityContentFactory;
use Wikibase\EntityId;
use Wikibase\Lib\Specials\SpecialWikibasePage;
use Wikibase\Repo\WikibaseRepo;
diff --git a/repo/includes/specials/SpecialSetAliases.php
b/repo/includes/specials/SpecialSetAliases.php
index c45d2e1..f4213ba 100644
--- a/repo/includes/specials/SpecialSetAliases.php
+++ b/repo/includes/specials/SpecialSetAliases.php
@@ -12,7 +12,6 @@
* @licence GNU GPL v2+
* @author Bene* < benestar.wikime...@googlemail.com >
*/
-
class SpecialSetAliases extends SpecialSetEntity {
/**
diff --git a/repo/includes/specials/SpecialSetLabel.php
b/repo/includes/specials/SpecialSetLabel.php
index 758dae7..e43c05c 100644
--- a/repo/includes/specials/SpecialSetLabel.php
+++ b/repo/includes/specials/SpecialSetLabel.php
@@ -13,7 +13,6 @@
* @licence GNU GPL v2+
* @author Bene* < benestar.wikime...@googlemail.com >
*/
-
class SpecialSetLabel extends SpecialSetEntity {
/**
--
To view, visit https://gerrit.wikimedia.org/r/96316
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I74d02d12ee1880467620e969ae32b7686493195a
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Addshore <addshorew...@gmail.com>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
