Thiemo Mättig (WMDE) has uploaded a new change for review. https://gerrit.wikimedia.org/r/232271
Change subject: Revert to use non-deprecated Item::copy and Property::copy ...................................................................... Revert to use non-deprecated Item::copy and Property::copy This reverts parts of https://gerrit.wikimedia.org/r/#/c/222978/. See https://github.com/wmde/WikibaseDataModel/pull/531 for arguments. In short: Yes, `Entity` is deprecated and calls to `Entity::copy` should not be called. But `Item::copy` and `Property::copy` are **not** deprecated. Change-Id: I66374a99753acca2bfcc46a54d8a4b564f9739f5 --- M lib/tests/phpunit/changes/TestChanges.php M repo/tests/phpunit/includes/ChangeOp/ChangeOpAliasesTest.php M repo/tests/phpunit/includes/ChangeOp/ChangeOpsMergeTest.php 3 files changed, 60 insertions(+), 60 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase refs/changes/71/232271/1 diff --git a/lib/tests/phpunit/changes/TestChanges.php b/lib/tests/phpunit/changes/TestChanges.php index bb38ed3..0928b3a 100644 --- a/lib/tests/phpunit/changes/TestChanges.php +++ b/lib/tests/phpunit/changes/TestChanges.php @@ -115,11 +115,11 @@ $new = new Item( new ItemId( 'Q100' ) ); $new->getSiteLinkList()->addNewSiteLink( 'dewiki', 'Dummy' ); $changes['set-dewiki-sitelink'] = $changeFactory->newFromUpdate( EntityChange::UPDATE, $old, $new ); - $old = unserialize( serialize( $new ) ); + $old = $new->copy(); $new->getSiteLinkList()->addNewSiteLink( 'enwiki', 'Emmy' ); $changes['set-enwiki-sitelink'] = $changeFactory->newFromUpdate( EntityChange::UPDATE, $old, $new ); - $old = unserialize( serialize( $new ) ); + $old = $new->copy(); // ----- $new = new Item( new ItemId( 'Q100' ) ); @@ -128,37 +128,37 @@ $new->getSiteLinkList()->addNewSiteLink( 'dewiki', 'Dummy' ); $changes['change-sitelink-order'] = $changeFactory->newFromUpdate( EntityChange::UPDATE, $old, $new ); - $old = unserialize( serialize( $new ) ); + $old = $new->copy(); // ----- $new->getSiteLinkList()->setNewSiteLink( 'dewiki', 'Dummy2' ); $changes['change-dewiki-sitelink'] = $changeFactory->newFromUpdate( EntityChange::UPDATE, $old, $new ); - $old = unserialize( serialize( $new ) ); + $old = $new->copy(); $new->getSiteLinkList()->setNewSiteLink( 'enwiki', 'Emmy2' ); $changes['change-enwiki-sitelink'] = $changeFactory->newFromUpdate( EntityChange::UPDATE, $old, $new ); - $old = unserialize( serialize( $new ) ); + $old = $new->copy(); $new->getSiteLinkList()->setNewSiteLink( 'enwiki', 'Emmy2', array( new ItemId( 'Q17' ) ) ); $changes['change-enwiki-sitelink-badges'] = $changeFactory->newFromUpdate( EntityChange::UPDATE, $old, $new ); - $old = unserialize( serialize( $new ) ); + $old = $new->copy(); $new->getSiteLinkList()->removeLinkWithSiteId( 'dewiki' ); $changes['remove-dewiki-sitelink'] = $changeFactory->newFromUpdate( EntityChange::UPDATE, $old, $new ); - $old = unserialize( serialize( $new ) ); + $old = $new->copy(); // ----- $new->setLabel( "de", "dummy" ); $changes['set-de-label'] = $changeFactory->newFromUpdate( EntityChange::UPDATE, $old, $new ); - $old = unserialize( serialize( $new ) ); + $old = $new->copy(); $new->setLabel( "en", "emmy" ); $changes['set-en-label'] = $changeFactory->newFromUpdate( EntityChange::UPDATE, $old, $new ); - $old = unserialize( serialize( $new ) ); + $old = $new->copy(); $new->setAliases( "en", array( "foo", "bar" ) ); $changes['set-en-aliases'] = $changeFactory->newFromUpdate( EntityChange::UPDATE, $old, $new ); - $old = unserialize( serialize( $new ) ); + $old = $new->copy(); // ----- $propertyId = new PropertyId( 'p23' ); @@ -169,12 +169,12 @@ $statements = new StatementList( array( $statement ) ); $new->setStatements( $statements ); $changes['add-claim'] = $changeFactory->newFromUpdate( EntityChange::UPDATE, $old, $new ); - $old = unserialize( serialize( $new ) ); + $old = $new->copy(); $statements = new StatementList(); $new->setStatements( $statements ); $changes['remove-claim'] = $changeFactory->newFromUpdate( EntityChange::UPDATE, $old, $new ); - $old = unserialize( serialize( $new ) ); + $old = $new->copy(); // ----- $changes['item-deletion-linked'] = $changeFactory->newFromUpdate( EntityChange::REMOVE, $old, null ); diff --git a/repo/tests/phpunit/includes/ChangeOp/ChangeOpAliasesTest.php b/repo/tests/phpunit/includes/ChangeOp/ChangeOpAliasesTest.php index 811aaaa..a99380b 100644 --- a/repo/tests/phpunit/includes/ChangeOp/ChangeOpAliasesTest.php +++ b/repo/tests/phpunit/includes/ChangeOp/ChangeOpAliasesTest.php @@ -55,28 +55,28 @@ $enAliases = array( 'en-alias1', 'en-alias2', 'en-alias3' ); $existingEnAliases = array( 'en-existingAlias1', 'en-existingAlias2' ); - $item = ItemContent::newEmpty(); - $entity = $item->getEntity(); - $entity->setAliases( 'en', $existingEnAliases ); + $itemContent = ItemContent::newEmpty(); + $item = $itemContent->getEntity(); + $item->setAliases( 'en', $existingEnAliases ); return array( 'add' => array( - unserialize( serialize( $entity ) ), + $item->copy(), new ChangeOpAliases( 'en', $enAliases, 'add', $validatorFactory ), array_merge( $existingEnAliases, $enAliases ) ), 'set' => array( - unserialize( serialize( $entity ) ), + $item->copy(), new ChangeOpAliases( 'en', $enAliases, 'set', $validatorFactory ), $enAliases ), 'set (default)' => array( - unserialize( serialize( $entity ) ), + $item->copy(), new ChangeOpAliases( 'en', $enAliases, '', $validatorFactory ), $enAliases ), 'remove' => array( - unserialize( serialize( $entity ) ), + $item->copy(), new ChangeOpAliases( 'en', $existingEnAliases, 'remove', $validatorFactory ), array() ), diff --git a/repo/tests/phpunit/includes/ChangeOp/ChangeOpsMergeTest.php b/repo/tests/phpunit/includes/ChangeOp/ChangeOpsMergeTest.php index b0e285a..8f1e61c 100644 --- a/repo/tests/phpunit/includes/ChangeOp/ChangeOpsMergeTest.php +++ b/repo/tests/phpunit/includes/ChangeOp/ChangeOpsMergeTest.php @@ -190,16 +190,16 @@ $itemWithEnLabel->getFingerprint()->setLabel( 'en', 'foo' ); $testCases['labelMerge'] = array( - unserialize( serialize( $itemWithEnLabel ) ), + $itemWithEnLabel->copy(), new Item(), new Item(), - unserialize( serialize( $itemWithEnLabel ) ), + $itemWithEnLabel->copy(), ); $testCases['identicalLabelMerge'] = array( - unserialize( serialize( $itemWithEnLabel ) ), - unserialize( serialize( $itemWithEnLabel ) ), + $itemWithEnLabel->copy(), + $itemWithEnLabel->copy(), new Item(), - unserialize( serialize( $itemWithEnLabel ) ), + $itemWithEnLabel->copy(), ); $itemWithEnBarLabel = new Item(); @@ -210,35 +210,35 @@ $itemWithLabelAndAlias->getFingerprint()->setAliasGroup( 'en', array( 'foo' ) ); $testCases['labelAsAliasMerge'] = array( - unserialize( serialize( $itemWithEnLabel ) ), - unserialize( serialize( $itemWithEnBarLabel ) ), + $itemWithEnLabel->copy(), + $itemWithEnBarLabel->copy(), new Item(), - unserialize( serialize( $itemWithLabelAndAlias ) ) + $itemWithLabelAndAlias->copy() ); $itemWithDescription = new Item(); $itemWithDescription->getFingerprint()->setDescription( 'en', 'foo' ); $testCases['descriptionMerge'] = array( - unserialize( serialize( $itemWithDescription ) ), + $itemWithDescription->copy(), new Item(), new Item(), - unserialize( serialize( $itemWithDescription ) ), + $itemWithDescription->copy(), ); $testCases['identicalDescriptionMerge'] = array( - unserialize( serialize( $itemWithDescription ) ), - unserialize( serialize( $itemWithDescription ) ), + $itemWithDescription->copy(), + $itemWithDescription->copy(), new Item(), - unserialize( serialize( $itemWithDescription ) ), + $itemWithDescription->copy(), ); $itemWithBarDescription = new Item(); $itemWithBarDescription->getFingerprint()->setDescription( 'en', 'bar' ); $testCases['ignoreConflictDescriptionMerge'] = array( - unserialize( serialize( $itemWithDescription ) ), - unserialize( serialize( $itemWithBarDescription ) ), - unserialize( serialize( $itemWithDescription ) ), - unserialize( serialize( $itemWithBarDescription ) ), + $itemWithDescription->copy(), + $itemWithBarDescription->copy(), + $itemWithDescription->copy(), + $itemWithBarDescription->copy(), array( 'description' ) ); @@ -246,47 +246,47 @@ $itemWithFooBarAliases->getFingerprint()->setAliasGroup( 'en', array( 'foo', 'bar' ) ); $testCases['aliasMerge'] = array( - unserialize( serialize( $itemWithFooBarAliases ) ), + $itemWithFooBarAliases->copy(), new Item(), new Item(), - unserialize( serialize( $itemWithFooBarAliases ) ), + $itemWithFooBarAliases->copy(), ); $itemWithFooBarBazAliases = new Item(); $itemWithFooBarBazAliases->getFingerprint()->setAliasGroup( 'en', array( 'foo', 'bar', 'baz' ) ); $testCases['duplicateAliasMerge'] = array( - unserialize( serialize( $itemWithFooBarAliases ) ), - unserialize( serialize( $itemWithFooBarBazAliases ) ), + $itemWithFooBarAliases->copy(), + $itemWithFooBarBazAliases->copy(), new Item(), - unserialize( serialize( $itemWithFooBarBazAliases ) ), + $itemWithFooBarBazAliases->copy(), ); $itemWithLink = new Item(); $itemWithLink->getSiteLinkList()->addNewSiteLink( 'enwiki', 'foo' ); $testCases['linkMerge'] = array( - unserialize( serialize( $itemWithLink ) ), + $itemWithLink->copy(), new Item(), new Item(), - unserialize( serialize( $itemWithLink ) ), + $itemWithLink->copy(), ); $testCases['sameLinkLinkMerge'] = array( - unserialize( serialize( $itemWithLink ) ), - unserialize( serialize( $itemWithLink ) ), + $itemWithLink->copy(), + $itemWithLink->copy(), new Item(), - unserialize( serialize( $itemWithLink ) ), + $itemWithLink->copy(), ); $itemWithBarLink = new Item(); $itemWithBarLink->getSiteLinkList()->addNewSiteLink( 'enwiki', 'bar' ); $testCases['ignoreConflictLinkMerge'] = array( - unserialize( serialize( $itemWithLink ) ), - unserialize( serialize( $itemWithBarLink ) ), - unserialize( serialize( $itemWithLink ) ), - unserialize( serialize( $itemWithBarLink ) ), + $itemWithLink->copy(), + $itemWithBarLink->copy(), + $itemWithLink->copy(), + $itemWithBarLink->copy(), array( 'sitelink' ), ); @@ -296,10 +296,10 @@ $itemWithStatement = new Item(); $itemWithStatement->getStatements()->addStatement( $claim ); $testCases['claimMerge'] = array( - unserialize( serialize( $itemWithStatement ) ), + $itemWithStatement->copy(), new Item(), new Item(), - unserialize( serialize( $itemWithStatement ) ) + $itemWithStatement->copy() ); $qualifiedClaim = new Statement( @@ -312,10 +312,10 @@ $itemWithQualifiedStatement->getStatements()->addStatement( $qualifiedClaim ); $testCases['claimWithQualifierMerge'] = array( - unserialize( serialize( $itemWithQualifiedStatement ) ), + $itemWithQualifiedStatement->copy(), new Item(), new Item(), - unserialize( serialize( $itemWithQualifiedStatement ) ) + $itemWithQualifiedStatement->copy() ); $anotherQualifiedStatement = new Statement( @@ -335,10 +335,10 @@ $bigItem->getStatements()->addStatement( $anotherQualifiedStatement ); $testCases['itemMerge'] = array( - unserialize( serialize( $bigItem ) ), + $bigItem->copy(), new Item(), new Item(), - unserialize( serialize( $bigItem ) ), + $bigItem->copy(), ); $bigItem->getSiteLinkList()->addNewSiteLink( 'nlwiki', 'bar' ); @@ -365,10 +365,10 @@ $bigMergedItem->setStatements( new StatementList( $anotherQualifiedStatement ) ); $testCases['ignoreConflictItemMerge'] = array( - unserialize( serialize( $bigItem ) ), - unserialize( serialize( $smallerItem ) ), - unserialize( serialize( $smallerMergedItem ) ), - unserialize( serialize( $bigMergedItem ) ), + $bigItem->copy(), + $smallerItem->copy(), + $smallerMergedItem->copy(), + $bigMergedItem->copy(), array( 'description', 'sitelink' ) ); return $testCases; -- To view, visit https://gerrit.wikimedia.org/r/232271 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I66374a99753acca2bfcc46a54d8a4b564f9739f5 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Wikibase Gerrit-Branch: master Gerrit-Owner: Thiemo Mättig (WMDE) <[email protected]> _______________________________________________ MediaWiki-commits mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
