feature #28424 [Ldap] Add verbose ext-ldap error if present for easier debugging (scaytrase)

nicolas-grekas · nicolas-grekas · commit ea2a65c271bf · 2018-09-21T13:16:30.000+02:00
This PR was merged into the 4.2-dev branch. Discussion ---------- [Ldap] Add verbose ext-ldap error if present for easier debugging | Q | A | ------------- | --- | Branch? | master (be careful when merging) | Bug fix? | no | New feature? | yes | BC breaks? | no | Deprecations? | no | Tests pass? | | Fixed tickets | #28149 | License | MIT | Doc PR | Added an optional message suffix if ldap_errno is not equals to 0 Commits ------- 761415f Add verbose ext-ldap error if present for easier debugging
diff --git a/src/Symfony/Component/Ldap/Adapter/ExtLdap/Query.php b/src/Symfony/Component/Ldap/Adapter/ExtLdap/Query.php
@@ -89,7 +89,12 @@ public function execute()
         }
 
         if (false === $this->search) {
-            throw new LdapException(sprintf('Could not complete search with dn "%s", query "%s" and filters "%s".', $this->dn, $this->query, implode(',', $this->options['filter'])));
+            $ldapError = '';
+            if ($errno = ldap_errno($con)) {
+                $ldapError = sprintf(' LDAP error was [%d] %s', $errno, ldap_error($con));
+            }
+
+            throw new LdapException(sprintf('Could not complete search with dn "%s", query "%s" and filters "%s".%s', $this->dn, $this->query, implode(',', $this->options['filter']), $ldapError));
         }
 
         return new Collection($this->connection, $this);

Original file line number	Diff line number	Diff line change
`@@ -89,7 +89,12 @@ public function execute()`
`89`	`89`	`}`
`90`	`90`
`91`	`91`	`if (false === $this->search) {`
`92`		`- throw new LdapException(sprintf('Could not complete search with dn "%s", query "%s" and filters "%s".', $this->dn, $this->query, implode(',', $this->options['filter'])));`
	`92`	`+ $ldapError = '';`
	`93`	`+ if ($errno = ldap_errno($con)) {`
	`94`	`+ $ldapError = sprintf(' LDAP error was [%d] %s', $errno, ldap_error($con));`
	`95`	`+ }`
	`96`	`+`
	`97`	`+ throw new LdapException(sprintf('Could not complete search with dn "%s", query "%s" and filters "%s".%s', $this->dn, $this->query, implode(',', $this->options['filter']), $ldapError));`
`93`	`98`	`}`
`94`	`99`
`95`	`100`	`return new Collection($this->connection, $this);`