Do not let int as value in Entity::setId

Bug: T151577

Author: Ladsgroup

src/Entity/Item.php

@@ -87,15 +87,13 @@ public function getId() {
 	 * Can be ItemId since 0.5.
 	 * Can be null since 1.0.
 	 *
-	 * @param ItemId|int|null $id
+	 * @param ItemId|null $id
 	 *
 	 * @throws InvalidArgumentException
 	 */
 	public function setId( $id ) {
 		if ( $id === null || $id instanceof ItemId ) {
 			$this->id = $id;
-		} elseif ( is_int( $id ) ) {
-			$this->id = ItemId::newFromNumber( $id );
 		} else {
 			throw new InvalidArgumentException( '$id must be an instance of ItemId, an integer,'
 				. ' or null' );

src/Entity/Property.php

@@ -85,15 +85,13 @@ public function getId() {
 	 * Can be PropertyId since 0.5.
 	 * Can be null since 1.0.
 	 *
-	 * @param PropertyId|int|null $id
+	 * @param PropertyId|null $id
 	 *
 	 * @throws InvalidArgumentException
 	 */
 	public function setId( $id ) {
 		if ( $id === null || $id instanceof PropertyId ) {
 			$this->id = $id;
-		} elseif ( is_int( $id ) ) {
-			$this->id = PropertyId::newFromNumber( $id );
 		} else {
 			throw new InvalidArgumentException( '$id must be an instance of PropertyId, an integer,'
 				. ' or null' );

tests/unit/Entity/ItemTest.php

@@ -48,12 +48,6 @@ public function testGetId() {
 		$this->assertEquals( new ItemId( 'Q2' ), $item->getId() );
 	}
 
-	public function testSetIdUsingNumber() {
-		$item = new Item();
-		$item->setId( 42 );
-		$this->assertEquals( new ItemId( 'Q42' ), $item->getId() );
-	}
-
 	public function testGetSiteLinkWithNonSetSiteId() {
 		$item = new Item();
 
@@ -257,10 +251,10 @@ public function equalsProvider() {
 		$secondItem->getStatements()->addNewStatement( new PropertyNoValueSnak( 42 ) );
 
 		$secondItemWithId = $secondItem->copy();
-		$secondItemWithId->setId( 42 );
+		$secondItemWithId->setId( new ItemId( 'Q42' ) );
 
 		$differentId = $secondItemWithId->copy();
-		$differentId->setId( 43 );
+		$differentId->setId( new ItemId( 'Q43' ) );
 
 		return [
 			[ new Item(), new Item() ],
@@ -529,7 +523,7 @@ public function instanceProvider() {
 
 		// ID only
 		$entity = clone $entity;
-		$entity->setId( 44 );
+		$entity->setId( new ItemId( 'Q44' ) );
 
 		$entities[] = $entity;
 
@@ -543,7 +537,7 @@ public function instanceProvider() {
 
 		// with labels etc and ID
 		$entity = clone $entity;
-		$entity->setId( 42 );
+		$entity->setId( new ItemId( 'Q42' ) );
 
 		$entities[] = $entity;
 

tests/unit/Entity/PropertyTest.php

@@ -79,13 +79,6 @@ public function testSetAndGetDataTypeId() {
 		}
 	}
 
-	public function testWhenIdSetWithNumber_GetIdReturnsPropertyId() {
-		$property = Property::newFromType( 'string' );
-		$property->setId( 42 );
-
-		$this->assertHasCorrectIdType( $property );
-	}
-
 	protected function assertHasCorrectIdType( Property $property ) {
 		$this->assertInstanceOf( PropertyId::class, $property->getId() );
 	}
@@ -103,7 +96,7 @@ public function testPropertyWithTypeIsEmpty() {
 
 	public function testPropertyWithIdIsEmpty() {
 		$property = Property::newFromType( 'string' );
-		$property->setId( 1337 );
+		$property->setId( new PropertyId( 'P1337' ) );
 		$this->assertTrue( $property->isEmpty() );
 	}
 
@@ -144,10 +137,10 @@ public function equalsProvider() {
 		$secondProperty->setStatements( $this->newNonEmptyStatementList() );
 
 		$secondPropertyWithId = $secondProperty->copy();
-		$secondPropertyWithId->setId( 42 );
+		$secondPropertyWithId->setId( new PropertyId( 'P42' ) );
 
 		$differentId = $secondPropertyWithId->copy();
-		$differentId->setId( 43 );
+		$differentId->setId( new PropertyId( 'P43' ) );
 
 		return [
 			[ Property::newFromType( 'string' ), Property::newFromType( 'string' ) ],
@@ -168,7 +161,7 @@ public function testEquals( Property $firstProperty, Property $secondProperty )
 	private function getBaseProperty() {
 		$property = Property::newFromType( 'string' );
 
-		$property->setId( 42 );
+		$property->setId( new PropertyId( 'P42' ) );
 		$property->setLabel( 'en', 'Same' );
 		$property->setDescription( 'en', 'Same' );
 		$property->setAliases( 'en', [ 'Same' ] );
@@ -407,7 +400,7 @@ public function instanceProvider() {
 
 		// ID only
 		$entity = clone $entity;
-		$entity->setId( 44 );
+		$entity->setId( new PropertyId( 'P44' ) );
 
 		$entities[] = $entity;
 
@@ -421,7 +414,7 @@ public function instanceProvider() {
 
 		// with labels etc and ID
 		$entity = clone $entity;
-		$entity->setId( 42 );
+		$entity->setId( new PropertyId( 'P42' ) );
 
 		$entities[] = $entity;