Jeroen De Dauw has uploaded a new change for review. https://gerrit.wikimedia.org/r/51071
Change subject: Improve class refs ...................................................................... Improve class refs Change-Id: If7a1d9fb558e2e30295e7db696a086897237589e --- M repo/includes/api/CreateClaim.php M repo/includes/api/GetClaims.php M repo/includes/api/GetEntities.php M repo/includes/api/RemoveClaims.php M repo/includes/api/RemoveQualifiers.php M repo/includes/api/RemoveReferences.php M repo/includes/api/SetClaim.php M repo/includes/api/SetClaimValue.php M repo/includes/api/SetQualifier.php M repo/includes/api/SetReference.php M repo/includes/api/SetStatementRank.php 11 files changed, 34 insertions(+), 35 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase refs/changes/71/51071/1 diff --git a/repo/includes/api/CreateClaim.php b/repo/includes/api/CreateClaim.php index 1e54235..780e6fa 100644 --- a/repo/includes/api/CreateClaim.php +++ b/repo/includes/api/CreateClaim.php @@ -11,7 +11,6 @@ use Wikibase\SnakFactory; use Wikibase\LibRegistry; use Wikibase\Claim; -use Wikibase\ClaimSerializer; use Wikibase\Autocomment; use Wikibase\Settings; @@ -164,7 +163,7 @@ /** * @since 0.2 * - * @return \Wikibase\EntityContent + * @return EntityContent */ protected function getEntityContent() { $params = $this->extractRequestParams(); @@ -185,7 +184,7 @@ /** * @since 0.2 * - * @return \Wikibase\Snak + * @return Snak * @throws MWException */ protected function getSnakInstance() { @@ -210,7 +209,7 @@ /** * @since 0.3 * - * @param \Wikibase\Claim $claim + * @param Claim $claim */ protected function outputClaim( Claim $claim ) { $serializerFactory = new \Wikibase\Lib\Serializers\SerializerFactory(); diff --git a/repo/includes/api/GetClaims.php b/repo/includes/api/GetClaims.php index 0806811..3bd8fc1 100644 --- a/repo/includes/api/GetClaims.php +++ b/repo/includes/api/GetClaims.php @@ -2,15 +2,17 @@ namespace Wikibase\Api; -use ApiBase, MWException; -use Wikibase\Lib\Serializers\ClaimSerializer; -use Wikibase\Lib\Serializers\ClaimsSerializer; +use ApiBase; +use MWException; +use Wikibase\Lib\Serializers\ClaimSerializer; +use Wikibase\Lib\Serializers\SerializerFactory; use Wikibase\EntityId; use Wikibase\Entity; use Wikibase\EntityContentFactory; use Wikibase\Statement; use Wikibase\Claims; +use Wikibase\Claim; /** * API module for getting claims. @@ -75,7 +77,7 @@ protected function outputClaims( array $claims ) { $claims = new Claims( $claims ); - $serializerFactory = new \Wikibase\Lib\Serializers\SerializerFactory(); + $serializerFactory = new SerializerFactory(); $serializer = $serializerFactory->newSerializerForObject( $claims ); // TODO: hold into account props parameter @@ -93,9 +95,9 @@ /** * @since 0.3 * - * @param \Wikibase\EntityId $id + * @param EntityId $id * - * @return \Wikibase\Entity + * @return Entity */ protected function getEntity( EntityId $id ) { $content = EntityContentFactory::singleton()->getFromId( $id ); @@ -110,7 +112,7 @@ /** * @since 0.3 * - * @param \Wikibase\Entity $entity + * @param Entity $entity * @param null|string $claimGuid * * @return Claim[] diff --git a/repo/includes/api/GetEntities.php b/repo/includes/api/GetEntities.php index e02ee89..3511648 100644 --- a/repo/includes/api/GetEntities.php +++ b/repo/includes/api/GetEntities.php @@ -2,11 +2,10 @@ namespace Wikibase\Api; -use ApiBase, MWException; -use Wikibase\Lib\Serializers\EntitySerializer; -use Wikibase\Lib\Serializers\SerializationOptions; -use Wikibase\Lib\Serializers\EntitySerializationOptions; +use ApiBase; +use MWException; +use Wikibase\Lib\Serializers\EntitySerializationOptions; use Wikibase\Utils; use Wikibase\StoreFactory; use Wikibase\EntityId; @@ -175,7 +174,7 @@ $entity = $entityContent->getEntity(); - $options = new \Wikibase\Lib\Serializers\EntitySerializationOptions(); + $options = new EntitySerializationOptions(); $options->setLanguages( $params['languages'] ); $options->setSortDirection( $params['dir'] ); $options->setProps( $props ); diff --git a/repo/includes/api/RemoveClaims.php b/repo/includes/api/RemoveClaims.php index b208cf2..3f33420 100644 --- a/repo/includes/api/RemoveClaims.php +++ b/repo/includes/api/RemoveClaims.php @@ -2,7 +2,8 @@ namespace Wikibase\Api; -use ApiBase, MWException; +use ApiBase; +use MWException; use Wikibase\Autocomment; use Wikibase\EntityId; @@ -10,7 +11,6 @@ use Wikibase\EntityContent; use Wikibase\EntityContentFactory; use Wikibase\Claims; -use Wikibase\Settings; /** * API module for removing claims. @@ -128,7 +128,7 @@ * * @param string[] $ids * - * @return \Wikibase\EntityContent[] + * @return EntityContent[] */ protected function getEntityContents( array $ids ) { $contents = array(); @@ -160,7 +160,7 @@ /** * @since 0.3 * - * @param \Wikibase\Claims $claims + * @param Claims $claims * @param string[] $guids * * @return string[] @@ -202,7 +202,7 @@ /** * @since 0.3 * - * @param \Wikibase\EntityContent $content + * @param EntityContent $content */ protected function saveChanges( EntityContent $content ) { $params = $this->extractRequestParams(); diff --git a/repo/includes/api/RemoveQualifiers.php b/repo/includes/api/RemoveQualifiers.php index b328a42..03205b4 100644 --- a/repo/includes/api/RemoveQualifiers.php +++ b/repo/includes/api/RemoveQualifiers.php @@ -2,13 +2,15 @@ namespace Wikibase\Api; -use ApiBase, MWException; +use ApiBase; +use MWException; use Wikibase\EntityId; use Wikibase\Entity; use Wikibase\EntityContent; use Wikibase\EntityContentFactory; use Wikibase\Claim; +use Wikibase\Claims; use Wikibase\Settings; /** @@ -107,13 +109,13 @@ /** * @since 0.3 * - * @param \Wikibase\Entity $entity + * @param Entity $entity * @param string $claimGuid * - * @return \Wikibase\Claim + * @return Claim */ protected function getClaim( Entity $entity, $claimGuid ) { - $claims = new \Wikibase\Claims( $entity->getClaims() ); + $claims = new Claims( $entity->getClaims() ); if ( !$claims->hasClaimWithGuid( $claimGuid ) ) { $this->dieUsage( 'No such claim', 'removequalifiers-claim-not-found' ); @@ -129,7 +131,7 @@ /** * @since 0.3 * - * @param \Wikibase\EntityContent $content + * @param EntityContent $content */ protected function saveChanges( EntityContent $content ) { $params = $this->extractRequestParams(); diff --git a/repo/includes/api/RemoveReferences.php b/repo/includes/api/RemoveReferences.php index c688fc1..f792ed7 100644 --- a/repo/includes/api/RemoveReferences.php +++ b/repo/includes/api/RemoveReferences.php @@ -11,6 +11,7 @@ use Wikibase\Statement; use Wikibase\References; use Wikibase\Settings; +use Wikibase\Claims; /** * API module for removing one or more references of the same statement. @@ -101,7 +102,7 @@ * @param string[] $refHashes */ protected function removeReferences( Entity $entity, $statementGuid, array $refHashes ) { - $claims = new \Wikibase\Claims( $entity->getClaims() ); + $claims = new Claims( $entity->getClaims() ); if ( !$claims->hasClaimWithGuid( $statementGuid ) ) { $this->dieUsage( 'No such statement', 'removereferences-statement-not-found' ); diff --git a/repo/includes/api/SetClaim.php b/repo/includes/api/SetClaim.php index b8472ac..7a06131 100644 --- a/repo/includes/api/SetClaim.php +++ b/repo/includes/api/SetClaim.php @@ -3,7 +3,6 @@ namespace Wikibase\Api; use MWException; - use ApiBase; use Wikibase\Entity; diff --git a/repo/includes/api/SetClaimValue.php b/repo/includes/api/SetClaimValue.php index d9feed1..eae4c04 100644 --- a/repo/includes/api/SetClaimValue.php +++ b/repo/includes/api/SetClaimValue.php @@ -11,9 +11,7 @@ use Wikibase\EntityContentFactory; use Wikibase\SnakObject; use Wikibase\Claim; -use Wikibase\ClaimSerializer; use Wikibase\Claims; -use Wikibase\Settings; /** * API module for setting the DataValue contained by the main snak of a claim. diff --git a/repo/includes/api/SetQualifier.php b/repo/includes/api/SetQualifier.php index d5a7d54..de6b241 100644 --- a/repo/includes/api/SetQualifier.php +++ b/repo/includes/api/SetQualifier.php @@ -2,7 +2,8 @@ namespace Wikibase\Api; -use ApiBase, MWException; +use ApiBase; +use MWException; use Wikibase\EntityContent; use Wikibase\EntityId; diff --git a/repo/includes/api/SetReference.php b/repo/includes/api/SetReference.php index f7d87b0..7cd71d5 100644 --- a/repo/includes/api/SetReference.php +++ b/repo/includes/api/SetReference.php @@ -10,11 +10,8 @@ use Wikibase\EntityContentFactory; use Wikibase\Statement; use Wikibase\Reference; -use Wikibase\ReferenceObject; -use Wikibase\ReferenceSerializer; use Wikibase\Snaks; use Wikibase\SnakList; -use Wikibase\SnakSerializer; use Wikibase\Claims; use Wikibase\Settings; diff --git a/repo/includes/api/SetStatementRank.php b/repo/includes/api/SetStatementRank.php index 0ea5934..89adada 100644 --- a/repo/includes/api/SetStatementRank.php +++ b/repo/includes/api/SetStatementRank.php @@ -2,7 +2,8 @@ namespace Wikibase\Api; -use ApiBase, MWException; +use ApiBase; +use MWException; use Wikibase\EntityId; use Wikibase\Entity; -- To view, visit https://gerrit.wikimedia.org/r/51071 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: If7a1d9fb558e2e30295e7db696a086897237589e Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Wikibase Gerrit-Branch: master Gerrit-Owner: Jeroen De Dauw <jeroended...@gmail.com> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits