Merge branch '5.4' into 6.0

nicolas-grekas · nicolas-grekas · commit 5a2d3222b9b6 · 2022-02-11T15:36:50.000+01:00
* 5.4:
  [Cache] fix tests
  [Cache] conflict with ext-memcached &lt;= 3.1.5 on PHP 8.1
  [Ldap] fix deprecation on PHP 8.1
diff --git a/Adapter/ExtLdap/EntryManager.php b/Adapter/ExtLdap/EntryManager.php
@@ -105,7 +105,7 @@ public function rename(Entry $entry, string $newRdn, bool $removeOldRdn = true)
     {
         $con = $this->getConnectionResource();
 
-        if (!@ldap_rename($con, $entry->getDn(), $newRdn, null, $removeOldRdn)) {
+        if (!@ldap_rename($con, $entry->getDn(), $newRdn, '', $removeOldRdn)) {
             throw new LdapException(sprintf('Could not rename entry "%s" to "%s": ', $entry->getDn(), $newRdn).ldap_error($con), ldap_errno($con));
         }
     }

Original file line number	Diff line number	Diff line change
`@@ -105,7 +105,7 @@ public function rename(Entry $entry, string $newRdn, bool $removeOldRdn = true)`
`105`	`105`	`{`
`106`	`106`	`$con = $this->getConnectionResource();`
`107`	`107`
`108`		`- if (!@ldap_rename($con, $entry->getDn(), $newRdn, null, $removeOldRdn)) {`
	`108`	`+ if (!@ldap_rename($con, $entry->getDn(), $newRdn, '', $removeOldRdn)) {`
`109`	`109`	`throw new LdapException(sprintf('Could not rename entry "%s" to "%s": ', $entry->getDn(), $newRdn).ldap_error($con), ldap_errno($con));`
`110`	`110`	`}`
`111`	`111`	`}`