Removed the usage of splitSerialization from DispatchingIdParser

Bug: T291823
Change-Id: I41fe09b424af5d828cda04a65efe407362b1f3c4

Author: manicki

src/Entity/DispatchingEntityIdParser.php

@@ -37,20 +37,14 @@ public function __construct( array $idBuilders ) {
 	 * @return EntityId
 	 */
 	public function parse( $idSerialization ) {
+		$this->assertIdIsString( $idSerialization );
+
 		if ( $this->idBuilders === [] ) {
 			throw new EntityIdParsingException( 'No id builders are configured' );
 		}
 
-		try {
-			list( , , $localId ) = SerializableEntityId::splitSerialization( $idSerialization );
-		} catch ( InvalidArgumentException $ex ) {
-			// SerializableEntityId::splitSerialization performs some sanity checks which
-			// might result in an exception. Should this happen, re-throw the exception message
-			throw new EntityIdParsingException( $ex->getMessage(), 0, $ex );
-		}
-
 		foreach ( $this->idBuilders as $idPattern => $idBuilder ) {
-			if ( preg_match( $idPattern, $localId ) ) {
+			if ( preg_match( $idPattern, $idSerialization ) ) {
 				return $this->buildId( $idBuilder, $idSerialization );
 			}
 		}
@@ -60,6 +54,21 @@ public function parse( $idSerialization ) {
 		);
 	}
 
+	/**
+	 * @param string $idSerialization
+	 *
+	 * @throws EntityIdParsingException
+	 */
+	private function assertIdIsString( $idSerialization ) {
+		if ( !is_string( $idSerialization ) ) {
+			throw new EntityIdParsingException(
+				'$idSerialization must be a string, got ' . ( is_object( $idSerialization )
+					? get_class( $idSerialization )
+					: getType( $idSerialization ) )
+			);
+		}
+	}
+
 	/**
 	 * @param callable $idBuilder
 	 * @param string $idSerialization

tests/unit/Entity/DispatchingEntityIdParserTest.php

@@ -38,7 +38,6 @@ public static function entityIdProvider() {
 			[ 'Q1337', new ItemId( 'Q1337' ) ],
 			[ 'p1', new NumericPropertyId( 'p1' ) ],
 			[ 'P100000', new NumericPropertyId( 'P100000' ) ],
-			[ ':Q1337', new ItemId( ':Q1337' ) ],
 		];
 	}
 
@@ -61,6 +60,7 @@ public static function invalidIdSerializationProvider() {
 			[ '' ],
 			[ 'q0' ],
 			[ '1p' ],
+			[ ':Q1337' ],
 			[ 'foo:' ],
 			[ 'foo:bar:' ],
 			[ '::Q1337' ],