doctrine#7820 use PersisterHelper to figure out identifier types

This logic was pre-existing, but I forgot about it while writing
doctrine#7820, therefore it was re-implemented inside this unit of
code. Now we just use the `PersisterHelper`, which does all
the nice and shiny identifier type discovery operations we need.

lib/Doctrine/ORM/Tools/Pagination/WhereInWalker.php

@@ -19,20 +19,21 @@
 
 namespace Doctrine\ORM\Tools\Pagination;
 
-use Doctrine\ORM\Mapping\ClassMetadataInfo;
+use Doctrine\ORM\Mapping\ClassMetadata;
 use Doctrine\ORM\Query\AST\ArithmeticExpression;
-use Doctrine\ORM\Query\AST\SimpleArithmeticExpression;
-use Doctrine\ORM\Query\TreeWalkerAdapter;
-use Doctrine\ORM\Query\AST\SelectStatement;
-use Doctrine\ORM\Query\AST\PathExpression;
-use Doctrine\ORM\Query\AST\InExpression;
-use Doctrine\ORM\Query\AST\NullComparisonExpression;
-use Doctrine\ORM\Query\AST\InputParameter;
-use Doctrine\ORM\Query\AST\ConditionalPrimary;
-use Doctrine\ORM\Query\AST\ConditionalTerm;
 use Doctrine\ORM\Query\AST\ConditionalExpression;
 use Doctrine\ORM\Query\AST\ConditionalFactor;
+use Doctrine\ORM\Query\AST\ConditionalPrimary;
+use Doctrine\ORM\Query\AST\ConditionalTerm;
+use Doctrine\ORM\Query\AST\InExpression;
+use Doctrine\ORM\Query\AST\InputParameter;
+use Doctrine\ORM\Query\AST\NullComparisonExpression;
+use Doctrine\ORM\Query\AST\PathExpression;
+use Doctrine\ORM\Query\AST\SelectStatement;
+use Doctrine\ORM\Query\AST\SimpleArithmeticExpression;
 use Doctrine\ORM\Query\AST\WhereClause;
+use Doctrine\ORM\Query\TreeWalkerAdapter;
+use Doctrine\ORM\Utility\PersisterHelper;
 use function array_map;
 use function assert;
 use function is_array;
@@ -87,7 +88,7 @@ public function walkSelectStatement(SelectStatement $AST)
 
  $fromRoot = reset($from);
  $rootAlias = $fromRoot->rangeVariableDeclaration->aliasIdentificationVariable;
- /** @var ClassMetadataInfo $rootClass */
+ /** @var ClassMetadata $rootClass */
  $rootClass = $queryComponents[$rootAlias]['metadata'];
  $identifierFieldName = $rootClass->getSingleIdentifierFieldName();
 
@@ -109,7 +110,14 @@ public function walkSelectStatement(SelectStatement $AST)
  $expression = new InExpression($arithmeticExpression);
  $expression->literals[] = new InputParameter(":" . self::PAGINATOR_ID_ALIAS);
 
- $this->convertWhereInIdentifiersToDatabaseValue($this->getTypeOfSingleIdentifierColumn($rootClass));
+ $this->convertWhereInIdentifiersToDatabaseValue(
+ PersisterHelper::getTypeOfField(
+ $identifierFieldName,
+ $rootClass,
+ $this->_getQuery()
+ ->getEntityManager()
+ )[0]
+ );
  } else {
  $expression = new NullComparisonExpression($pathExpression);
  $expression->not = false;
@@ -173,19 +181,4 @@ private function convertWhereInIdentifiersToDatabaseValue(string $type) : void
  return $connection->convertToDatabaseValue($id, $type);
  }, $identifiers));
  }
-
- private function getTypeOfSingleIdentifierColumn(ClassMetadataInfo $class) : string
- {
- $identifierField = $class->getSingleIdentifierFieldName();
-
- if ($class->hasField($identifierField)) {
- return (string) $class->getTypeOfField($identifierField);
- }
-
- return $this->getTypeOfSingleIdentifierColumn(
- $this->_getQuery()
- ->getEntityManager()
- ->getClassMetadata($class->getAssociationTargetClass($identifierField))
- );
- }
 }