Merge pull request #10 from brightbyte/GracefulMappingFailure

Avoid fatal error when an EntityIdValue cannot be mapped

Author: filbertkm

src/EntityImporter.php

@@ -81,7 +81,7 @@ public function importEntities( array $ids, $importStatements = true ) {
 
 				$localId = $this->entityMappingStore->getLocalId( $entity->getId() );
 
-				if ( !$this->statementsCountLookup->hasStatements( $localId ) ) {
+				if ( $localId && !$this->statementsCountLookup->hasStatements( $localId ) ) {
 					$this->statementsImporter->importStatements( $entity );
 				} else {
 					$this->logger->info(

src/StatementCopier.php

@@ -50,7 +50,13 @@ public function copy( Statement $statement ) {
 	}
 
 	private function copySnak( Snak $mainSnak ) {
-		$newPropertyId = $this->entityMappingStore->getLocalId( $mainSnak->getPropertyId() );
+		$oldPropertyId = $mainSnak->getPropertyId();
+		$newPropertyId = $this->entityMappingStore->getLocalId( $oldPropertyId );
+
+		if ( !$newPropertyId ) {
+			$this->logger->error( "Entity not found for $oldPropertyId." );
+			$newPropertyId = $oldPropertyId;
+		}
 
 		switch( $mainSnak->getType() ) {
 			case 'somevalue':
@@ -61,7 +67,13 @@ private function copySnak( Snak $mainSnak ) {
 				$value = $mainSnak->getDataValue();
 
 				if ( $value instanceof EntityIdValue ) {
-					$value = $this->replaceEntityIdValue( $value );
+					$newValue = $this->replaceEntityIdValue( $value );
+
+					if ( $newValue ) {
+						// If we can't map the id, keep the old one.
+						// replaceEntityIdValue() already logged the issue.
+						$value = $newValue;
+					}
 				}
 
 				return new PropertyValueSnak( $newPropertyId, $value );
@@ -74,6 +86,7 @@ private function replaceEntityIdValue( EntityIdValue $value ) {
 
 		if ( !$localId ) {
 			$this->logger->error( "Entity not found for $originalId." );
+			return null;
 		}
 
 		return new EntityIdValue( $localId );

src/StatementsImporter.php

@@ -57,12 +57,12 @@ public function importStatements( EntityDocument $entity ) {
 
 				if ( !$localId ) {
 					$this->logger->error( $entityId->getSerialization() .  ' not found' );
-				}
-
-				try {
-					$this->addStatementList( $localId, $statements );
-				} catch ( \Exception $ex ) {
-					$this->logger->error( $ex->getMessage() );
+				} else {
+					try {
+						$this->addStatementList( $localId, $statements );
+					} catch ( \Exception $ex ) {
+						$this->logger->error( $ex->getMessage() );
+					}
 				}
 			} else {
 				$this->logger->error( 'EntityId not set for entity' );

src/Store/DBImportedEntityMappingStore.php

@@ -43,7 +43,7 @@ public function add( EntityId $originalId, EntityId $localId ) {
 	/**
 	 * @param EntityId $originalId
 	 *
-	 * @return EntityId
+	 * @return EntityId|null
 	 */
 	public function getLocalId( EntityId $originalId ) {
 		$dbw = $this->loadBalancer->getConnection( DB_MASTER );
@@ -67,7 +67,7 @@ public function getLocalId( EntityId $originalId ) {
 	/**
 	 * @param EntityId $localId
 	 *
-	 * @return EntityId
+	 * @return EntityId|null
 	 */
 	public function getOriginalId( EntityId $localId ) {
 		$dbw = $this->loadBalancer->getConnection( DB_MASTER );

src/Store/ImportedEntityMappingStore.php

@@ -15,14 +15,14 @@ public function add( EntityId $originalId, EntityId $localId );
 	/**
 	 * @param EntityId $originalId
 	 *
-	 * @return EntityId
+	 * @return EntityId|null
 	 */
 	public function getLocalId( EntityId $originalId );
 
 	/**
 	 * @param EntityId $localId
 	 *
-	 * @return EntityId
+	 * @return EntityId|null
 	 */
 	public function getOriginalId( EntityId $localId );