Tweak the code to avoid fabbot false positives

Author: fabpot

Adapter/ExtLdap/Collection.php

@@ -48,7 +48,7 @@ public function count()
             return $count;
         }
 
-        throw new LdapException(sprintf('Error while retrieving entry count: %s.', ldap_error($this->connection->getResource())));
+        throw new LdapException('Error while retrieving entry count: '.ldap_error($this->connection->getResource()));
     }
 
     public function getIterator()
@@ -62,7 +62,7 @@ public function getIterator()
         }
 
         if (false === $current) {
-            throw new LdapException(sprintf('Could not rewind entries array: %s.', ldap_error($con)));
+            throw new LdapException('Could not rewind entries array: '.ldap_error($con));
         }
 
         yield $this->getSingleEntry($con, $current);
@@ -105,15 +105,15 @@ private function getSingleEntry($con, $current)
         $attributes = ldap_get_attributes($con, $current);
 
         if (false === $attributes) {
-            throw new LdapException(sprintf('Could not fetch attributes: %s.', ldap_error($con)));
+            throw new LdapException('Could not fetch attributes: '.ldap_error($con));
         }
 
         $attributes = $this->cleanupAttributes($attributes);
 
         $dn = ldap_get_dn($con, $current);
 
         if (false === $dn) {
-            throw new LdapException(sprintf('Could not fetch DN: %s.', ldap_error($con)));
+            throw new LdapException('Could not fetch DN: '.ldap_error($con));
         }
 
         return new Entry($dn, $attributes);

Adapter/ExtLdap/Connection.php

@@ -138,11 +138,11 @@ private function connect()
         }
 
         if (false === $this->connection) {
-            throw new LdapException(sprintf('Could not connect to Ldap server: %s.', ldap_error($this->connection)));
+            throw new LdapException('Could not connect to Ldap server: '.ldap_error($this->connection));
         }
 
         if ('tls' === $this->config['encryption'] && false === @ldap_start_tls($this->connection)) {
-            throw new LdapException(sprintf('Could not initiate TLS connection: %s.', ldap_error($this->connection)));
+            throw new LdapException('Could not initiate TLS connection: '.ldap_error($this->connection));
         }
     }
 

Adapter/ExtLdap/EntryManager.php

@@ -38,7 +38,7 @@ public function add(Entry $entry)
         $con = $this->getConnectionResource();
 
         if (!@ldap_add($con, $entry->getDn(), $entry->getAttributes())) {
-            throw new LdapException(sprintf('Could not add entry "%s": %s.', $entry->getDn(), ldap_error($con)));
+            throw new LdapException(sprintf('Could not add entry "%s": '.ldap_error($con), $entry->getDn()));
         }
 
         return $this;
@@ -52,7 +52,7 @@ public function update(Entry $entry)
         $con = $this->getConnectionResource();
 
         if (!@ldap_modify($con, $entry->getDn(), $entry->getAttributes())) {
-            throw new LdapException(sprintf('Could not update entry "%s": %s.', $entry->getDn(), ldap_error($con)));
+            throw new LdapException(sprintf('Could not update entry "%s": '.ldap_error($con), $entry->getDn()));
         }
     }
 
@@ -64,7 +64,7 @@ public function remove(Entry $entry)
         $con = $this->getConnectionResource();
 
         if (!@ldap_delete($con, $entry->getDn())) {
-            throw new LdapException(sprintf('Could not remove entry "%s": %s.', $entry->getDn(), ldap_error($con)));
+            throw new LdapException(sprintf('Could not remove entry "%s": '.ldap_error($con), $entry->getDn()));
         }
     }
 
@@ -76,7 +76,7 @@ public function rename(Entry $entry, $newRdn, $removeOldRdn = true)
         $con = $this->getConnectionResource();
 
         if (!@ldap_rename($con, $entry->getDn(), $newRdn, null, $removeOldRdn)) {
-            throw new LdapException(sprintf('Could not rename entry "%s" to "%s": %s.', $entry->getDn(), $newRdn, ldap_error($con)));
+            throw new LdapException(sprintf('Could not rename entry "%s" to "%s": '.ldap_error($con), $entry->getDn(), $newRdn));
         }
     }
 

Adapter/ExtLdap/Query.php

@@ -45,7 +45,7 @@ public function __destruct()
         $this->search = null;
 
         if (!$success) {
-            throw new LdapException(sprintf('Could not free results: %s.', ldap_error($con)));
+            throw new LdapException('Could not free results: '.ldap_error($con));
         }
     }