Merge pull request #449 from wmde/catchInvalidEntityIdInClaimGuidParser

Catch exception for invalid EntityId in GUID parser

Author: Daniel Kinzler

src/Claim/ClaimGuidParser.php

@@ -3,6 +3,7 @@
 namespace Wikibase\DataModel\Claim;
 
 use Wikibase\DataModel\Entity\EntityIdParser;
+use Wikibase\DataModel\Entity\EntityIdParsingException;
 
 /**
  * @since 0.5
@@ -40,7 +41,12 @@ public function parse( $serialization ) {
 			throw new ClaimGuidParsingException( '$serialization does not have the correct number of parts' );
 		}
 
-		return new ClaimGuid( $this->entityIdParser->parse( $keyParts[0] ), $keyParts[1] );
+		try {
+			return new ClaimGuid( $this->entityIdParser->parse( $keyParts[0] ), $keyParts[1] );
+		}
+		catch( EntityIdParsingException $exception ) {
+			throw new ClaimGuidParsingException( '$serialization contains invalid EntityId: ' . $exception->getMessage() );
+		}
 	}
 
 }

tests/unit/Claim/ClaimGuidParserTest.php

@@ -56,6 +56,7 @@ public function invalidIdSerializationProvider() {
 			array( '' ),
 			array( 'q0' ),
 			array( '1p' ),
+			array( 'Q0$5627445f-43cb-ed6d-3adb-760e85bd17ee' ),
 		);
 	}