Merge "Drop support for repo names in entity IDs"

wikimedia · Jun 28, 2023 · 244304b · 244304b
2 parents c51ac87 + 36dd959
commit 244304b
Show file tree

Hide file tree

Showing 20 changed files with 28 additions and 114 deletions.
diff --git a/client/tests/phpunit/unit/includes/ServiceWiring/EntityIdComposerTest.php b/client/tests/phpunit/unit/includes/ServiceWiring/EntityIdComposerTest.php
@@ -32,8 +32,8 @@ public function testConstruction() {
 		$entityIdComposer = $this->getService( 'WikibaseClient.EntityIdComposer' );
 
 		$this->assertInstanceOf( EntityIdComposer::class, $entityIdComposer );
-		$this->assertEquals( new ItemId( 'repo:Q123' ),
-			$entityIdComposer->composeEntityId( 'repo', 'test', 123 ) );
+		$this->assertEquals( new ItemId( 'Q123' ),
+			$entityIdComposer->composeEntityId( '', 'test', 123 ) );
 	}
 
 }
diff --git a/client/tests/phpunit/unit/includes/Store/DescriptionLookupTest.php b/client/tests/phpunit/unit/includes/Store/DescriptionLookupTest.php
@@ -235,8 +235,7 @@ private function getIdLookup( array $centralDescriptions ) {
 					if ( !array_key_exists( $title->getArticleID(), $centralDescriptions ) ) {
 						return null;
 					}
-					return new ItemId( ItemId::joinSerialization(
-						[ 'central', '', 'Q' . $title->getArticleID() ] ) );
+					return new ItemId( 'Q' . $title->getArticleID() );
 				}, $titlesByPageId ) );
 			} );
 		return $idLookup;

diff --git a/lib/packages/wikibase/data-model/RELEASE-NOTES.md b/lib/packages/wikibase/data-model/RELEASE-NOTES.md
@@ -8,6 +8,7 @@
 * Added `__serialize()` and `__unserialize()` methods to the `EntityId` interface.
 * Added native type hints to the `Statement` and `StatementList` classes
 * Added `strict_types=1` to `Statement.php`, `StatementList.php`, and related test files
+* Removed support for repository names in entity IDs (e.g. `foo:Q1234`)
 
 ## Version 9.6.1 (2021-04-01)
 

diff --git a/lib/packages/wikibase/data-model/src/Entity/ItemId.php b/lib/packages/wikibase/data-model/src/Entity/ItemId.php
@@ -128,6 +128,9 @@ public static function newFromRepositoryAndNumber( $repositoryName, $numericId )
 		if ( !is_numeric( $numericId ) ) {
 			throw new InvalidArgumentException( '$numericId must be numeric' );
 		}
+		if ( $repositoryName !== '' ) {
+			throw new InvalidArgumentException( 'repo name no longer supported (T291823)' );
+		}
 
 		return new self( self::joinSerialization( [ $repositoryName, '', 'Q' . $numericId ] ) );
 	}

diff --git a/lib/packages/wikibase/data-model/src/Entity/NumericPropertyId.php b/lib/packages/wikibase/data-model/src/Entity/NumericPropertyId.php
@@ -120,6 +120,9 @@ public static function newFromRepositoryAndNumber( $repositoryName, $numericId )
 		if ( !is_numeric( $numericId ) ) {
 			throw new InvalidArgumentException( '$numericId must be numeric' );
 		}
+		if ( $repositoryName !== '' ) {
+			throw new InvalidArgumentException( 'repo name no longer supported (T291823)' );
+		}
 
 		return new self( self::joinSerialization( [ $repositoryName, '', 'P' . $numericId ] ) );
 	}

diff --git a/lib/packages/wikibase/data-model/src/Entity/SerializableEntityId.php b/lib/packages/wikibase/data-model/src/Entity/SerializableEntityId.php
@@ -98,6 +98,10 @@ private static function extractSerializationParts( $serialization ) {
 		$repoName = array_shift( $parts );
 		$prefixRemainder = implode( ':', $parts );
 
+		if ( $repoName !== null ) {
+			throw new InvalidArgumentException( 'repo name no longer supported (T291823)' );
+		}
+
 		return [
 			is_string( $repoName ) ? $repoName : '',
 			$prefixRemainder,

diff --git a/lib/packages/wikibase/data-model/tests/unit/Entity/DispatchingEntityIdParserTest.php b/lib/packages/wikibase/data-model/tests/unit/Entity/DispatchingEntityIdParserTest.php
@@ -38,9 +38,6 @@ public static function entityIdProvider() {
 			[ 'Q1337', new ItemId( 'Q1337' ) ],
 			[ 'p1', new NumericPropertyId( 'p1' ) ],
 			[ 'P100000', new NumericPropertyId( 'P100000' ) ],
-			[ 'foo:Q1337', new ItemId( 'foo:Q1337' ) ],
-			[ 'foo:P123', new NumericPropertyId( 'foo:P123' ) ],
-			[ 'foo:bar:Q1337', new ItemId( 'foo:bar:Q1337' ) ],
 			[ ':Q1337', new ItemId( ':Q1337' ) ],
 		];
 	}

diff --git a/lib/packages/wikibase/data-model/tests/unit/Entity/EntityIdTest.php b/lib/packages/wikibase/data-model/tests/unit/Entity/EntityIdTest.php
@@ -30,10 +30,7 @@ public static function instanceProvider() {
 		$ids[] = [ new ItemId( 'Q42' ), '' ];
 		$ids[] = [ new ItemId( 'Q31337' ), '' ];
 		$ids[] = [ new ItemId( 'Q2147483647' ), '' ];
-		$ids[] = [ new ItemId( ':Q2147483647' ), '' ];
-		$ids[] = [ new ItemId( 'foo:Q2147483647' ), 'foo' ];
 		$ids[] = [ new NumericPropertyId( 'P101010' ), '' ];
-		$ids[] = [ new NumericPropertyId( 'foo:bar:P101010' ), 'foo' ];
 
 		return $ids;
 	}
@@ -107,9 +104,7 @@ public function testReturnTypeOfToString( EntityId $id ) {
 	public function testIsForeign() {
 		$this->assertFalse( ( new ItemId( 'Q42' ) )->isForeign() );
 		$this->assertFalse( ( new ItemId( ':Q42' ) )->isForeign() );
-		$this->assertTrue( ( new ItemId( 'foo:Q42' ) )->isForeign() );
 		$this->assertFalse( ( new NumericPropertyId( ':P42' ) )->isForeign() );
-		$this->assertTrue( ( new NumericPropertyId( 'foo:P42' ) )->isForeign() );
 	}
 
 	/**
@@ -122,9 +117,6 @@ public function testGetRepositoryName( EntityId $id, $repoName ) {
 	public static function serializationSplitProvider() {
 		return [
 			[ 'Q42', [ '', '', 'Q42' ] ],
-			[ 'foo:Q42', [ 'foo', '', 'Q42' ] ],
-			[ '0:Q42', [ '0', '', 'Q42' ] ],
-			[ 'foo:bar:baz:Q42', [ 'foo', 'bar:baz', 'Q42' ] ],
 		];
 	}
 
@@ -168,15 +160,12 @@ public static function invalidJoinSerializationDataProvider() {
 
 	public function testGivenNotNormalizedSerialization_splitSerializationReturnsNormalizedParts() {
 		$this->assertSame( [ '', '', 'Q42' ], SerializableEntityId::splitSerialization( ':Q42' ) );
-		$this->assertSame( [ 'foo', 'bar', 'Q42' ], SerializableEntityId::splitSerialization( ':foo:bar:Q42' ) );
 	}
 
 	public static function localPartDataProvider() {
 		return [
 			[ 'Q42', 'Q42' ],
 			[ ':Q42', 'Q42' ],
-			[ 'foo:Q42', 'Q42' ],
-			[ 'foo:bar:Q42', 'bar:Q42' ],
 		];
 	}
 

diff --git a/lib/packages/wikibase/data-model/tests/unit/Entity/EntityIdValueTest.php b/lib/packages/wikibase/data-model/tests/unit/Entity/EntityIdValueTest.php
@@ -46,7 +46,6 @@ public static function instanceProvider() {
 			new NumericPropertyId( 'P1' ),
 			new NumericPropertyId( 'P31337' ),
 			new CustomEntityId( 'X567' ),
-			new NumericPropertyId( 'foo:P678' ),
 		];
 
 		$argLists = [];
@@ -104,14 +103,6 @@ public static function provideGetArrayValue() {
 					'id' => 'X567',
 				],
 			],
-			'foo:P678' => [
-				new NumericPropertyId( 'foo:P678' ),
-				[
-					'entity-type' => 'property',
-					'numeric-id' => 678,
-					'id' => 'foo:P678',
-				],
-			],
 		];
 	}
 
@@ -137,7 +128,6 @@ public function testSerialize() {
 
 	public static function provideDeserializationCompatibility() {
 		$local = new EntityIdValue( new ItemId( 'Q31337' ) );
-		$foreign = new EntityIdValue( new NumericPropertyId( 'foo:P678' ) );
 		$custom = new EntityIdValue( new CustomEntityId( 'X567' ) );
 
 		return [
@@ -150,11 +140,6 @@ public static function provideDeserializationCompatibility() {
 					. '50:{C:32:"Wikibase\DataModel\Entity\ItemId":6:{Q31337}}',
 				$local,
 			],
-			'foreign: Version 7.0 (7fcddfc)' => [
-				'C:39:"Wikibase\DataModel\Entity\EntityIdValue":'
-					. '63:{C:43:"Wikibase\DataModel\Entity\NumericPropertyId":8:{foo:P678}}',
-				$foreign,
-			],
 			'custom: Version 7.0 (7fcddfc): custom' => [
 				'C:39:"Wikibase\DataModel\Entity\EntityIdValue":'
 					. '58:{C:42:"Wikibase\DataModel\Fixtures\CustomEntityId":4:{X567}}',

diff --git a/lib/packages/wikibase/data-model/tests/unit/Entity/ItemIdTest.php b/lib/packages/wikibase/data-model/tests/unit/Entity/ItemIdTest.php
@@ -37,8 +37,6 @@ public static function idSerializationProvider() {
 			[ 'Q31337', 'Q31337' ],
 			[ 'Q42', 'Q42' ],
 			[ ':Q42', 'Q42' ],
-			[ 'foo:Q42', 'foo:Q42' ],
-			[ 'foo:bar:q42', 'foo:bar:Q42' ],
 			[ 'Q2147483647', 'Q2147483647' ],
 		];
 	}
@@ -70,6 +68,9 @@ public static function invalidIdSerializationProvider() {
 			[ 1 ],
 			[ 'Q2147483648' ],
 			[ 'Q99999999999' ],
+			// no longer supported (T291823, T338223)
+			[ 'foo:Q42', 'foo:Q42' ],
+			[ 'foo:bar:q42', 'foo:bar:Q42' ],
 		];
 	}
 
@@ -78,11 +79,6 @@ public function testGetNumericId() {
 		$this->assertSame( 1, $id->getNumericId() );
 	}
 
-	public function testGetNumericId_foreignId() {
-		$id = new ItemId( 'foo:Q1' );
-		$this->assertSame( 1, $id->getNumericId() );
-	}
-
 	public function testGetEntityType() {
 		$id = new ItemId( 'Q1' );
 		$this->assertSame( 'item', $id->getEntityType() );
@@ -155,8 +151,8 @@ public static function invalidNumericIdProvider() {
 	}
 
 	public function testNewFromRepositoryAndNumber() {
-		$id = ItemId::newFromRepositoryAndNumber( 'foo', 1 );
-		$this->assertSame( 'foo:Q1', $id->getSerialization() );
+		$id = ItemId::newFromRepositoryAndNumber( '', 1 );
+		$this->assertSame( 'Q1', $id->getSerialization() );
 	}
 
 	public function testNewFromRepositoryAndNumberWithInvalidNumericId() {

diff --git a/lib/packages/wikibase/data-model/tests/unit/Entity/NumericPropertyIdTest.php b/lib/packages/wikibase/data-model/tests/unit/Entity/NumericPropertyIdTest.php
@@ -36,8 +36,6 @@ public static function idSerializationProvider() {
 			[ 'P31337', 'P31337' ],
 			[ 'P42', 'P42' ],
 			[ ':P42', 'P42' ],
-			[ 'foo:P42', 'foo:P42' ],
-			[ 'foo:bar:p42', 'foo:bar:P42' ],
 			[ 'P2147483647', 'P2147483647' ],
 		];
 	}
@@ -69,6 +67,9 @@ public static function invalidIdSerializationProvider() {
 			[ 1 ],
 			[ 'P2147483648' ],
 			[ 'P99999999999' ],
+			// no longer supported (T291823, T338223)
+			[ 'foo:P42', 'foo:P42' ],
+			[ 'foo:bar:p42', 'foo:bar:P42' ],
 		];
 	}
 
@@ -77,11 +78,6 @@ public function testGetNumericId() {
 		$this->assertSame( 1, $id->getNumericId() );
 	}
 
-	public function testGetNumericId_foreignId() {
-		$id = new NumericPropertyId( 'foo:P1' );
-		$this->assertSame( 1, $id->getNumericId() );
-	}
-
 	public function testGetEntityType() {
 		$id = new NumericPropertyId( 'P1' );
 		$this->assertSame( 'property', $id->getEntityType() );
@@ -154,8 +150,8 @@ public static function invalidNumericIdProvider() {
 	}
 
 	public function testNewFromRepositoryAndNumber() {
-		$id = NumericPropertyId::newFromRepositoryAndNumber( 'foo', 1 );
-		$this->assertSame( 'foo:P1', $id->getSerialization() );
+		$id = NumericPropertyId::newFromRepositoryAndNumber( '', 1 );
+		$this->assertSame( 'P1', $id->getSerialization() );
 	}
 
 	public function testNewFromRepositoryAndNumberWithInvalidNumericId() {

diff --git a/lib/packages/wikibase/data-model/tests/unit/Snak/PropertyNoValueSnakTest.php b/lib/packages/wikibase/data-model/tests/unit/Snak/PropertyNoValueSnakTest.php
@@ -111,17 +111,12 @@ public static function notEqualsProvider() {
 
 	public static function provideDataToSerialize() {
 		$p2 = new NumericPropertyId( 'P2' );
-		$p2foo = new NumericPropertyId( 'foo:P2' );
 
 		return [
 			'string' => [
 				'P2',
 				new PropertyNoValueSnak( $p2 ),
 			],
-			'foreign' => [
-				'foo:P2',
-				new PropertyNoValueSnak( $p2foo ),
-			],
 		];
 	}
 
@@ -139,12 +134,10 @@ public function testSerialize( $expected, Snak $snak ) {
 
 	public static function provideDataToUnserialize() {
 		$p2 = new NumericPropertyId( 'P2' );
-		$p2foo = new NumericPropertyId( 'foo:P2' );
 
 		return [
 			'legacy' => [ new PropertyNoValueSnak( $p2 ), 'i:2;' ],
 			'current' => [ new PropertyNoValueSnak( $p2 ), 'P2' ],
-			'foreign' => [ new PropertyNoValueSnak( $p2foo ), 'foo:P2' ],
 		];
 	}
 

diff --git a/lib/packages/wikibase/data-model/tests/unit/Snak/PropertySomeValueSnakTest.php b/lib/packages/wikibase/data-model/tests/unit/Snak/PropertySomeValueSnakTest.php
@@ -111,17 +111,12 @@ public static function notEqualsProvider() {
 
 	public static function provideDataToSerialize() {
 		$p2 = new NumericPropertyId( 'P2' );
-		$p2foo = new NumericPropertyId( 'foo:P2' );
 
 		return [
 			'string' => [
 				'P2',
 				new PropertySomeValueSnak( $p2 ),
 			],
-			'foreign' => [
-				'foo:P2',
-				new PropertySomeValueSnak( $p2foo ),
-			],
 		];
 	}
 
@@ -139,12 +134,10 @@ public function testSerialize( $expected, Snak $snak ) {
 
 	public static function provideDataToUnserialize() {
 		$p2 = new NumericPropertyId( 'P2' );
-		$p2foo = new NumericPropertyId( 'foo:P2' );
 
 		return [
 			'legacy' => [ new PropertySomeValueSnak( $p2 ), 'i:2;' ],
 			'current' => [ new PropertySomeValueSnak( $p2 ), 'P2' ],
-			'foreign' => [ new PropertySomeValueSnak( $p2foo ), 'foo:P2' ],
 		];
 	}
 

diff --git a/lib/packages/wikibase/data-model/tests/unit/Snak/PropertyValueSnakTest.php b/lib/packages/wikibase/data-model/tests/unit/Snak/PropertyValueSnakTest.php
@@ -122,18 +122,13 @@ public static function notEqualsProvider() {
 
 	public static function provideDataToSerialize() {
 		$p2 = new NumericPropertyId( 'P2' );
-		$p2foo = new NumericPropertyId( 'foo:P2' );
 		$value = new StringValue( 'b' );
 
 		return [
 			'string' => [
 				'a:2:{i:0;s:2:"P2";i:1;O:22:"DataValues\StringValue":1:{i:0;s:1:"b";}}',
 				new PropertyValueSnak( $p2, $value ),
 			],
-			'foreign' => [
-				'a:2:{i:0;s:6:"foo:P2";i:1;O:22:"DataValues\StringValue":1:{i:0;s:1:"b";}}',
-				new PropertyValueSnak( $p2foo, $value ),
-			],
 		];
 	}
 
@@ -151,30 +146,21 @@ public function testSerialize( $expected, Snak $snak ) {
 
 	public static function provideDataToUnserialize() {
 		$p2 = new NumericPropertyId( 'P2' );
-		$p2foo = new NumericPropertyId( 'foo:P2' );
 		$value = new StringValue( 'b' );
 
 		return [
 			'legacy (int property ID)' => [
 				new PropertyValueSnak( $p2, $value ),
 				'a:2:{i:0;i:2;i:1;C:22:"DataValues\StringValue":1:{b}}',
 			],
-			'legacy (PHP < 7.4 serialization, local property ID)' => [
+			'legacy (PHP < 7.4 serialization)' => [
 				new PropertyValueSnak( $p2, $value ),
 				'a:2:{i:0;s:2:"P2";i:1;C:22:"DataValues\StringValue":1:{b}}',
 			],
-			'legacy (PHP < 7.4 serialization, foreign property ID)' => [
-				new PropertyValueSnak( $p2foo, $value ),
-				'a:2:{i:0;s:6:"foo:P2";i:1;C:22:"DataValues\StringValue":1:{b}}',
-			],
-			'local property ID' => [
+			'PHP >= 7.4 serialization' => [
 				new PropertyValueSnak( $p2, $value ),
 				'a:2:{i:0;s:2:"P2";i:1;O:22:"DataValues\StringValue":1:{i:0;s:1:"b";}}',
 			],
-			'foreign property ID' => [
-				new PropertyValueSnak( $p2foo, $value ),
-				'a:2:{i:0;s:6:"foo:P2";i:1;O:22:"DataValues\StringValue":1:{i:0;s:1:"b";}}',
-			],
 		];
 	}
 

diff --git a/lib/tests/phpunit/Interactors/TermSearchResultTest.php b/lib/tests/phpunit/Interactors/TermSearchResultTest.php
@@ -35,14 +35,6 @@ public static function provideGoodConstruction() {
 				null,
 				[ 'datatype' => 'some datatype' ],
 			],
-			[
-				new Term( 'en-gb', 'FooText' ),
-				'description',
-				new NumericPropertyId( 'foo:P777' ),
-				null,
-				null,
-				[ 'datatype' => 'some datatype' ],
-			],
 		];
 	}
 

diff --git a/lib/tests/phpunit/Store/TermCacheKeyBuilderTest.php b/lib/tests/phpunit/Store/TermCacheKeyBuilderTest.php
@@ -31,7 +31,6 @@ public function testBuildCacheKey( $entity, $revision, $language, $termType, $ex
 	public static function cacheKeyParamsProvider() {
 		yield [ new ItemId( 'Q123' ), 777, 'en', 'label', 'Q123_777_en_label' ];
 		yield [ new NumericPropertyId( 'P666' ), 789, 'de', 'alias', 'P666_789_de_alias' ];
-		yield [ new NumericPropertyId( 'reponame:P666' ), 789, 'de', 'alias', 'reponame_P666_789_de_alias' ];
 		yield [ new NumericPropertyId( 'P666' ), 789, 'de()', 'alias', 'P666_789_de___alias' ];
 		yield [ new NumericPropertyId( 'P666' ), 789, 'de{}', 'alias', 'P666_789_de___alias' ];
 		yield [ new NumericPropertyId( 'P666' ), 789, 'de\/', 'alias', 'P666_789_de___alias' ];