diogo/symfony
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch '4.4' into 5.1

Browse Source 
* 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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/Symfony/Bridge/Doctrine/Form/Type/DoctrineType.php
View File

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

2
src/Symfony/Component/Ldap/Adapter/ExtLdap/Query.php
View File

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