bug #39094 [Ldap] Fix undefined variable $con (derrabus)

derrabus · derrabus · commit d6f27fa670d3 · 2020-11-16T18:30:45.000+01:00
This PR was merged into the 4.4 branch. Discussion ---------- [Ldap] Fix undefined variable $con | Q | A | ------------- | --- | Branch? | 4.4 | Bug fix? | yes | New feature? | no | Deprecations? | no | Tickets | #39030 (comment) | License | MIT | Doc PR | N/A This PR extracts the connection resource into a variable. This will fix an undefined variable error on 5.1. Commits ------- 15da316 [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": "%s".', $dn, ldap_error($this->getConnectionResource())));
+        $con = $this->getConnectionResource();
+        if (!@ldap_modify_batch($con, $dn, $operationsMapped)) {
+            throw new UpdateOperationException(sprintf('Error executing UpdateOperation on "%s": "%s".', $dn, ldap_error($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": "%s".', $dn, ldap_error($this->getConnectionResource())));`
	`154`	`+ $con = $this->getConnectionResource();`
	`155`	`+ if (!@ldap_modify_batch($con, $dn, $operationsMapped)) {`
	`156`	`+ throw new UpdateOperationException(sprintf('Error executing UpdateOperation on "%s": "%s".', $dn, ldap_error($con)));`
`156`	`157`	`}`
`157`	`158`	`}`
`158`	`159`