[MediaWiki-commits] [Gerrit] Replace deprecated getPrefixedId in Repo - change (mediawiki...Wikibase)

2014-10-13 Thread WMDE 
Thiemo Mättig (WMDE) has uploaded a new change for review.

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

Change subject: Replace deprecated getPrefixedId in Repo
..

Replace deprecated getPrefixedId in Repo

Change-Id: I6b59524a81a37f198d1f60c7ade446395cb6f5fe
---
M repo/Wikibase.hooks.php
M repo/includes/ChangeOp/ChangeOpClaimRemove.php
M repo/includes/ChangeOp/ChangeOpMainSnak.php
M repo/includes/ChangeOp/ChangeOpQualifier.php
M repo/includes/ChangeOp/ChangeOpQualifierRemove.php
M repo/includes/ChangeOp/ChangeOpReference.php
M repo/includes/ChangeOp/ChangeOpReferenceRemove.php
M repo/includes/ChangeOp/ChangeOpSiteLink.php
M repo/includes/ChangeOp/ChangeOpStatementRank.php
M repo/includes/ClaimSummaryBuilder.php
M repo/includes/UpdateRepoOnMoveJob.php
M repo/includes/api/ModifyEntity.php
M repo/includes/api/SearchEntities.php
M repo/includes/specials/SpecialSetSiteLink.php
M repo/includes/store/sql/PropertyInfoTableBuilder.php
M repo/tests/phpunit/includes/ChangeOp/ChangeOpClaimRemoveTest.php
M repo/tests/phpunit/includes/ChangeOp/ChangeOpClaimTest.php
M repo/tests/phpunit/includes/ChangeOp/ChangeOpMainSnakTest.php
M repo/tests/phpunit/includes/ChangeOp/ChangeOpQualifierTest.php
M repo/tests/phpunit/includes/ChangeOp/ChangeOpReferenceRemoveTest.php
M repo/tests/phpunit/includes/ChangeOp/ChangeOpReferenceTest.php
M repo/tests/phpunit/includes/ClaimHtmlGeneratorTest.php
M repo/tests/phpunit/includes/Dumpers/JsonDumpGeneratorTest.php
M repo/tests/phpunit/includes/EntityParserOutputGeneratorTest.php
M repo/tests/phpunit/includes/EntityViewTest.php
M repo/tests/phpunit/includes/Hook/OutputPageJsConfigHookHandlerTest.php
M repo/tests/phpunit/includes/SummaryFormatterTest.php
M repo/tests/phpunit/includes/View/ClaimsViewTest.php
M repo/tests/phpunit/includes/View/SnakHtmlGeneratorTest.php
M repo/tests/phpunit/includes/api/GetClaimsTest.php
M repo/tests/phpunit/includes/api/SetReferenceTest.php
M repo/tests/phpunit/includes/store/sql/WikiPageEntityStoreTest.php
32 files changed, 55 insertions(+), 54 deletions(-)


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

diff --git a/repo/Wikibase.hooks.php b/repo/Wikibase.hooks.php
index a08e42b..a1140ce 100644
--- a/repo/Wikibase.hooks.php
+++ b/repo/Wikibase.hooks.php
@@ -652,9 +652,9 @@
$entityType = preg_replace( '/^wikibase-/i', 
'', $entityContent-getEntity()-getType() );
 
// add class to body so it's clear this is a wb 
item:
-   $bodyAttrs['class'] .=  wb-entitypage 
wb-{$entityType}page;
+   $bodyAttrs['class'] .= ' wb-entitypage wb-' . 
$entityType . 'page';
// add another class with the ID of the item:
-   $bodyAttrs['class'] .=  
wb-{$entityType}page-{$entityContent-getEntityId()-getPrefixedId()};
+   $bodyAttrs['class'] .= ' wb-' . $entityType . 
'page-' . $entityContent-getEntityId()-getSerialization();
 
if ( $sk-getRequest()-getCheck( 'diff' ) ) {
$bodyAttrs['class'] .= ' wb-diffpage';
diff --git a/repo/includes/ChangeOp/ChangeOpClaimRemove.php 
b/repo/includes/ChangeOp/ChangeOpClaimRemove.php
index 82758e2..6084a14 100644
--- a/repo/includes/ChangeOp/ChangeOpClaimRemove.php
+++ b/repo/includes/ChangeOp/ChangeOpClaimRemove.php
@@ -88,7 +88,7 @@
 */
protected function getClaimSummaryArgs( Snak $mainSnak ) {
$propertyId = $mainSnak-getPropertyId();
-   return array( array( $propertyId-getPrefixedId() = $mainSnak 
) );
+   return array( array( $propertyId-getSerialization() = 
$mainSnak ) );
}
 
/**
diff --git a/repo/includes/ChangeOp/ChangeOpMainSnak.php 
b/repo/includes/ChangeOp/ChangeOpMainSnak.php
index 5d7a536..9687a1a 100644
--- a/repo/includes/ChangeOp/ChangeOpMainSnak.php
+++ b/repo/includes/ChangeOp/ChangeOpMainSnak.php
@@ -146,7 +146,7 @@
 */
protected function getClaimSummaryArgs( Snak $mainSnak ) {
$propertyId = $mainSnak-getPropertyId();
-   return array( array( $propertyId-getPrefixedId() = $mainSnak 
) );
+   return array( array( $propertyId-getSerialization() = 
$mainSnak ) );
}
 
/**
diff --git a/repo/includes/ChangeOp/ChangeOpQualifier.php 
b/repo/includes/ChangeOp/ChangeOpQualifier.php
index 0341bb6..31c663f 100644
--- a/repo/includes/ChangeOp/ChangeOpQualifier.php
+++ b/repo/includes/ChangeOp/ChangeOpQualifier.php
@@ -111,7 +111,7 @@
 */
protected function addQualifier( Snaks $qualifiers, Summary $summary = 
null ) {
if ( $qualifiers-hasSnak( $this-snak ) ) {
-   throw new ChangeOpException( Claim has already a 
qualifier with hash {$this-snak-getHash()}

[MediaWiki-commits] [Gerrit] Replace deprecated getPrefixedId in Repo - change (mediawiki...Wikibase)

2014-10-13 Thread Jeroen De Dauw (Code Review) 
Jeroen De Dauw has submitted this change and it was merged.

Change subject: Replace deprecated getPrefixedId in Repo
..


Replace deprecated getPrefixedId in Repo

Change-Id: I6b59524a81a37f198d1f60c7ade446395cb6f5fe
---
M repo/Wikibase.hooks.php
M repo/includes/ChangeOp/ChangeOpClaimRemove.php
M repo/includes/ChangeOp/ChangeOpMainSnak.php
M repo/includes/ChangeOp/ChangeOpQualifier.php
M repo/includes/ChangeOp/ChangeOpQualifierRemove.php
M repo/includes/ChangeOp/ChangeOpReference.php
M repo/includes/ChangeOp/ChangeOpReferenceRemove.php
M repo/includes/ChangeOp/ChangeOpSiteLink.php
M repo/includes/ChangeOp/ChangeOpStatementRank.php
M repo/includes/ClaimSummaryBuilder.php
M repo/includes/UpdateRepoOnMoveJob.php
M repo/includes/api/ModifyEntity.php
M repo/includes/api/SearchEntities.php
M repo/includes/specials/SpecialSetSiteLink.php
M repo/includes/store/sql/PropertyInfoTableBuilder.php
M repo/tests/phpunit/includes/ChangeOp/ChangeOpClaimRemoveTest.php
M repo/tests/phpunit/includes/ChangeOp/ChangeOpClaimTest.php
M repo/tests/phpunit/includes/ChangeOp/ChangeOpMainSnakTest.php
M repo/tests/phpunit/includes/ChangeOp/ChangeOpQualifierTest.php
M repo/tests/phpunit/includes/ChangeOp/ChangeOpReferenceRemoveTest.php
M repo/tests/phpunit/includes/ChangeOp/ChangeOpReferenceTest.php
M repo/tests/phpunit/includes/ClaimHtmlGeneratorTest.php
M repo/tests/phpunit/includes/Dumpers/JsonDumpGeneratorTest.php
M repo/tests/phpunit/includes/EntityParserOutputGeneratorTest.php
M repo/tests/phpunit/includes/EntityViewTest.php
M repo/tests/phpunit/includes/Hook/OutputPageJsConfigHookHandlerTest.php
M repo/tests/phpunit/includes/SummaryFormatterTest.php
M repo/tests/phpunit/includes/View/ClaimsViewTest.php
M repo/tests/phpunit/includes/View/SnakHtmlGeneratorTest.php
M repo/tests/phpunit/includes/api/GetClaimsTest.php
M repo/tests/phpunit/includes/api/SetReferenceTest.php
M repo/tests/phpunit/includes/store/sql/WikiPageEntityStoreTest.php
32 files changed, 55 insertions(+), 54 deletions(-)

Approvals:
  Bene: Looks good to me, but someone else must approve
  Jeroen De Dauw: Looks good to me, approved



diff --git a/repo/Wikibase.hooks.php b/repo/Wikibase.hooks.php
index a08e42b..a1140ce 100644
--- a/repo/Wikibase.hooks.php
+++ b/repo/Wikibase.hooks.php
@@ -652,9 +652,9 @@
$entityType = preg_replace( '/^wikibase-/i', 
'', $entityContent-getEntity()-getType() );
 
// add class to body so it's clear this is a wb 
item:
-   $bodyAttrs['class'] .=  wb-entitypage 
wb-{$entityType}page;
+   $bodyAttrs['class'] .= ' wb-entitypage wb-' . 
$entityType . 'page';
// add another class with the ID of the item:
-   $bodyAttrs['class'] .=  
wb-{$entityType}page-{$entityContent-getEntityId()-getPrefixedId()};
+   $bodyAttrs['class'] .= ' wb-' . $entityType . 
'page-' . $entityContent-getEntityId()-getSerialization();
 
if ( $sk-getRequest()-getCheck( 'diff' ) ) {
$bodyAttrs['class'] .= ' wb-diffpage';
diff --git a/repo/includes/ChangeOp/ChangeOpClaimRemove.php 
b/repo/includes/ChangeOp/ChangeOpClaimRemove.php
index 82758e2..6084a14 100644
--- a/repo/includes/ChangeOp/ChangeOpClaimRemove.php
+++ b/repo/includes/ChangeOp/ChangeOpClaimRemove.php
@@ -88,7 +88,7 @@
 */
protected function getClaimSummaryArgs( Snak $mainSnak ) {
$propertyId = $mainSnak-getPropertyId();
-   return array( array( $propertyId-getPrefixedId() = $mainSnak 
) );
+   return array( array( $propertyId-getSerialization() = 
$mainSnak ) );
}
 
/**
diff --git a/repo/includes/ChangeOp/ChangeOpMainSnak.php 
b/repo/includes/ChangeOp/ChangeOpMainSnak.php
index 5d7a536..9687a1a 100644
--- a/repo/includes/ChangeOp/ChangeOpMainSnak.php
+++ b/repo/includes/ChangeOp/ChangeOpMainSnak.php
@@ -146,7 +146,7 @@
 */
protected function getClaimSummaryArgs( Snak $mainSnak ) {
$propertyId = $mainSnak-getPropertyId();
-   return array( array( $propertyId-getPrefixedId() = $mainSnak 
) );
+   return array( array( $propertyId-getSerialization() = 
$mainSnak ) );
}
 
/**
diff --git a/repo/includes/ChangeOp/ChangeOpQualifier.php 
b/repo/includes/ChangeOp/ChangeOpQualifier.php
index 0341bb6..31c663f 100644
--- a/repo/includes/ChangeOp/ChangeOpQualifier.php
+++ b/repo/includes/ChangeOp/ChangeOpQualifier.php
@@ -111,7 +111,7 @@
 */
protected function addQualifier( Snaks $qualifiers, Summary $summary = 
null ) {
if ( $qualifiers-hasSnak( $this-snak ) ) {
-   throw new ChangeOpException( Claim has already a 
qualifier with hash {$this-snak-getHash()} );
+