Avoid self-referencing loop for new Properties

Bug: T374230
Change-Id: Id46af0cea4305b30648988987b71bf27678bc7d6

Author: Silvan-WMDE

src/Lookup/EntityRetrievingDataTypeLookup.php

@@ -20,6 +20,7 @@ class EntityRetrievingDataTypeLookup implements PropertyDataTypeLookup {
 	 * @var EntityLookup
 	 */
 	private $entityLookup;
+	private array $propertyIdsInProcess = [];
 
 	public function __construct( EntityLookup $entityLookup ) {
 		$this->entityLookup = $entityLookup;
@@ -34,6 +35,11 @@ public function __construct( EntityLookup $entityLookup ) {
 	 * @throws PropertyDataTypeLookupException
 	 */
 	public function getDataTypeIdForProperty( PropertyId $propertyId ) {
+		if ( array_key_exists( $propertyId->getSerialization(), $this->propertyIdsInProcess ) ) {
+			// avoid self-referencing loop for newly created properties (T374230)
+			throw new PropertyDataTypeLookupException( $propertyId, 'loop detected' );
+		}
+		$this->propertyIdsInProcess[ $propertyId->getSerialization() ] = true;
 		return $this->getProperty( $propertyId )->getDataTypeId();
 	}
 
@@ -50,6 +56,8 @@ private function getProperty( PropertyId $propertyId ) {
 			throw new PropertyDataTypeLookupException( $propertyId );
 		}
 
+		unset( $this->propertyIdsInProcess[ $propertyId->getSerialization() ] );
+
 		return $property;
 	}