Merge pull request #695 from wmde/foreignids-allow-getnumericid

Allow calling getNumericId on foreign ItemIds and PropertyIds

Author: JeroenDeDauw

src/Entity/ItemId.php

@@ -51,15 +51,11 @@ private function assertValidIdFormat( $idSerialization ) {
 	/**
 	 * @see Int32EntityId::getNumericId
 	 *
-	 * @throws RuntimeException if called on a foreign ID.
 	 * @return int Guaranteed to be a distinct integer in the range [1..2147483647].
 	 */
 	public function getNumericId() {
-		if ( $this->isForeign() ) {
-			throw new RuntimeException( 'getNumericId must not be called on foreign ItemIds' );
-		}
-
-		return (int)substr( $this->serialization, 1 );
+		$serializationParts = self::splitSerialization( $this->serialization );
+		return (int)substr( $serializationParts[2], 1 );
 	}
 
 	/**

src/Entity/PropertyId.php

@@ -51,15 +51,11 @@ private function assertValidIdFormat( $idSerialization ) {
 	/**
 	 * @see Int32EntityId::getNumericId
 	 *
-	 * @throws RuntimeException if called on a foreign ID.
 	 * @return int Guaranteed to be a distinct integer in the range [1..2147483647].
 	 */
 	public function getNumericId() {
-		if ( $this->isForeign() ) {
-			throw new RuntimeException( 'getNumericId must not be called on foreign PropertyIds' );
-		}
-
-		return (int)substr( $this->serialization, 1 );
+		$serializationParts = self::splitSerialization( $this->serialization );
+		return (int)substr( $serializationParts[2], 1 );
 	}
 
 	/**

tests/unit/Entity/ItemIdTest.php

@@ -81,6 +81,11 @@ 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() );
@@ -151,9 +156,4 @@ public function invalidNumericIdProvider() {
 		];
 	}
 
-	public function testGetNumericIdThrowsExceptionOnForeignIds() {
-		$this->setExpectedException( RuntimeException::class );
-		( new ItemId( 'foo:Q42' ) )->getNumericId();
-	}
-
 }

tests/unit/Entity/PropertyIdTest.php

@@ -81,6 +81,11 @@ public function testGetNumericId() {
 		$this->assertSame( 1, $id->getNumericId() );
 	}
 
+	public function testGetNumericId_foreignId() {
+		$id = new PropertyId( 'foo:P1' );
+		$this->assertSame( 1, $id->getNumericId() );
+	}
+
 	public function testGetEntityType() {
 		$id = new PropertyId( 'P1' );
 		$this->assertSame( 'property', $id->getEntityType() );
@@ -151,9 +156,4 @@ public function invalidNumericIdProvider() {
 		];
 	}
 
-	public function testGetNumericIdThrowsExceptionOnForeignIds() {
-		$this->setExpectedException( RuntimeException::class );
-		( new PropertyId( 'foo:P42' ) )->getNumericId();
-	}
-
 }