Merge branch '4.4' into 5.1

derrabus · derrabus · commit e05dc00d995e · 2020-11-16T18:33:12.000+01:00
* 4.4:
  [Ldap] Fix undefined variable $con.
diff --git a/src/Symfony/Component/Ldap/Adapter/ExtLdap/EntryManager.php b/src/Symfony/Component/Ldap/Adapter/ExtLdap/EntryManager.php
@@ -151,8 +151,9 @@ public function applyOperations(string $dn, iterable $operations): void
             $operationsMapped[] = $modification->toArray();
         }
 
-        if (!@ldap_modify_batch($this->getConnectionResource(), $dn, $operationsMapped)) {
-            throw new UpdateOperationException(sprintf('Error executing UpdateOperation on "%s": ', $dn).ldap_error($this->getConnectionResource()), ldap_errno($con));
+        $con = $this->getConnectionResource();
+        if (!@ldap_modify_batch($con, $dn, $operationsMapped)) {
+            throw new UpdateOperationException(sprintf('Error executing UpdateOperation on "%s": ', $dn).ldap_error($con), ldap_errno($con));
         }
     }
 

Original file line number	Diff line number	Diff line change
`@@ -151,8 +151,9 @@ public function applyOperations(string $dn, iterable $operations): void`
`151`	`151`	`$operationsMapped[] = $modification->toArray();`
`152`	`152`	`}`
`153`	`153`
`154`		`- if (!@ldap_modify_batch($this->getConnectionResource(), $dn, $operationsMapped)) {`
`155`		`- throw new UpdateOperationException(sprintf('Error executing UpdateOperation on "%s": ', $dn).ldap_error($this->getConnectionResource()), ldap_errno($con));`
	`154`	`+ $con = $this->getConnectionResource();`
	`155`	`+ if (!@ldap_modify_batch($con, $dn, $operationsMapped)) {`
	`156`	`+ throw new UpdateOperationException(sprintf('Error executing UpdateOperation on "%s": ', $dn).ldap_error($con), ldap_errno($con));`
`156`	`157`	`}`
`157`	`158`	`}`
`158`	`159`