Merge pull request #543 from wmde/entityCopy

Revert to use non-deprecated Item::copy and Property::copy

Author: JeroenDeDauw

tests/unit/Entity/EntityTest.php

@@ -377,7 +377,7 @@ public function testCopyRetainsLabels() {
 		$item->getFingerprint()->setLabel( 'en', 'foo' );
 		$item->getFingerprint()->setLabel( 'de', 'bar' );
 
-		$newItem = unserialize( serialize( $item ) );
+		$newItem = $item->copy();
 
 		$this->assertTrue( $newItem->getFingerprint()->getLabels()->hasTermForLanguage( 'en' ) );
 		$this->assertTrue( $newItem->getFingerprint()->getLabels()->hasTermForLanguage( 'de' ) );

tests/unit/Entity/ItemTest.php

@@ -344,10 +344,10 @@ public function equalsProvider() {
 		$secondItem = new Item();
 		$secondItem->getStatements()->addNewStatement( new PropertyNoValueSnak( 42 ) );
 
-		$secondItemWithId = unserialize( serialize( $secondItem ) );
+		$secondItemWithId = $secondItem->copy();
 		$secondItemWithId->setId( 42 );
 
-		$differentId = unserialize( serialize( $secondItemWithId ) );
+		$differentId = $secondItemWithId->copy();
 		$differentId->setId( 43 );
 
 		return array(

tests/unit/Entity/PropertyTest.php

@@ -158,10 +158,10 @@ public function equalsProvider() {
 		$secondProperty = Property::newFromType( 'string' );
 		$secondProperty->setStatements( $this->newNonEmptyStatementList() );
 
-		$secondPropertyWithId = unserialize( serialize( $secondProperty ) );
+		$secondPropertyWithId = $secondProperty->copy();
 		$secondPropertyWithId->setId( 42 );
 
-		$differentId = unserialize( serialize( $secondPropertyWithId ) );
+		$differentId = $secondPropertyWithId->copy();
 		$differentId->setId( 43 );
 
 		return array(