Reuse code in ReflectionDescriptor

Author: janedbal

src/Type/Doctrine/Descriptors/ReflectionDescriptor.php

@@ -70,29 +70,20 @@ public function getWritableToDatabaseType(): Type
 
 	public function getDatabaseInternalType(): Type
 	{
-		if (!$this->reflectionProvider->hasClass($this->type)) {
-			return new MixedType();
-		}
-
-		$registry = $this->container->getByType(DefaultDescriptorRegistry::class);
-		$parents = $this->reflectionProvider->getClass($this->type)->getParentClassesNames();
-
-		foreach ($parents as $dbalTypeParentClass) {
-			try {
-				// this assumes that if somebody inherits from DecimalType,
-				// the real database type remains decimal and we can reuse its descriptor
-				return $registry->getByClassName($dbalTypeParentClass)->getDatabaseInternalType();
-
-			} catch (DescriptorNotRegisteredException $e) {
-				continue;
-			}
-		}
-
-		return new MixedType();
+		return $this->doGetDatabaseInternalType(null);
 	}
 
 	public function getDatabaseInternalTypeForDriver(Connection $connection): Type
 	{
+		return $this->doGetDatabaseInternalType($connection);
+	}
+
+	private function doGetDatabaseInternalType(?Connection $connection): Type
+	{
+		if (!$this->reflectionProvider->hasClass($this->type)) {
+			return new MixedType();
+		}
+
 		$registry = $this->container->getByType(DefaultDescriptorRegistry::class);
 		$parents = $this->reflectionProvider->getClass($this->type)->getParentClassesNames();
 
@@ -102,7 +93,7 @@ public function getDatabaseInternalTypeForDriver(Connection $connection): Type
 				// the real database type remains decimal and we can reuse its descriptor
 				$descriptor = $registry->getByClassName($dbalTypeParentClass);
 
-				return $descriptor instanceof DoctrineTypeDriverAwareDescriptor
+				return $descriptor instanceof DoctrineTypeDriverAwareDescriptor && $connection !== null
 					? $descriptor->getDatabaseInternalTypeForDriver($connection)
 					: $descriptor->getDatabaseInternalType();