Merge branch '3.4' into 4.4

* 3.4:
  Various cleanups

Author: nicolas-grekas

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": '.ldap_error($con), $entry->getDn()));
+            throw new LdapException(sprintf('Could not add entry "%s": ', $entry->getDn()).ldap_error($con));
         }
 
         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": '.ldap_error($con), $entry->getDn()));
+            throw new LdapException(sprintf('Could not update entry "%s": ', $entry->getDn()).ldap_error($con));
         }
     }
 
@@ -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": '.ldap_error($con), $entry->getDn()));
+            throw new LdapException(sprintf('Could not remove entry "%s": ', $entry->getDn()).ldap_error($con));
         }
     }
 
@@ -79,7 +79,7 @@ public function addAttributeValues(Entry $entry, string $attribute, array $value
         $con = $this->getConnectionResource();
 
         if (!@ldap_mod_add($con, $entry->getDn(), [$attribute => $values])) {
-            throw new LdapException(sprintf('Could not add values to entry "%s", attribute %s: '.ldap_error($con), $entry->getDn(), $attribute));
+            throw new LdapException(sprintf('Could not add values to entry "%s", attribute %s: ', $entry->getDn(), $attribute).ldap_error($con));
         }
     }
 
@@ -94,7 +94,7 @@ public function removeAttributeValues(Entry $entry, string $attribute, array $va
         $con = $this->getConnectionResource();
 
         if (!@ldap_mod_del($con, $entry->getDn(), [$attribute => $values])) {
-            throw new LdapException(sprintf('Could not remove values from entry "%s", attribute %s: '.ldap_error($con), $entry->getDn(), $attribute));
+            throw new LdapException(sprintf('Could not remove values from entry "%s", attribute %s: ', $entry->getDn(), $attribute).ldap_error($con));
         }
     }
 
@@ -106,7 +106,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": '.ldap_error($con), $entry->getDn(), $newRdn));
+            throw new LdapException(sprintf('Could not rename entry "%s" to "%s": ', $entry->getDn(), $newRdn).ldap_error($con));
         }
     }
 
@@ -122,7 +122,7 @@ public function move(Entry $entry, string $newParent)
         $rdn = $this->parseRdnFromEntry($entry);
         // deleteOldRdn does not matter here, since the Rdn will not be changing in the move.
         if (!@ldap_rename($con, $entry->getDn(), $rdn, $newParent, true)) {
-            throw new LdapException(sprintf('Could not move entry "%s" to "%s": '.ldap_error($con), $entry->getDn(), $newParent));
+            throw new LdapException(sprintf('Could not move entry "%s" to "%s": ', $entry->getDn(), $newParent).ldap_error($con));
         }
     }