symfony
diff --git a/‎src/Symfony/Component/Cache/Adapter/MemcachedAdapter.php
Lines changed: 5 additions & 6 deletions b/‎src/Symfony/Component/Cache/Adapter/MemcachedAdapter.php
Lines changed: 5 additions & 6 deletions
diff --git a/‎src/Symfony/Component/Cache/Tests/Adapter/MemcachedAdapterTest.php
Lines changed: 1 addition & 1 deletion b/‎src/Symfony/Component/Cache/Tests/Adapter/MemcachedAdapterTest.php
Lines changed: 1 addition & 1 deletion
diff --git a/‎src/Symfony/Component/Ldap/Adapter/ExtLdap/EntryManager.php
Lines changed: 1 addition & 1 deletion b/‎src/Symfony/Component/Ldap/Adapter/ExtLdap/EntryManager.php
Lines changed: 1 addition & 1 deletion
@@ -56,7 +56,7 @@ class MemcachedAdapter extends AbstractAdapter
     public function __construct(\Memcached $client, string $namespace = '', int $defaultLifetime = 0, MarshallerInterface $marshaller = null)
     {
         if (!static::isSupported()) {
-            throw new CacheException('Memcached >= 2.2.0 is required.');
+            throw new CacheException('Memcached '.(\PHP_VERSION_ID >= 80100 ? '> 3.1.5' : '>= 2.2.0').' is required.');
         }
         if ('Memcached' === \get_class($client)) {
             $opt = $client->getOption(\Memcached::OPT_SERIALIZER);
@@ -76,7 +76,7 @@ public function __construct(\Memcached $client, string $namespace = '', int $def
 
     public static function isSupported()
     {
-        return \extension_loaded('memcached') && version_compare(phpversion('memcached'), '2.2.0', '>=');
+        return \extension_loaded('memcached') && version_compare(phpversion('memcached'), \PHP_VERSION_ID >= 80100 ? '3.1.6' : '2.2.0', '>=');
     }
 
     /**
@@ -89,7 +89,6 @@ public static function isSupported()
      * - [['localhost', 11211, 33]]
      *
      * @param array[]|string|string[] $servers An array of servers, a DSN, or an array of DSNs
-     * @param array                   $options An array of options
      *
      * @throws \ErrorException When invalid options or servers are provided
      */
@@ -101,7 +100,7 @@ public static function createConnection(array|string $servers, array $options =
             throw new InvalidArgumentException(sprintf('MemcachedAdapter::createClient() expects array or string as first argument, "%s" given.', get_debug_type($servers)));
         }
         if (!static::isSupported()) {
-            throw new CacheException('Memcached >= 2.2.0 is required.');
+            throw new CacheException('Memcached '.(\PHP_VERSION_ID >= 80100 ? '> 3.1.5' : '>= 2.2.0').' is required.');
         }
         set_error_handler(function ($type, $msg, $file, $line) { throw new \ErrorException($msg, 0, $type, $file, $line); });
         try {
@@ -265,7 +264,7 @@ protected function doSave(array $values, int $lifetime): array|bool
     protected function doFetch(array $ids): iterable
     {
         try {
-            $encodedIds = array_map('self::encodeKey', $ids);
+            $encodedIds = array_map([__CLASS__, 'encodeKey'], $ids);
 
             $encodedResult = $this->checkResultCode($this->getClient()->getMulti($encodedIds));
 
@@ -294,7 +293,7 @@ protected function doHave(string $id): bool
     protected function doDelete(array $ids): bool
     {
         $ok = true;
-        $encodedIds = array_map('self::encodeKey', $ids);
+        $encodedIds = array_map([__CLASS__, 'encodeKey'], $ids);
         foreach ($this->checkResultCode($this->getClient()->deleteMulti($encodedIds)) as $result) {
             if (\Memcached::RES_SUCCESS !== $result && \Memcached::RES_NOTFOUND !== $result) {
                 $ok = false;
 
@@ -33,7 +33,7 @@ class MemcachedAdapterTest extends AdapterTestCase
     public static function setUpBeforeClass(): void
     {
         if (!MemcachedAdapter::isSupported()) {
-            throw new SkippedTestSuiteError('Extension memcached >=2.2.0 required.');
+            throw new SkippedTestSuiteError('Extension memcached '.(\PHP_VERSION_ID >= 80100 ? '> 3.1.5' : '>= 2.2.0').' required.');
         }
         self::$client = AbstractAdapter::createConnection('memcached://'.getenv('MEMCACHED_HOST'), ['binary_protocol' => false]);
         self::$client->get('foo');
 
@@ -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
`@@ -56,7 +56,7 @@ class MemcachedAdapter extends AbstractAdapter`
`56`	`56`	`public function __construct(\Memcached $client, string $namespace = '', int $defaultLifetime = 0, MarshallerInterface $marshaller = null)`
`57`	`57`	`{`
`58`	`58`	`if (!static::isSupported()) {`
`59`		`- throw new CacheException('Memcached >= 2.2.0 is required.');`
	`59`	`+ throw new CacheException('Memcached '.(\PHP_VERSION_ID >= 80100 ? '> 3.1.5' : '>= 2.2.0').' is required.');`
`60`	`60`	`}`
`61`	`61`	`if ('Memcached' === \get_class($client)) {`
`62`	`62`	`$opt = $client->getOption(\Memcached::OPT_SERIALIZER);`
`@@ -76,7 +76,7 @@ public function __construct(\Memcached $client, string $namespace = '', int $def`
`76`	`76`
`77`	`77`	`public static function isSupported()`
`78`	`78`	`{`
`79`		`- return \extension_loaded('memcached') && version_compare(phpversion('memcached'), '2.2.0', '>=');`
	`79`	`+ return \extension_loaded('memcached') && version_compare(phpversion('memcached'), \PHP_VERSION_ID >= 80100 ? '3.1.6' : '2.2.0', '>=');`
`80`	`80`	`}`
`81`	`81`
`82`	`82`	`/**`
`@@ -89,7 +89,6 @@ public static function isSupported()`
`89`	`89`	`* - [['localhost', 11211, 33]]`
`90`	`90`	`*`
`91`	`91`	`* @param array[]\|string\|string[] $servers An array of servers, a DSN, or an array of DSNs`
`92`		`- * @param array $options An array of options`
`93`	`92`	`*`
`94`	`93`	`* @throws \ErrorException When invalid options or servers are provided`
`95`	`94`	`*/`
`@@ -101,7 +100,7 @@ public static function createConnection(array\|string $servers, array $options =`
`101`	`100`	`throw new InvalidArgumentException(sprintf('MemcachedAdapter::createClient() expects array or string as first argument, "%s" given.', get_debug_type($servers)));`
`102`	`101`	`}`
`103`	`102`	`if (!static::isSupported()) {`
`104`		`- throw new CacheException('Memcached >= 2.2.0 is required.');`
	`103`	`+ throw new CacheException('Memcached '.(\PHP_VERSION_ID >= 80100 ? '> 3.1.5' : '>= 2.2.0').' is required.');`
`105`	`104`	`}`
`106`	`105`	`set_error_handler(function ($type, $msg, $file, $line) { throw new \ErrorException($msg, 0, $type, $file, $line); });`
`107`	`106`	`try {`
`@@ -265,7 +264,7 @@ protected function doSave(array $values, int $lifetime): array\|bool`
`265`	`264`	`protected function doFetch(array $ids): iterable`
`266`	`265`	`{`
`267`	`266`	`try {`
`268`		`- $encodedIds = array_map('self::encodeKey', $ids);`
	`267`	`+ $encodedIds = array_map([__CLASS__, 'encodeKey'], $ids);`
`269`	`268`
`270`	`269`	`$encodedResult = $this->checkResultCode($this->getClient()->getMulti($encodedIds));`
`271`	`270`
`@@ -294,7 +293,7 @@ protected function doHave(string $id): bool`
`294`	`293`	`protected function doDelete(array $ids): bool`
`295`	`294`	`{`
`296`	`295`	`$ok = true;`
`297`		`- $encodedIds = array_map('self::encodeKey', $ids);`
	`296`	`+ $encodedIds = array_map([__CLASS__, 'encodeKey'], $ids);`
`298`	`297`	`foreach ($this->checkResultCode($this->getClient()->deleteMulti($encodedIds)) as $result) {`
`299`	`298`	`if (\Memcached::RES_SUCCESS !== $result && \Memcached::RES_NOTFOUND !== $result) {`
`300`	`299`	`$ok = false;`
Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@ class MemcachedAdapterTest extends AdapterTestCase`
`33`	`33`	`public static function setUpBeforeClass(): void`
`34`	`34`	`{`
`35`	`35`	`if (!MemcachedAdapter::isSupported()) {`
`36`		`- throw new SkippedTestSuiteError('Extension memcached >=2.2.0 required.');`
	`36`	`+ throw new SkippedTestSuiteError('Extension memcached '.(\PHP_VERSION_ID >= 80100 ? '> 3.1.5' : '>= 2.2.0').' required.');`
`37`	`37`	`}`
`38`	`38`	`self::$client = AbstractAdapter::createConnection('memcached://'.getenv('MEMCACHED_HOST'), ['binary_protocol' => false]);`
`39`	`39`	`self::$client->get('foo');`
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`	`}`