Merge branch '4.4' into 5.1

* 4.4:
  also reset id readers
  Fix LDAP pagination
This commit is contained in:
Fabien Potencier 2020-11-09 11:57:52 +01:00
commit 64089870ce
2 changed files with 2 additions and 1 deletions

View File

@ -244,6 +244,7 @@ abstract class DoctrineType extends AbstractType implements ResetInterface
public function reset()
{
$this->idReaders = [];
$this->entityLoaders = [];
}

View File

@ -174,7 +174,7 @@ class Query extends AbstractQuery
private function resetPagination()
{
$con = $this->connection->getResource();
$this->controlPagedResultResponse($con, 0, '');
$this->controlPagedResult($con, 0, '');
$this->serverctrls = [];
// This is a workaround for a bit of a bug in the above invocation